Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
1ce9eb08
Commit
1ce9eb08
authored
Sep 02, 2010
by
Alfranio Correia
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
BUG#55961 Savepoint Identifier should be enclosed with backticks
Added backticks to the savepoint identifier.
parent
a73b7349
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
19 additions
and
15 deletions
+19
-15
mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
...l-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
+4
-4
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
...l-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
+4
-4
mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result
mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result
+4
-4
mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result
mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result
+1
-1
sql/log.cc
sql/log.cc
+6
-2
No files found.
mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
View file @
1ce9eb08
...
@@ -48,12 +48,12 @@ Log_name Pos Event_type Server_id End_log_pos Info
...
@@ -48,12 +48,12 @@ Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query # # BEGIN
master-bin.000001 # Query # # BEGIN
master-bin.000001 # Table_map # # table_id: # (test.t1)
master-bin.000001 # Table_map # # table_id: # (test.t1)
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Query # # SAVEPOINT
my_savepoint
master-bin.000001 # Query # # SAVEPOINT
`my_savepoint`
master-bin.000001 # Table_map # # table_id: # (test.t1)
master-bin.000001 # Table_map # # table_id: # (test.t1)
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Table_map # # table_id: # (test.t2)
master-bin.000001 # Table_map # # table_id: # (test.t2)
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Query # # ROLLBACK TO
my_savepoint
master-bin.000001 # Query # # ROLLBACK TO
`my_savepoint`
master-bin.000001 # Xid # # COMMIT /* XID */
master-bin.000001 # Xid # # COMMIT /* XID */
delete from t1;
delete from t1;
delete from t2;
delete from t2;
...
@@ -77,12 +77,12 @@ Log_name Pos Event_type Server_id End_log_pos Info
...
@@ -77,12 +77,12 @@ Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query # # BEGIN
master-bin.000001 # Query # # BEGIN
master-bin.000001 # Table_map # # table_id: # (test.t1)
master-bin.000001 # Table_map # # table_id: # (test.t1)
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Query # # SAVEPOINT
my_savepoint
master-bin.000001 # Query # # SAVEPOINT
`my_savepoint`
master-bin.000001 # Table_map # # table_id: # (test.t1)
master-bin.000001 # Table_map # # table_id: # (test.t1)
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Table_map # # table_id: # (test.t2)
master-bin.000001 # Table_map # # table_id: # (test.t2)
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Query # # ROLLBACK TO
my_savepoint
master-bin.000001 # Query # # ROLLBACK TO
`my_savepoint`
master-bin.000001 # Table_map # # table_id: # (test.t1)
master-bin.000001 # Table_map # # table_id: # (test.t1)
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Xid # # COMMIT /* XID */
master-bin.000001 # Xid # # COMMIT /* XID */
...
...
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
View file @
1ce9eb08
...
@@ -44,10 +44,10 @@ show binlog events from <binlog_start>;
...
@@ -44,10 +44,10 @@ show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query # # BEGIN
master-bin.000001 # Query # # BEGIN
master-bin.000001 # Query # # use `test`; insert into t1 values(3)
master-bin.000001 # Query # # use `test`; insert into t1 values(3)
master-bin.000001 # Query # # SAVEPOINT
my_savepoint
master-bin.000001 # Query # # SAVEPOINT
`my_savepoint`
master-bin.000001 # Query # # use `test`; insert into t1 values(4)
master-bin.000001 # Query # # use `test`; insert into t1 values(4)
master-bin.000001 # Query # # use `test`; insert into t2 select * from t1
master-bin.000001 # Query # # use `test`; insert into t2 select * from t1
master-bin.000001 # Query # # ROLLBACK TO
my_savepoint
master-bin.000001 # Query # # ROLLBACK TO
`my_savepoint`
master-bin.000001 # Xid # # COMMIT /* XID */
master-bin.000001 # Xid # # COMMIT /* XID */
delete from t1;
delete from t1;
delete from t2;
delete from t2;
...
@@ -70,10 +70,10 @@ show binlog events from <binlog_start>;
...
@@ -70,10 +70,10 @@ show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query # # BEGIN
master-bin.000001 # Query # # BEGIN
master-bin.000001 # Query # # use `test`; insert into t1 values(5)
master-bin.000001 # Query # # use `test`; insert into t1 values(5)
master-bin.000001 # Query # # SAVEPOINT
my_savepoint
master-bin.000001 # Query # # SAVEPOINT
`my_savepoint`
master-bin.000001 # Query # # use `test`; insert into t1 values(6)
master-bin.000001 # Query # # use `test`; insert into t1 values(6)
master-bin.000001 # Query # # use `test`; insert into t2 select * from t1
master-bin.000001 # Query # # use `test`; insert into t2 select * from t1
master-bin.000001 # Query # # ROLLBACK TO
my_savepoint
master-bin.000001 # Query # # ROLLBACK TO
`my_savepoint`
master-bin.000001 # Query # # use `test`; insert into t1 values(7)
master-bin.000001 # Query # # use `test`; insert into t1 values(7)
master-bin.000001 # Xid # # COMMIT /* XID */
master-bin.000001 # Xid # # COMMIT /* XID */
delete from t1;
delete from t1;
...
...
mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result
View file @
1ce9eb08
...
@@ -139,14 +139,14 @@ show binlog events from <binlog_start>;
...
@@ -139,14 +139,14 @@ show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query # # BEGIN
master-bin.000001 # Query # # BEGIN
master-bin.000001 # Query # # use `test`; INSERT INTO db1.t1 VALUES(20)
master-bin.000001 # Query # # use `test`; INSERT INTO db1.t1 VALUES(20)
master-bin.000001 # Query # # SAVEPOINT
has_comment
master-bin.000001 # Query # # SAVEPOINT
`has_comment`
master-bin.000001 # Query # # use `db1`; INSERT INTO db1.t1 VALUES(30)
master-bin.000001 # Query # # use `db1`; INSERT INTO db1.t1 VALUES(30)
master-bin.000001 # Query # # use `db1`; INSERT INTO db1.t2 VALUES("in savepoint has_comment")
master-bin.000001 # Query # # use `db1`; INSERT INTO db1.t2 VALUES("in savepoint has_comment")
master-bin.000001 # Query # # SAVEPOINT
mixed_cases
master-bin.000001 # Query # # SAVEPOINT
`mixed_cases`
master-bin.000001 # Query # # use `db1`; INSERT INTO db1.t2 VALUES("in savepoint mixed_cases")
master-bin.000001 # Query # # use `db1`; INSERT INTO db1.t2 VALUES("in savepoint mixed_cases")
master-bin.000001 # Query # # use `db1`; INSERT INTO db1.t1 VALUES(40)
master-bin.000001 # Query # # use `db1`; INSERT INTO db1.t1 VALUES(40)
master-bin.000001 # Query # # ROLLBACK TO
mixed_cases
master-bin.000001 # Query # # ROLLBACK TO
`mixed_cases`
master-bin.000001 # Query # # ROLLBACK TO
has_comment
master-bin.000001 # Query # # ROLLBACK TO
`has_comment`
master-bin.000001 # Query # # use `db1`; INSERT INTO db1.t2 VALUES("after rollback to")
master-bin.000001 # Query # # use `db1`; INSERT INTO db1.t2 VALUES("after rollback to")
master-bin.000001 # Query # # use `db1`; INSERT INTO db1.t1 VALUES(50)
master-bin.000001 # Query # # use `db1`; INSERT INTO db1.t1 VALUES(50)
master-bin.000001 # Xid # # COMMIT /* XID */
master-bin.000001 # Xid # # COMMIT /* XID */
...
...
mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result
View file @
1ce9eb08
...
@@ -997,7 +997,7 @@ master-bin.000001 # Query # # use `test_rpl`; INSERT INTO t1 VALUES (3, 'before
...
@@ -997,7 +997,7 @@ master-bin.000001 # Query # # use `test_rpl`; INSERT INTO t1 VALUES (3, 'before
master-bin.000001 # Xid # # COMMIT /* XID */
master-bin.000001 # Xid # # COMMIT /* XID */
master-bin.000001 # Query # # BEGIN
master-bin.000001 # Query # # BEGIN
master-bin.000001 # Query # # use `test_rpl`; INSERT INTO t1 VALUES (5, 'before savepoint s2')
master-bin.000001 # Query # # use `test_rpl`; INSERT INTO t1 VALUES (5, 'before savepoint s2')
master-bin.000001 # Query # # SAVEPOINT
s2
master-bin.000001 # Query # # SAVEPOINT
`s2`
master-bin.000001 # Query # # use `test_rpl`; INSERT INTO t1 VALUES (6, 'after savepoint s2')
master-bin.000001 # Query # # use `test_rpl`; INSERT INTO t1 VALUES (6, 'after savepoint s2')
master-bin.000001 # Table_map # # table_id: # (test_rpl.t1)
master-bin.000001 # Table_map # # table_id: # (test_rpl.t1)
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
...
...
sql/log.cc
View file @
1ce9eb08
...
@@ -1712,7 +1712,9 @@ static int binlog_savepoint_set(handlerton *hton, THD *thd, void *sv)
...
@@ -1712,7 +1712,9 @@ static int binlog_savepoint_set(handlerton *hton, THD *thd, void *sv)
String
log_query
;
String
log_query
;
if
(
log_query
.
append
(
STRING_WITH_LEN
(
"SAVEPOINT "
))
||
if
(
log_query
.
append
(
STRING_WITH_LEN
(
"SAVEPOINT "
))
||
log_query
.
append
(
thd
->
lex
->
ident
.
str
,
thd
->
lex
->
ident
.
length
))
log_query
.
append
(
"`"
)
||
log_query
.
append
(
thd
->
lex
->
ident
.
str
,
thd
->
lex
->
ident
.
length
)
||
log_query
.
append
(
"`"
))
DBUG_RETURN
(
1
);
DBUG_RETURN
(
1
);
int
errcode
=
query_error_code
(
thd
,
thd
->
killed
==
THD
::
NOT_KILLED
);
int
errcode
=
query_error_code
(
thd
,
thd
->
killed
==
THD
::
NOT_KILLED
);
Query_log_event
qinfo
(
thd
,
log_query
.
c_ptr_safe
(),
log_query
.
length
(),
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)
...
@@ -1734,7 +1736,9 @@ static int binlog_savepoint_rollback(handlerton *hton, THD *thd, void *sv)
{
{
String
log_query
;
String
log_query
;
if
(
log_query
.
append
(
STRING_WITH_LEN
(
"ROLLBACK TO "
))
||
if
(
log_query
.
append
(
STRING_WITH_LEN
(
"ROLLBACK TO "
))
||
log_query
.
append
(
thd
->
lex
->
ident
.
str
,
thd
->
lex
->
ident
.
length
))
log_query
.
append
(
"`"
)
||
log_query
.
append
(
thd
->
lex
->
ident
.
str
,
thd
->
lex
->
ident
.
length
)
||
log_query
.
append
(
"`"
))
DBUG_RETURN
(
1
);
DBUG_RETURN
(
1
);
int
errcode
=
query_error_code
(
thd
,
thd
->
killed
==
THD
::
NOT_KILLED
);
int
errcode
=
query_error_code
(
thd
,
thd
->
killed
==
THD
::
NOT_KILLED
);
Query_log_event
qinfo
(
thd
,
log_query
.
c_ptr_safe
(),
log_query
.
length
(),
Query_log_event
qinfo
(
thd
,
log_query
.
c_ptr_safe
(),
log_query
.
length
(),
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment