Skip to content

Commit 6baf9d5

Browse files
alfranioalfranio
committed
merge mysql-5.1-bugteam (local) --> mysql-5.1-bugteam
2 parents 86d7cbd + 1ce9eb0 commit 6baf9d5

5 files changed

+19
-15
lines changed

‎mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,12 @@ Log_name Pos Event_type Server_id End_log_pos Info
4848
master-bin.000001 # Query # # BEGIN
4949
master-bin.000001 # Table_map # # table_id: # (test.t1)
5050
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
51-
master-bin.000001 # Query # # SAVEPOINT my_savepoint
51+
master-bin.000001 # Query # # SAVEPOINT `my_savepoint`
5252
master-bin.000001 # Table_map # # table_id: # (test.t1)
5353
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
5454
master-bin.000001 # Table_map # # table_id: # (test.t2)
5555
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
56-
master-bin.000001 # Query # # ROLLBACK TO my_savepoint
56+
master-bin.000001 # Query # # ROLLBACK TO `my_savepoint`
5757
master-bin.000001 # Xid # # COMMIT /* XID */
5858
delete from t1;
5959
delete from t2;
@@ -77,12 +77,12 @@ Log_name Pos Event_type Server_id End_log_pos Info
7777
master-bin.000001 # Query # # BEGIN
7878
master-bin.000001 # Table_map # # table_id: # (test.t1)
7979
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
80-
master-bin.000001 # Query # # SAVEPOINT my_savepoint
80+
master-bin.000001 # Query # # SAVEPOINT `my_savepoint`
8181
master-bin.000001 # Table_map # # table_id: # (test.t1)
8282
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
8383
master-bin.000001 # Table_map # # table_id: # (test.t2)
8484
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
85-
master-bin.000001 # Query # # ROLLBACK TO my_savepoint
85+
master-bin.000001 # Query # # ROLLBACK TO `my_savepoint`
8686
master-bin.000001 # Table_map # # table_id: # (test.t1)
8787
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
8888
master-bin.000001 # Xid # # COMMIT /* XID */

‎mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ show binlog events from <binlog_start>;
4444
Log_name Pos Event_type Server_id End_log_pos Info
4545
master-bin.000001 # Query # # BEGIN
4646
master-bin.000001 # Query # # use `test`; insert into t1 values(3)
47-
master-bin.000001 # Query # # SAVEPOINT my_savepoint
47+
master-bin.000001 # Query # # SAVEPOINT `my_savepoint`
4848
master-bin.000001 # Query # # use `test`; insert into t1 values(4)
4949
master-bin.000001 # Query # # use `test`; insert into t2 select * from t1
50-
master-bin.000001 # Query # # ROLLBACK TO my_savepoint
50+
master-bin.000001 # Query # # ROLLBACK TO `my_savepoint`
5151
master-bin.000001 # Xid # # COMMIT /* XID */
5252
delete from t1;
5353
delete from t2;
@@ -70,10 +70,10 @@ show binlog events from <binlog_start>;
7070
Log_name Pos Event_type Server_id End_log_pos Info
7171
master-bin.000001 # Query # # BEGIN
7272
master-bin.000001 # Query # # use `test`; insert into t1 values(5)
73-
master-bin.000001 # Query # # SAVEPOINT my_savepoint
73+
master-bin.000001 # Query # # SAVEPOINT `my_savepoint`
7474
master-bin.000001 # Query # # use `test`; insert into t1 values(6)
7575
master-bin.000001 # Query # # use `test`; insert into t2 select * from t1
76-
master-bin.000001 # Query # # ROLLBACK TO my_savepoint
76+
master-bin.000001 # Query # # ROLLBACK TO `my_savepoint`
7777
master-bin.000001 # Query # # use `test`; insert into t1 values(7)
7878
master-bin.000001 # Xid # # COMMIT /* XID */
7979
delete from t1;

