1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00

merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640

This commit is contained in:
Andrei Elkin
2009-11-06 18:35:04 +02:00
405 changed files with 15117 additions and 3629 deletions

View File

@@ -176,7 +176,7 @@ Log_name Pos Event_type Server_id End_log_pos Info
# 107 Query # 175 BEGIN
# 175 Table_map # 217 table_id: # (test.t7)
# 217 Write_rows # 273 table_id: # flags: STMT_END_F
# 273 Query # 344 ROLLBACK
# 273 Query # 342 COMMIT
SELECT * FROM t7 ORDER BY a,b;
a b
1 2
@@ -327,7 +327,7 @@ Log_name Pos Event_type Server_id End_log_pos Info
# 1330 Query # 1398 BEGIN
# 1398 Table_map # 1439 table_id: # (test.t1)
# 1439 Write_rows # 1483 table_id: # flags: STMT_END_F
# 1483 Query # 1554 ROLLBACK
# 1483 Query # 1552 COMMIT
SHOW TABLES;
Tables_in_test
t1