mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
After merge fixes.
Note that mix_innodb_myisam_binlog and union fails after this patch (Will be fixed shortly by maintaners of this code) client/mysql.cc: After merge fix include/mysql.h: Some additions to MYSQL_BIND for cleaner prepared statement code libmysql/libmysql.c: mysql_prepare_result -> mysql_get_metadata() Added test for offset overflow when using mysql_fetch_column() Cleaned up mysql_fetch_column() Optimized fetch_result() usage mysql-test/r/func_group.result: Updated results after merge mysql-test/r/func_test.result: Updated results after merge mysql-test/r/grant.result: Updated results after merge mysql-test/r/loaddata.result: Updated results after merge mysql-test/r/lowercase_table.result: Updated results after merge mysql-test/r/mix_innodb_myisam_binlog.result: Updated results after merge (note that this is still not correct; Need patch to mysqld to fix this properly) mysql-test/r/myisam.result: Updated results after merge mysql-test/r/range.result: Updated results after merge mysql-test/r/rpl_loaddata.result: Updated results after merge mysql-test/r/rpl_loaddata_rule_m.result: Updated results after merge mysql-test/r/rpl_loaddata_rule_s.result: Updated results after merge mysql-test/r/rpl_log.result: Updated results after merge mysql-test/r/union.result: Updated results after merge mysql-test/t/lowercase_table.test: Update after merge mysql-test/t/myisam.test: Update after merge mysql-test/t/union.test: Update after merge sql-bench/compare-results.sh: Fix for now output format sql/field.h: Added is_null_in_record() to make ha_innodb.cc code more general sql/ha_innodb.cc: Removed some functions that uses inernal (private) MySQL information sql/item_cmpfunc.cc: After merge fix sql/log_event.cc: After merge fix; (Some code should be checked by Guilhem) sql/opt_range.cc: Simple optimzation and after merge fixes sql/slave.cc: After merge fix sql/sql_acl.cc: After merge fix + code cleanup sql/sql_select.cc: After merge fix sql/sql_show.cc: After merge fix sql/sql_table.cc: After merge fix Cleanup of mysql_checksum_table() sql/sql_union.cc: After merge fixes. Note that after this the union test still fails; Will be fixed shortly... tests/client_test.c: mysql_prepare_result() -> mysql_get_metadata()
This commit is contained in:
unknown
@ -8,10 +8,10 @@ insert into tm select * from ti;
|
||||
commit;
|
||||
show binlog events from 79;
|
||||
Log_name Pos Event_type Server_id Orig_log_pos Info
|
||||
master-bin.001 79 Query 1 79 use test; BEGIN
|
||||
master-bin.001 119 Query 1 79 use test; insert into ti values(1)
|
||||
master-bin.001 178 Query 1 79 use test; insert into tm select * from ti
|
||||
master-bin.001 244 Query 1 244 use test; COMMIT
|
||||
master-bin.000001 79 Query 1 79 use ; BEGIN
|
||||
master-bin.000001 119 Query 1 79 use ; insert into ti values(1)
|
||||
master-bin.000001 178 Query 1 79 use ; insert into tm select * from ti
|
||||
master-bin.000001 244 Query 1 244 use ; COMMIT
|
||||
delete from ti;
|
||||
delete from tm;
|
||||
reset master;
|
||||
@ -22,10 +22,10 @@ rollback;
|
||||
Warning: Some non-transactional changed tables couldn't be rolled back
|
||||
show binlog events from 79;
|
||||
Log_name Pos Event_type Server_id Orig_log_pos Info
|
||||
master-bin.001 79 Query 1 79 use test; BEGIN
|
||||
master-bin.001 119 Query 1 79 use test; insert into ti values(2)
|
||||
master-bin.001 178 Query 1 79 use test; insert into tm select * from ti
|
||||
master-bin.001 244 Query 1 244 use test; ROLLBACK
|
||||
master-bin.000001 79 Query 1 79 use ; BEGIN
|
||||
master-bin.000001 119 Query 1 79 use ; insert into ti values(2)
|
||||
master-bin.000001 178 Query 1 79 use ; insert into tm select * from ti
|
||||
master-bin.000001 244 Query 1 244 use ; ROLLBACK
|
||||
delete from ti;
|
||||
delete from tm;
|
||||
reset master;
|
||||
@ -39,13 +39,13 @@ Warning: Some non-transactional changed tables couldn't be rolled back
|
||||
commit;
|
||||
show binlog events from 79;
|
||||
Log_name Pos Event_type Server_id Orig_log_pos Info
|
||||
master-bin.001 79 Query 1 79 use test; BEGIN
|
||||
master-bin.001 119 Query 1 79 use test; insert into ti values(3)
|
||||
master-bin.001 178 Query 1 79 use test; savepoint my_savepoint
|
||||
master-bin.001 235 Query 1 79 use test; insert into ti values(4)
|
||||
master-bin.001 294 Query 1 79 use test; insert into tm select * from ti
|
||||
master-bin.001 360 Query 1 79 use test; rollback to savepoint my_savepoint
|
||||
master-bin.001 429 Query 1 429 use test; COMMIT
|
||||
master-bin.000001 79 Query 1 79 use ; BEGIN
|
||||
master-bin.000001 119 Query 1 79 use ; insert into ti values(3)
|
||||
master-bin.000001 178 Query 1 79 use ; savepoint my_savepoint
|
||||
master-bin.000001 235 Query 1 79 use ; insert into ti values(4)
|
||||
master-bin.000001 294 Query 1 79 use ; insert into tm select * from ti
|
||||
master-bin.000001 360 Query 1 79 use ; rollback to savepoint my_savepoint
|
||||
master-bin.000001 429 Query 1 429 use ; COMMIT
|
||||
delete from ti;
|
||||
delete from tm;
|
||||
reset master;
|
||||
@ -64,14 +64,14 @@ a
|
||||
7
|
||||
show binlog events from 79;
|
||||
Log_name Pos Event_type Server_id Orig_log_pos Info
|
||||
master-bin.001 79 Query 1 79 use test; BEGIN
|
||||
master-bin.001 119 Query 1 79 use test; insert into ti values(5)
|
||||
master-bin.001 178 Query 1 79 use test; savepoint my_savepoint
|
||||
master-bin.001 235 Query 1 79 use test; insert into ti values(6)
|
||||
master-bin.001 294 Query 1 79 use test; insert into tm select * from ti
|
||||
master-bin.001 360 Query 1 79 use test; rollback to savepoint my_savepoint
|
||||
master-bin.001 429 Query 1 79 use test; insert into ti values(7)
|
||||
master-bin.001 488 Query 1 488 use test; COMMIT
|
||||
master-bin.000001 79 Query 1 79 use ; BEGIN
|
||||
master-bin.000001 119 Query 1 79 use ; insert into ti values(5)
|
||||
master-bin.000001 178 Query 1 79 use ; savepoint my_savepoint
|
||||
master-bin.000001 235 Query 1 79 use ; insert into ti values(6)
|
||||
master-bin.000001 294 Query 1 79 use ; insert into tm select * from ti
|
||||
master-bin.000001 360 Query 1 79 use ; rollback to savepoint my_savepoint
|
||||
master-bin.000001 429 Query 1 79 use ; insert into ti values(7)
|
||||
master-bin.000001 488 Query 1 488 use ; COMMIT
|
||||
delete from ti;
|
||||
delete from tm;
|
||||
reset master;
|
||||
@ -86,10 +86,10 @@ get_lock("a",10)
|
||||
1
|
||||
show binlog events from 79;
|
||||
Log_name Pos Event_type Server_id Orig_log_pos Info
|
||||
master-bin.001 79 Query 1 79 use test; BEGIN
|
||||
master-bin.001 119 Query 1 79 use test; insert into ti values(8)
|
||||
master-bin.001 178 Query 1 79 use test; insert into tm select * from ti
|
||||
master-bin.001 244 Query 1 244 use test; ROLLBACK
|
||||
master-bin.000001 79 Query 1 79 use ; BEGIN
|
||||
master-bin.000001 119 Query 1 79 use ; insert into ti values(8)
|
||||
master-bin.000001 178 Query 1 79 use ; insert into tm select * from ti
|
||||
master-bin.000001 244 Query 1 244 use ; ROLLBACK
|
||||
delete from ti;
|
||||
delete from tm;
|
||||
reset master;
|
||||
@ -97,8 +97,8 @@ insert into ti values(9);
|
||||
insert into tm select * from ti;
|
||||
show binlog events from 79;
|
||||
Log_name Pos Event_type Server_id Orig_log_pos Info
|
||||
master-bin.001 79 Query 1 79 use test; insert into ti values(9)
|
||||
master-bin.001 138 Query 1 138 use test; insert into tm select * from ti
|
||||
master-bin.000001 79 Query 1 79 use ; insert into ti values(9)
|
||||
master-bin.000001 138 Query 1 138 use ; insert into tm select * from ti
|
||||
delete from ti;
|
||||
delete from tm;
|
||||
reset master;
|
||||
@ -107,17 +107,17 @@ begin;
|
||||
insert into tm select * from ti;
|
||||
show binlog events from 79;
|
||||
Log_name Pos Event_type Server_id Orig_log_pos Info
|
||||
master-bin.001 79 Query 1 79 use test; insert into ti values(10)
|
||||
master-bin.001 139 Query 1 139 use test; insert into tm select * from ti
|
||||
master-bin.000001 79 Query 1 79 use ; insert into ti values(10)
|
||||
master-bin.000001 139 Query 1 139 use ; insert into tm select * from ti
|
||||
insert into ti values(11);
|
||||
commit;
|
||||
show binlog events from 79;
|
||||
Log_name Pos Event_type Server_id Orig_log_pos Info
|
||||
master-bin.001 79 Query 1 79 use test; insert into ti values(10)
|
||||
master-bin.001 139 Query 1 139 use test; insert into tm select * from ti
|
||||
master-bin.001 205 Query 1 205 use test; BEGIN
|
||||
master-bin.001 245 Query 1 205 use test; insert into ti values(11)
|
||||
master-bin.001 305 Query 1 305 use test; COMMIT
|
||||
master-bin.000001 79 Query 1 79 use ; insert into ti values(10)
|
||||
master-bin.000001 139 Query 1 139 use ; insert into tm select * from ti
|
||||
master-bin.000001 205 Query 1 205 use ; BEGIN
|
||||
master-bin.000001 245 Query 1 205 use ; insert into ti values(11)
|
||||
master-bin.000001 305 Query 1 305 use ; COMMIT
|
||||
alter table tm type=INNODB;
|
||||
delete from ti;
|
||||
delete from tm;
|
||||
@ -128,10 +128,10 @@ insert into tm select * from ti;
|
||||
commit;
|
||||
show binlog events from 79;
|
||||
Log_name Pos Event_type Server_id Orig_log_pos Info
|
||||
master-bin.001 79 Query 1 79 use test; BEGIN
|
||||
master-bin.001 119 Query 1 79 use test; insert into ti values(12)
|
||||
master-bin.001 179 Query 1 79 use test; insert into tm select * from ti
|
||||
master-bin.001 245 Query 1 245 use test; COMMIT
|
||||
master-bin.000001 79 Query 1 79 use ; BEGIN
|
||||
master-bin.000001 119 Query 1 79 use ; insert into ti values(12)
|
||||
master-bin.000001 179 Query 1 79 use ; insert into tm select * from ti
|
||||
master-bin.000001 245 Query 1 245 use ; COMMIT
|
||||
delete from ti;
|
||||
delete from tm;
|
||||
reset master;
|
||||
@ -153,9 +153,9 @@ rollback to savepoint my_savepoint;
|
||||
commit;
|
||||
show binlog events from 79;
|
||||
Log_name Pos Event_type Server_id Orig_log_pos Info
|
||||
master-bin.001 79 Query 1 79 use test; BEGIN
|
||||
master-bin.001 119 Query 1 79 use test; insert into ti values(14)
|
||||
master-bin.001 179 Query 1 179 use test; COMMIT
|
||||
master-bin.000001 79 Query 1 79 use ; BEGIN
|
||||
master-bin.000001 119 Query 1 79 use ; insert into ti values(14)
|
||||
master-bin.000001 179 Query 1 179 use ; COMMIT
|
||||
delete from ti;
|
||||
delete from tm;
|
||||
reset master;
|
||||
@ -173,8 +173,8 @@ a
|
||||
18
|
||||
show binlog events from 79;
|
||||
Log_name Pos Event_type Server_id Orig_log_pos Info
|
||||
master-bin.001 79 Query 1 79 use test; BEGIN
|
||||
master-bin.001 119 Query 1 79 use test; insert into ti values(16)
|
||||
master-bin.001 179 Query 1 79 use test; insert into ti values(18)
|
||||
master-bin.001 239 Query 1 239 use test; COMMIT
|
||||
master-bin.000001 79 Query 1 79 use ; BEGIN
|
||||
master-bin.000001 119 Query 1 79 use ; insert into ti values(16)
|
||||
master-bin.000001 179 Query 1 79 use ; insert into ti values(18)
|
||||
master-bin.000001 239 Query 1 239 use ; COMMIT
|
||||
drop table ti,tm;
|
||||
|
||||
Reference in New Issue
Block a user