diff options
| author | unknown <knielsen@knielsen-hq.org> | 2009-12-22 11:33:20 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2009-12-22 11:33:20 +0100 |
| commit | 6135a547b2a01d0d7b2145b467f19a15ec8fe3c9 (patch) | |
| tree | e27c8c0a32c0509655690131a98d71120ec83a92 /mysql-test/std_data | |
| parent | 342f047b24950a8f987a5e6f53c2ea413ee49d98 (diff) | |
| parent | 8bc8de1ad3da108d741417f43ac40df771a66d1e (diff) | |
| download | mariadb-git-6135a547b2a01d0d7b2145b467f19a15ec8fe3c9.tar.gz | |
Merge fix for PBXT running inside embedded server (MBug#439889).
Also some small fixes to make the PBXT testsuite work in --embedded.
config/ac-macros/plugins.m4:
MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS macro extended to support multiple files.
mysql-test/std_data/pbxt_load_unique_error1.inc:
Move file to be accessible also for testing embedded server.
mysql-test/suite/pbxt/r/pbxt_bugs.result:
Fix LOAD DATA LOCAL INFILE path so it works also for testing embedded server.
mysql-test/suite/pbxt/t/pbxt_bugs.test:
Fix LOAD DATA LOCAL INFILE path so it works also for testing embedded server.
mysql-test/suite/pbxt/t/pbxt_locking.test:
Disable for embedded, as it needs SHOW PROCESSLIST functionality not available there.
mysql-test/suite/pbxt/t/pbxt_transactions.test:
Disable test for embedded, as it needs ability to connect from outside (mysqldump).
mysql-test/suite/pbxt/t/ps_1general.test:
Fix replace_result for new mysql-test-run.pl.
sql/sql_plugin.cc:
Remove hack that disables PBXT in embedded.
storage/pbxt/plug.in:
Fix crash in PBXT in embedded server.
storage/pbxt/src/Makefile.am:
Remove not needed CFLAGS/CXXFLAGS (they cause autotools to generate different object names, which in turn cause the MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS replacement of object files inside library files not to work).
storage/pbxt/src/ha_pbxt.cc:
Ugly hack to allow more threads in embedded server (need a better fix I think).
storage/pbxt/src/table_xt.cc:
Use stderr for logging not stdout (prevent spamming --embedded test suite output with stray messages).
storage/pbxt/src/thread_xt.cc:
Use stderr for logging not stdout (prevent spamming --embedded test suite output with stray messages).
storage/pbxt/src/trace_xt.cc:
Use stderr for logging not stdout (prevent spamming --embedded test suite output with stray messages).
Diffstat (limited to 'mysql-test/std_data')
| -rw-r--r-- | mysql-test/std_data/pbxt_load_unique_error1.inc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/std_data/pbxt_load_unique_error1.inc b/mysql-test/std_data/pbxt_load_unique_error1.inc new file mode 100644 index 00000000000..998daad4144 --- /dev/null +++ b/mysql-test/std_data/pbxt_load_unique_error1.inc @@ -0,0 +1,5 @@ +1,abc +2,def +3,ghi +3,jkl +4,opq |