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/r/flush_block_commit_notembedded.result | |
| 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/r/flush_block_commit_notembedded.result')
| -rw-r--r-- | mysql-test/r/flush_block_commit_notembedded.result | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/r/flush_block_commit_notembedded.result b/mysql-test/r/flush_block_commit_notembedded.result index 09c1bcafafe..1d045b21763 100644 --- a/mysql-test/r/flush_block_commit_notembedded.result +++ b/mysql-test/r/flush_block_commit_notembedded.result @@ -5,11 +5,11 @@ insert t1 values (1); flush tables with read lock; show master status; File Position Binlog_Do_DB Binlog_Ignore_DB -master-bin.000001 98 - commit; +master-bin.000001 102 +commit; show master status; File Position Binlog_Do_DB Binlog_Ignore_DB -master-bin.000001 98 +master-bin.000001 102 unlock tables; drop table t1; set autocommit=1; |