‎mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,14 +139,14 @@ show binlog events from <binlog_start>;
139139
Log_name Pos Event_type Server_id End_log_pos Info
140140
master-bin.000001 # Query # # BEGIN
141141
master-bin.000001 # Query # # use `test`; INSERT INTO db1.t1 VALUES(20)
142-
master-bin.000001 # Query # # SAVEPOINT has_comment
142+
master-bin.000001 # Query # # SAVEPOINT `has_comment`
143143
master-bin.000001 # Query # # use `db1`; INSERT INTO db1.t1 VALUES(30)
144144
master-bin.000001 # Query # # use `db1`; INSERT INTO db1.t2 VALUES("in savepoint has_comment")
145-
master-bin.000001 # Query # # SAVEPOINT mixed_cases
145+
master-bin.000001 # Query # # SAVEPOINT `mixed_cases`
146146
master-bin.000001 # Query # # use `db1`; INSERT INTO db1.t2 VALUES("in savepoint mixed_cases")
147147
master-bin.000001 # Query # # use `db1`; INSERT INTO db1.t1 VALUES(40)
148-
master-bin.000001 # Query # # ROLLBACK TO mixed_cases
149-
master-bin.000001 # Query # # ROLLBACK TO has_comment
148+
master-bin.000001 # Query # # ROLLBACK TO `mixed_cases`
149+
master-bin.000001 # Query # # ROLLBACK TO `has_comment`
150150
master-bin.000001 # Query # # use `db1`; INSERT INTO db1.t2 VALUES("after rollback to")
151151
master-bin.000001 # Query # # use `db1`; INSERT INTO db1.t1 VALUES(50)
152152
master-bin.000001 # Xid # # COMMIT /* XID */

‎mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -997,7 +997,7 @@ master-bin.000001 # Query # # use `test_rpl`; INSERT INTO t1 VALUES (3, 'before
997997
master-bin.000001 # Xid # # COMMIT /* XID */
998998
master-bin.000001 # Query # # BEGIN
999999
master-bin.000001 # Query # # use `test_rpl`; INSERT INTO t1 VALUES (5, 'before savepoint s2')
1000-
master-bin.000001 # Query # # SAVEPOINT s2
1000+
master-bin.000001 # Query # # SAVEPOINT `s2`
10011001
master-bin.000001 # Query # # use `test_rpl`; INSERT INTO t1 VALUES (6, 'after savepoint s2')
10021002
master-bin.000001 # Table_map # # table_id: # (test_rpl.t1)
10031003
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F

‎sql/log.cc

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1712,7 +1712,9 @@ static int binlog_savepoint_set(handlerton *hton, THD *thd, void *sv)
17121712

17131713
String log_query;
17141714
if (log_query.append(STRING_WITH_LEN("SAVEPOINT ")) ||
1715-
log_query.append(thd->lex->ident.str, thd->lex->ident.length))
1715+
log_query.append("`") ||
1716+
log_query.append(thd->lex->ident.str, thd->lex->ident.length) ||
1717+
log_query.append("`"))
17161718
DBUG_RETURN(1);
17171719
int errcode= query_error_code(thd, thd->killed == THD::NOT_KILLED);
17181720
Query_log_event qinfo(thd, log_query.c_ptr_safe(), log_query.length(),
@@ -1734,7 +1736,9 @@ static int binlog_savepoint_rollback(handlerton *hton, THD *thd, void *sv)
17341736
{
17351737
String log_query;
17361738
if (log_query.append(STRING_WITH_LEN("ROLLBACK TO ")) ||
1737-
log_query.append(thd->lex->ident.str, thd->lex->ident.length))
1739+
log_query.append("`") ||
1740+
log_query.append(thd->lex->ident.str, thd->lex->ident.length) ||
1741+
log_query.append("`"))
17381742
DBUG_RETURN(1);
17391743
int errcode= query_error_code(thd, thd->killed == THD::NOT_KILLED);
17401744
Query_log_event qinfo(thd, log_query.c_ptr_safe(), log_query.length(),

0 commit comments

Comments
 (0)