mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
After merge fixes
Note: The following tests fails - fulltext (Sergei has promised to fix) - rpl_charset (Guilhem should fix) - rpl_timezone (Dimitray has promised to fix) Sanja needs to check out the calling of close_thread_tables() in sp_head.cc myisam/mi_check.c: After merge fix myisam/sort.c: After merge fix mysql-test/mysql-test-run.sh: Export master socket to mysqltest mysql-test/r/func_group.result: Make result repeatable mysql-test/r/mysqlbinlog.result: After merge fix mysql-test/r/ps_1general.result: After merge fix mysql-test/r/ps_2myisam.result: After merge fix mysql-test/r/ps_3innodb.result: After merge fix mysql-test/r/ps_4heap.result: After merge fix mysql-test/r/ps_5merge.result: After merge fix mysql-test/r/ps_6bdb.result: After merge fix mysql-test/r/rpl_flush_log_loop.result: After merge fix mysql-test/r/rpl_replicate_do.result: After merge fix mysql-test/r/rpl_temporary.result: After merge fix mysql-test/r/rpl_timezone.result: After merge fix Note that this test fails now (Dimitry has promised to fix this) mysql-test/r/rpl_user_variables.result: After merge fix mysql-test/r/select.result: After merge fix mysql-test/r/sp-error.result: After merge fix mysql-test/r/sp-security.result: After merge fix mysql-test/r/sp.result: After merge fix mysql-test/r/user_var.result: After merge fix mysql-test/r/variables.result: After merge fix mysql-test/t/alter_table.test: After merge fix mysql-test/t/derived.test: After merge fix mysql-test/t/func_group.test: Make result repeatable mysql-test/t/grant_cache.test: Use MASTER_MYSOCK instead of master.sock mysql-test/t/multi_update.test: Use MASTER_MYSOCK instead of master.sock mysql-test/t/rpl000015.test: Use MASTER_MYSOCK instead of master.sock mysql-test/t/rpl000017.test: Use MASTER_MYSOCK instead of master.sock mysql-test/t/rpl000018.test: Use MASTER_MYSOCK instead of master.sock mysql-test/t/rpl_charset.test: After merge fix mysql-test/t/rpl_heap.test: Use MASTER_MYSOCK instead of master.sock mysql-test/t/rpl_rotate_logs.test: Use MASTER_MYSOCK instead of master.sock mysql-test/t/sp-error.test: after merge fix mysql-test/t/sp-security.test: after merge fix mysql-test/t/user_var.test: after merge fix scripts/mysql_fix_privilege_tables.sh: This can now be exectued from the source distribution sql/handler.cc: Cleanup sql/handler.h: More debugging sql/item.h: Indentation fixes sql/item_cmpfunc.cc: After merge fixes sql/opt_range.cc: After merge fixes sql/opt_range.h: After merge fixes sql/sp.cc: After merge fixes sql/sp_head.cc: Remove closing of thread tables in a SP function as this caused a core dump. (Has to be fixed better) sql/sql_base.cc: More debugging sql/sql_handler.cc: After merge fixes (We have to call ha_index_or_rnd_end() before calling close_thread_table()) sql/sql_parse.cc: More debugging sql/sql_prepare.cc: After merge fixes sql/sql_select.cc: After merge fixes
This commit is contained in:
@ -39,17 +39,18 @@ f
|
||||
show binlog events;
|
||||
Log_name Pos Event_type Server_id End_log_pos Info
|
||||
master-bin.000001 4 Format_desc 1 95 Server ver: VERSION, Binlog ver: 4
|
||||
master-bin.000001 95 Query 1 174 use `test`; create table t1(f int)
|
||||
master-bin.000001 174 Query 1 253 use `test`; create table t2(f int)
|
||||
master-bin.000001 253 Query 1 372 use `test`; insert into t1 values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10)
|
||||
master-bin.000001 372 Query 1 461 use `test`; create temporary table t3(f int)
|
||||
master-bin.000001 461 Query 1 559 use `test`; insert into t3 select * from t1 where f<6
|
||||
master-bin.000001 559 Query 1 648 use `test`; create temporary table t3(f int)
|
||||
master-bin.000001 648 Query 1 743 use `test`; insert into t2 select count(*) from t3
|
||||
master-bin.000001 743 Query 1 842 use `test`; insert into t3 select * from t1 where f>=4
|
||||
master-bin.000001 842 Query 1 922 use `test`; drop temporary table t3
|
||||
master-bin.000001 922 Query 1 1017 use `test`; insert into t2 select count(*) from t3
|
||||
master-bin.000001 1017 Query 1 1097 use `test`; drop temporary table t3
|
||||
master-bin.000001 95 Query 1 178 use `test`; drop table if exists t1,t2
|
||||
master-bin.000001 178 Query 1 257 use `test`; create table t1(f int)
|
||||
master-bin.000001 257 Query 1 336 use `test`; create table t2(f int)
|
||||
master-bin.000001 336 Query 1 455 use `test`; insert into t1 values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10)
|
||||
master-bin.000001 455 Query 1 544 use `test`; create temporary table t3(f int)
|
||||
master-bin.000001 544 Query 1 642 use `test`; insert into t3 select * from t1 where f<6
|
||||
master-bin.000001 642 Query 1 731 use `test`; create temporary table t3(f int)
|
||||
master-bin.000001 731 Query 1 826 use `test`; insert into t2 select count(*) from t3
|
||||
master-bin.000001 826 Query 1 925 use `test`; insert into t3 select * from t1 where f>=4
|
||||
master-bin.000001 925 Query 1 1005 use `test`; drop temporary table t3
|
||||
master-bin.000001 1005 Query 1 1100 use `test`; insert into t2 select count(*) from t3
|
||||
master-bin.000001 1100 Query 1 1180 use `test`; drop temporary table t3
|
||||
drop table t1, t2;
|
||||
use test;
|
||||
SET TIMESTAMP=1040323920;
|
||||
|
Reference in New Issue
Block a user