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
a5a1fef3
Commit
a5a1fef3
authored
16 years ago
by
joerg@trift2
Browse files
Options
Browse Files
Download
Plain Diff
Merge trift2.:/MySQL/M51/clone-5.1
into trift2.:/MySQL/M51/push-5.1
parents
a1173ad6
2dc1c7e2
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
5 deletions
+9
-5
mysql-test/include/master-slave-reset.inc
mysql-test/include/master-slave-reset.inc
+2
-1
mysql-test/suite/rpl/t/rpl_insert.test
mysql-test/suite/rpl/t/rpl_insert.test
+6
-3
sql/set_var.cc
sql/set_var.cc
+1
-1
No files found.
mysql-test/include/master-slave-reset.inc
View file @
a5a1fef3
...
@@ -3,7 +3,7 @@ connection slave;
...
@@ -3,7 +3,7 @@ connection slave;
#(the server was started with skip-slave-start)
#(the server was started with skip-slave-start)
--
disable_warnings
--
disable_warnings
stop
slave
;
stop
slave
;
--
wait_for_slave_to_stop
source
include
/
wait_for_slave_to_stop
.
inc
;
--
enable_warnings
--
enable_warnings
connection
master
;
connection
master
;
--
disable_warnings
--
disable_warnings
...
@@ -20,3 +20,4 @@ reset slave;
...
@@ -20,3 +20,4 @@ reset slave;
drop
table
if
exists
t1
,
t2
,
t3
,
t4
,
t5
,
t6
,
t7
,
t8
,
t9
;
drop
table
if
exists
t1
,
t2
,
t3
,
t4
,
t5
,
t6
,
t7
,
t8
,
t9
;
--
enable_warnings
--
enable_warnings
start
slave
;
start
slave
;
source
include
/
wait_for_slave_to_start
.
inc
;
This diff is collapsed.
Click to expand it.
mysql-test/suite/rpl/t/rpl_insert.test
View file @
a5a1fef3
...
@@ -18,10 +18,13 @@ let $query = "INSERT DELAYED INTO t1 VALUES (1, 'Dr. No'), (2, 'From Russia With
...
@@ -18,10 +18,13 @@ let $query = "INSERT DELAYED INTO t1 VALUES (1, 'Dr. No'), (2, 'From Russia With
# Wait until all the 5000 inserts has been inserted into the table
# Wait until all the 5000 inserts has been inserted into the table
let
$wait_condition
=
SELECT
COUNT
(
*
)
=
5000
FROM
mysqlslap
.
t1
;
let
$wait_condition
=
SELECT
COUNT
(
*
)
=
5000
FROM
mysqlslap
.
t1
;
--
source
include
/
wait_condition
.
inc
source
include
/
wait_condition
.
inc
;
SELECT
COUNT
(
*
)
FROM
mysqlslap
.
t1
;
SELECT
COUNT
(
*
)
FROM
mysqlslap
.
t1
;
sync_slave_with_master
;
connection
slave
;
# Wait until all the 5000 inserts has been inserted into the table
let
$wait_condition
=
SELECT
COUNT
(
*
)
=
5000
FROM
mysqlslap
.
t1
;
source
include
/
wait_condition
.
inc
;
SELECT
COUNT
(
*
)
FROM
mysqlslap
.
t1
;
SELECT
COUNT
(
*
)
FROM
mysqlslap
.
t1
;
--
echo
#
--
echo
#
...
...
This diff is collapsed.
Click to expand it.
sql/set_var.cc
View file @
a5a1fef3
...
@@ -713,7 +713,7 @@ static uchar *slave_get_report_port(THD *thd)
...
@@ -713,7 +713,7 @@ static uchar *slave_get_report_port(THD *thd)
return
(
uchar
*
)
&
thd
->
sys_var_tmp
.
long_value
;
return
(
uchar
*
)
&
thd
->
sys_var_tmp
.
long_value
;
}
}
static
sys_var_readonly
sys_repl_report_port
(
&
vars
,
"report_port"
,
OPT_GLOBAL
,
SHOW_
INT
,
slave_get_report_port
);
static
sys_var_readonly
sys_repl_report_port
(
&
vars
,
"report_port"
,
OPT_GLOBAL
,
SHOW_
LONG
,
slave_get_report_port
);
#endif
#endif
...
...
This diff is collapsed.
Click to expand it.
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