database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge mysql_cab_desk.:C:/source/c++/mysql-5.1

Browse Source 
into  mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rpl-merge


mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/log_event.cc:
  Auto merged
mysql-test/suite/rpl/r/rpl_row_create_table.result:
  Merge with 5.1 main.
This commit is contained in:
unknown
2007-08-02 15:27:47 -04:00
parent 21c55af5a1 ec73a9b0a7
commit 9eea112d9d
372 changed files with 9817 additions and 10823 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/suite/rpl/r/rpl_row_create_table.result
View File

@ -392,12 +392,20 @@ FROM t1
WHERE a MOD 2 = 1;
INSERT INTO t2 SELECT a+2 FROM tt2;
ROLLBACK;
Warnings:
Warning 1196 Some non-transactional changed tables couldn't be rolled back
SELECT * FROM t2 ORDER BY a;
a
SHOW BINLOG EVENTS FROM 637;
Log_name Pos Event_type Server_id End_log_pos Info
# 637 Query # 717 use `test`; TRUNCATE TABLE t2
# 717 Xid # 744 COMMIT /* XID */
# 738 Query # 806 use `test`; BEGIN
# 806 Table_map # 845 table_id: # (test.t2)
# 845 Write_rows # 889 table_id: # flags: STMT_END_F
# 889 Table_map # 928 table_id: # (test.t2)
# 928 Write_rows # 967 table_id: # flags: STMT_END_F
# 967 Query # 1038 use `test`; ROLLBACK
SELECT * FROM t2 ORDER BY a;
a
DROP TABLE t1,t2;