48124f838b
Merge branch '0.5' into 1.0
2016-10-16 20:17:20 +03:00
71e145c483
In sb_lua_new_state() always push a value on stack before calling lua_setglobal().
2016-10-16 20:16:29 +03:00
ff7d2ba931
Remove the deprecated luaopen_math() call.
2016-10-16 13:26:49 +03:00
822d4cf454
Merge AArch64 port from
...
https://github.com/cbaylis/luajit-aarch64/tree/aarch64-v2.1-new
2016-10-15 21:50:24 +03:00
fc89625ac9
Adjust drv_mysql.t, drv_pgsql.t to not fail on slower machines.
2016-10-15 14:30:13 +03:00
446bc75843
Merge branch '1.0' into luajit
2016-10-15 14:10:57 +03:00
7eeac290a9
Fix luajit branch to pass 'make distcheck' and Travis CI builds.
2016-10-15 13:43:10 +03:00
bd237c73bf
Fix Sun Studio + Solaris/Sparc builds.
2016-10-14 08:05:34 +03:00
21029a6b42
Add Emacs and Vi modelines in .travis.yml.
2016-10-12 12:57:22 +03:00
69f915eda3
Merge branch '0.5' into 1.0
2016-10-12 12:01:41 +03:00
25c10a0199
Adjust test_threads.t to not fail on slow hosts in Travis CI.
2016-10-12 11:49:03 +03:00
81c3ea47a6
Fix PostgreSQL upgrade issues in Travis CI.
2016-10-12 11:38:03 +03:00
f2bfdc7f2d
Don't use caches, as they may cause issues on PostgreSQL updates.
2016-10-11 09:29:07 +03:00
c67b4a24df
Don't use caches, as they may cause issues on PostgreSQL updates.
2016-10-11 09:21:58 +03:00
8a11204c87
Add README-Oracle.md to EXTRA_DIST.
2016-10-10 21:53:39 +03:00
3660c3655b
Fix tests for the luajit branch.
2016-10-09 19:33:51 +02:00
ff5cc25e1b
Manually merge branch '1.0' into luajit.
2016-10-09 17:56:05 +02:00
fd04338327
Do not overflow buffer in strncat
2016-09-29 11:48:39 +03:00
b953dab30f
Merge pull request #71 from plusky/strncat_overflow
...
Fix potential buffer overflow
2016-09-29 12:47:34 +04:00
e6fab32604
Do not overflow buffer in strncat
2016-09-29 10:39:47 +02:00
5807d7772d
Move Oracle build steps into a separate file.
...
Move Oracle build steps into a separate file, link to it from the main
README.md.
2016-09-26 14:24:14 +03:00
342bd56691
Merge pull request #70 from t5unamie/1.0
...
simple build instructions to include oracle client, Also minor change…
2016-09-26 15:05:51 +04:00
fc37905725
simple build instructions to include oracle client, Also minor change to look at correct folder structure of 12.1 oracle client.
2016-09-26 11:53:01 +01:00
443ae8dce6
Merge branch '0.5' into 1.0
2016-09-22 07:01:04 -07:00
cd87db5a30
Some typo fixes in the docs.
2016-09-22 06:58:13 -07:00
120cf0bfa2
Merge pull request #69 from grooverdan/0.5_travis_libaio
...
add libaio-dev to travis
2016-09-22 06:57:17 -07:00
5df6f74c83
Merge pull request #68 from grooverdan/0.5_pkg_luapkgdatadir for lua files
2016-09-22 06:56:27 -07:00
fab338a806
Merge branch '0.5' into 1.0
2016-09-21 17:33:00 -07:00
03ffdbd4d6
Some typo fixes in the docs.
2016-09-21 17:32:22 -07:00
58007b23bc
add libaio-dev to travis
...
Signed-off-by: Daniel Black <daniel.black@au.ibm.com >
2016-09-22 09:58:06 +10:00
0fefcfbc9b
Change lua scripts to 'require common' if a testdir wasn't passed
...
This completes what is needed to cause these scripts to pull in common
from the LUA_PATH.
Signed-off-by: Daniel Black <daniel.black@au.ibm.com >
2016-09-22 09:19:05 +10:00
16ba86827f
Load script from pkgdatadir if not local
...
If the --test=XXX{.lua} script isn't local, load it from the
pkgdatadir where some inbuilt scripts are installed.
Autoappend the .lua extension if this wasn't done alrady.
Here we set the LUA_PATH so that further lua 'require' directives
also pull the source from the pkgdatadir.
Signed-off-by: Daniel Black <daniel.black@au.ibm.com >
2016-09-22 09:17:57 +10:00
78bd5b3819
{common,bulkinsert}.lua missing from Makefile
...
Also change the defination so that these get installed to the
pkgdatadir which will help packagers.
Signed-off-by: Daniel Black <daniel.black@au.ibm.com >
2016-09-22 09:14:31 +10:00
9c8591e422
Merge trunk.
2016-09-17 07:41:10 +03:00
d244ca42bb
Adjust script_oltp_* tests to 1.0.
2016-09-17 07:40:29 +03:00
00458c4bd5
Merge branch '0.5' into 1.0
2016-09-17 07:33:45 +03:00
ee7082c3cd
Prevent script_oltp_*.t failures on slower machines.
2016-09-16 23:55:29 +03:00
95885f6a9f
Basic tests for oltp.lua against MySQL and PostgreSQL.
2016-09-16 23:48:12 +03:00
f6e94a0fd6
Fix LOCK TABLES statements for multi-table MySQL/MyISAM benchmarks.
2016-09-16 23:22:10 +03:00
fab36cb91f
Merge pull request #66 from akorotkov/1.0
2016-09-16 22:16:24 +04:00
e5e6ccb8d1
Fix NULL handling in PostgreSQL driver.
2016-09-16 20:02:57 +03:00
ccd9845321
Adjust tests to 1.0.
2016-09-11 16:15:07 +03:00
93e54ad754
Merge branch '0.5' into 1.0
2016-09-11 16:11:03 +03:00
7016cb67e6
Adjust test_mutex.t to pass on slow machines.
2016-09-11 15:59:37 +03:00
3fcceafe62
Reduce --max-requests in the mutex benchmark test.
...
Reduce --max-requests in the mutex benchmark tests, as it takes too much
time on Travis CI slaves.
2016-09-11 15:29:48 +03:00
da7df5bb26
Fix the memory benchmark test to work on Linux.
2016-09-11 15:28:31 +03:00
1cfcacf84f
Basic regression tests for cpu, memory, threads and mutex benchmarks.
2016-09-11 14:37:35 +03:00
a00535ec55
Adjust DB drivers tests to 1.0 output.
2016-09-10 02:15:34 +03:00
ee235d687b
Merge branch '0.5' into 1.0
2016-09-10 02:10:00 +03:00
8ac3e7e85d
Wait until PostgreSQL completes before initializing in Travis CI os OS X.
2016-09-10 01:42:22 +03:00
