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
1bea4bd3
Commit
1bea4bd3
authored
Oct 05, 2001
by
sasha@mysql.sashanet.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed crash on slave when master aborts a query that has % in it.
parent
38d120b0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
3 deletions
+4
-3
BitKeeper/etc/logging_ok
BitKeeper/etc/logging_ok
+1
-0
mysql-test/t/rpl000001.test
mysql-test/t/rpl000001.test
+2
-2
sql/slave.cc
sql/slave.cc
+1
-1
No files found.
BitKeeper/etc/logging_ok
View file @
1bea4bd3
...
@@ -3,3 +3,4 @@ monty@hundin.mysql.fi
...
@@ -3,3 +3,4 @@ monty@hundin.mysql.fi
paul@central.snake.net
paul@central.snake.net
serg@serg.mysql.com
serg@serg.mysql.com
monty@work.mysql.com
monty@work.mysql.com
sasha@mysql.sashanet.com
mysql-test/t/rpl000001.test
View file @
1bea4bd3
...
@@ -42,10 +42,10 @@ save_master_pos;
...
@@ -42,10 +42,10 @@ save_master_pos;
connection
master1
;
connection
master1
;
#avoid generating result
#avoid generating result
create
temporary
table
t1_temp
(
n
int
);
create
temporary
table
t1_temp
(
n
int
);
insert
into
t1_temp
select
get_lock
(
'crash_lock'
,
1
)
from
t2
;
insert
into
t1_temp
select
get_lock
(
'crash_lock
%20C
'
,
1
)
from
t2
;
connection
master
;
connection
master
;
send
update
t1
set
n
=
n
+
get_lock
(
'crash_lock'
,
2
);
send
update
t1
set
n
=
n
+
get_lock
(
'crash_lock
%20C
'
,
2
);
connection
master1
;
connection
master1
;
sleep
2
;
sleep
2
;
select
(
@
id
:=
id
)
-
id
from
t2
;
select
(
@
id
:=
id
)
-
id
from
t2
;
...
...
sql/slave.cc
View file @
1bea4bd3
...
@@ -862,7 +862,7 @@ point. If you are sure that your master is ok, run this query manually on the\
...
@@ -862,7 +862,7 @@ point. If you are sure that your master is ok, run this query manually on the\
slave and then restart the slave with SET SQL_SLAVE_SKIP_COUNTER=1;\
slave and then restart the slave with SET SQL_SLAVE_SKIP_COUNTER=1;\
SLAVE START;"
,
thd
->
query
);
SLAVE START;"
,
thd
->
query
);
last_slave_errno
=
expected_error
;
last_slave_errno
=
expected_error
;
sql_print_error
(
last_slave_error
);
sql_print_error
(
"%s"
,
last_slave_error
);
return
1
;
return
1
;
default:
default:
return
0
;
return
0
;
...
...
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