Merge branch '1.0' into luajit

.travis.yml

@@ -1,3 +1,7 @@
+# vim ft=yaml
+#
+# Travis CI configuration
+
 language: c
 
 os:
@@ -27,10 +31,16 @@ before_install:
       brew uninstall libtool
       brew update --quiet
       brew install libtool mysql
+
       # OS X requires servers to be started explicitly
       brew services start mysql
+
+      # Avoid PostgreSQL upgrade woes, just recreate the database
+      rm -rf /usr/local/var/postgres
+      brew postinstall postgresql
+
       pg_ctl -wD /usr/local/var/postgres start
-      createuser -s postgres;
+      createuser -s postgres
       ;;
     esac
 
@@ -45,8 +55,8 @@ install:
     esac
 
 before_script:
-  - mysql -u root -e 'CREATE DATABASE sbtest;'
-  - psql -U postgres -c 'CREATE DATABASE sbtest;'
+  - mysql -u root -e 'CREATE DATABASE sbtest'
+  - psql -U postgres -c 'CREATE DATABASE sbtest'
 
 script:
   - ./autogen.sh && ./configure --enable-coverage --with-mysql --with-pgsql
@@ -56,3 +66,7 @@ script:
 
 after_success:
   - coveralls --gcov-options '\-lp'
+
+# Local variables:
+# mode: yaml
+# End:

Makefile.am

@@ -24,7 +24,7 @@ endif
 
 SUBDIRS = doc $(LUAJIT_DIR) sysbench tests
 
-EXTRA_DIST = autogen.sh README.md README-WIN.txt ChangeLog
+EXTRA_DIST = autogen.sh README.md README-WIN.txt README-Oracle.md ChangeLog
 
 test:
 	cd tests && $(MAKE) test

configure.ac

@@ -56,7 +56,7 @@ AC_ARG_WITH([extra-ldflags],
 )
 AC_SUBST(EXTRA_LDFLAGS)
 
-CPPFLAGS="-D_XOPEN_SOURCE=500 -D_GNU_SOURCE ${CPPFLAGS}"
+CPPFLAGS="-D_GNU_SOURCE ${CPPFLAGS}"
 
 # Mac OS X requires _DARWIN_C_SOURCE for valloc(3) to be visible
 case "${host_cpu}-${host_os}" in
@@ -462,7 +462,7 @@ then
 fi
 if test "$SUNCC" = "yes"
 then
-  CC_WARNINGS="-v -errtags=yes -errwarn=%all -erroff=E_INTEGER_OVERFLOW_DETECTED"
+  CC_WARNINGS="-v -errtags=yes -errwarn=%all -erroff=E_INTEGER_OVERFLOW_DETECTED -erroff=E_STATEMENT_NOT_REACHED"
 fi
 
 AM_CFLAGS="${CC_WARNINGS} ${GPROF_PROFILING} ${GPROF_COVERAGE} ${AM_CFLAGS} ${PTHREAD_CFLAGS}"

tests/t/test_threads.t

@@ -33,10 +33,10 @@ threads benchmark tests
       total number of events:              100
       total time taken by event execution: *s (glob)
       response time:
-           min:                                  *ms (glob)
-           avg:                                  *ms (glob)
-           max:                                  *ms (glob)
-           approx.  95 percentile:               *ms (glob)
+           min:                               *ms (glob)
+           avg:                               *ms (glob)
+           max:                               *ms (glob)
+           approx.  95 percentile:            *ms (glob)
   
   Threads fairness:
       events (avg/stddev):           */* (glob)