diff options
| author | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2006-12-28 09:42:04 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2006-12-28 09:42:04 +0400 |
| commit | 333b2684af77673c9019748865c2967226de678e (patch) | |
| tree | 98d5ea35a1c1b4733dc237d98ddba348ece8c639 /mysql-test/t/ps_1general.test | |
| parent | 1aa1efdbd3cae8c9bc0524c92dda4c8084ec5b7c (diff) | |
| download | mariadb-git-333b2684af77673c9019748865c2967226de678e.tar.gz | |
WL#3630 (add embedded server to pushbuild)
5.1-related fixes
libmysqld/Makefile.am fixed to recompile and link ha_*.cc files that
keep dependance on THD structure.
Minor fixes to make tests working.
config/ac-macros/plugins.m4:
condition_dependent_plugin_objects added
libmysqld/Makefile.am:
rules for ha_*.o files added
condition_dependent_plugin_objects sent to linker
libmysqld/lib_sql.cc:
ddl_log initialization added
mysql-test/r/flush_block_commit_notembedded.result:
result fixed
mysql-test/t/crash_commit_before.test:
doesn't work in embedded server
mysql-test/t/csv.test:
replace_result added
mysql-test/t/ps.test:
doesn't work in embedded server
should be fixed by separating ps_notembedded.test
mysql-test/t/ps_1general.test:
replace_result fixed
mysql-test/t/ps_not_windows.test:
doesn't work in embedded server
mysql-test/t/trigger.test:
replace_result fixed
sql/sql_insert.cc:
#ifdef HAVE_ROW_BASED_REPLICATION added
storage/myisam/ha_myisam.cc:
MY_UNPACK_FILENAME flag added
Diffstat (limited to 'mysql-test/t/ps_1general.test')
| -rw-r--r-- | mysql-test/t/ps_1general.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/ps_1general.test b/mysql-test/t/ps_1general.test index 4c0f411c758..dd70f7edfa7 100644 --- a/mysql-test/t/ps_1general.test +++ b/mysql-test/t/ps_1general.test @@ -579,7 +579,7 @@ prepare stmt1 from ' rename table t5 to t6, t7 to t8 ' ; create table t5 (a int) ; # rename must fail, t7 does not exist # Clean up the filename here because embedded server reports whole path ---replace_result \\ / $MYSQL_TEST_DIR . /var/master-data/ / t7.frm t7 +--replace_result \\ / $MYSQL_TEST_DIR . /var/master-data/ "" t7.frm t7 --error 1017 execute stmt1 ; create table t7 (a int) ; |