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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
9c0097fa
Commit
9c0097fa
authored
17 years ago
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
into mysql.com:/home/my/mysql-5.1
parents
10b96122
763f105d
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
27 additions
and
10 deletions
+27
-10
client/mysqltest.c
client/mysqltest.c
+4
-3
mysql-test/extra/rpl_tests/rpl_max_relay_size.test
mysql-test/extra/rpl_tests/rpl_max_relay_size.test
+3
-0
mysql-test/extra/rpl_tests/rpl_relayrotate.test
mysql-test/extra/rpl_tests/rpl_relayrotate.test
+4
-0
mysql-test/include/federated.inc
mysql-test/include/federated.inc
+5
-0
mysql-test/include/federated_cleanup.inc
mysql-test/include/federated_cleanup.inc
+0
-2
mysql-test/t/federated_server.test
mysql-test/t/federated_server.test
+3
-2
mysql-test/t/rpl_flushlog_loop.test
mysql-test/t/rpl_flushlog_loop.test
+3
-0
sql/net_serv.cc
sql/net_serv.cc
+1
-1
sql/slave.cc
sql/slave.cc
+4
-2
No files found.
client/mysqltest.c
View file @
9c0097fa
...
...
@@ -2552,6 +2552,7 @@ int do_save_master_pos()
MYSQL
*
mysql
=
&
cur_con
->
mysql
;
const
char
*
query
;
int
rpl_parse
;
DBUG_ENTER
(
"do_save_master_pos"
);
rpl_parse
=
mysql_rpl_parse_enabled
(
mysql
);
mysql_disable_rpl_parse
(
mysql
);
...
...
@@ -2709,7 +2710,7 @@ int do_save_master_pos()
if
(
rpl_parse
)
mysql_enable_rpl_parse
(
mysql
);
return
0
;
DBUG_RETURN
(
0
)
;
}
...
...
@@ -3164,7 +3165,7 @@ struct st_connection * find_connection_by_name(const char *name)
int
select_connection_name
(
const
char
*
name
)
{
DBUG_ENTER
(
"select_connection
2
"
);
DBUG_ENTER
(
"select_connection
_name
"
);
DBUG_PRINT
(
"enter"
,(
"name: '%s'"
,
name
));
if
(
!
(
cur_con
=
find_connection_by_name
(
name
)))
...
...
@@ -3187,7 +3188,7 @@ int select_connection(struct st_command *command)
if
(
*
p
)
*
p
++=
0
;
command
->
last_argument
=
p
;
return
select_connection_name
(
name
);
DBUG_RETURN
(
select_connection_name
(
name
)
);
}
...
...
This diff is collapsed.
Click to expand it.
mysql-test/extra/rpl_tests/rpl_max_relay_size.test
View file @
9c0097fa
...
...
@@ -6,6 +6,9 @@
# Requires statement logging
--
source
include
/
master
-
slave
.
inc
# We have to sync with master, to ensure slave had time to start properly
# before we stop it. If not, we get errors about UNIX_TIMESTAMP() in the log.
sync_slave_with_master
;
connection
slave
;
stop
slave
;
connection
master
;
...
...
This diff is collapsed.
Click to expand it.
mysql-test/extra/rpl_tests/rpl_relayrotate.test
View file @
9c0097fa
...
...
@@ -10,6 +10,10 @@
--
source
include
/
master
-
slave
.
inc
# We have to sync with master, to ensure slave had time to start properly
# before we stop it. If not, we get errors about UNIX_TIMESTAMP() in the log.
connection
master
;
sync_slave_with_master
;
connection
slave
;
stop
slave
;
connection
master
;
...
...
This diff is collapsed.
Click to expand it.
mysql-test/include/federated.inc
View file @
9c0097fa
...
...
@@ -5,6 +5,11 @@ source ./include/master-slave.inc;
# remote table creation
# We have to sync with master, to ensure slave had time to start properly
# before we stop it. If not, we get errors about UNIX_TIMESTAMP() in the log.
connection
master
;
sync_slave_with_master
;
connection
slave
;
#--replicate-ignore-db=federated
stop
slave
;
...
...
This diff is collapsed.
Click to expand it.
mysql-test/include/federated_cleanup.inc
View file @
9c0097fa
...
...
@@ -2,10 +2,8 @@ connection master;
--
disable_warnings
DROP
TABLE
IF
EXISTS
federated
.
t1
;
DROP
DATABASE
IF
EXISTS
federated
;
--
enable_warnings
connection
slave
;
--
disable_warnings
DROP
TABLE
IF
EXISTS
federated
.
t1
;
DROP
DATABASE
IF
EXISTS
federated
;
--
enable_warnings
This diff is collapsed.
Click to expand it.
mysql-test/t/federated_server.test
View file @
9c0097fa
...
...
@@ -2,7 +2,8 @@
# if federated can utilise the servers table
# should work with embedded server after mysqltest is fixed
--
source
include
/
not_embedded
.
inc
source
include
/
federated
.
inc
;
--
source
include
/
federated
.
inc
;
--
source
include
/
big_test
.
inc
connection
slave
;
create
database
first_db
;
...
...
@@ -299,7 +300,7 @@ begin
DECLARE
i
INT
;
DECLARE
CONTINUE
HANDLER
FOR
SQLEXCEPTION
SET
e
=
e
+
1
;
SET
i
=
sleep
(
5
);
WHILE
v
<
2
0000
do
WHILE
v
<
1
0000
do
CREATE
SERVER
s
FOREIGN
DATA
WRAPPER
mysql
OPTIONS
(
USER
'Remote'
,
HOST
'192.168.1.106'
,
DATABASE
'test'
);
...
...
This diff is collapsed.
Click to expand it.
mysql-test/t/rpl_flushlog_loop.test
View file @
9c0097fa
...
...
@@ -5,6 +5,9 @@
#
# Start replication master -> slave
#
# We have to sync with master, to ensure slave had time to start properly
# before we stop it. If not, we get errors about UNIX_TIMESTAMP() in the log.
sync_slave_with_master
;
connection
slave
;
--
disable_warnings
stop
slave
;
...
...
This diff is collapsed.
Click to expand it.
sql/net_serv.cc
View file @
9c0097fa
...
...
@@ -299,7 +299,7 @@ void net_clear(NET *net, my_bool clear_buffer)
DBUG_PRINT
(
"info"
,(
"skipped %d bytes from file: %s"
,
count
,
vio_description
(
net
->
vio
)));
#if defined(EXTRA_DEBUG)
fprintf
(
stderr
,
"
Error
: net_clear() skipped %d bytes from file: %s
\n
"
,
fprintf
(
stderr
,
"
Note
: net_clear() skipped %d bytes from file: %s
\n
"
,
count
,
vio_description
(
net
->
vio
));
#endif
}
...
...
This diff is collapsed.
Click to expand it.
sql/slave.cc
View file @
9c0097fa
...
...
@@ -794,8 +794,10 @@ static int get_master_version_and_clock(MYSQL* mysql, MASTER_INFO* mi)
else
{
mi
->
clock_diff_with_master
=
0
;
/* The "most sensible" value */
sql_print_warning
(
"
\"
SELECT UNIX_TIMESTAMP()
\"
failed on master, \
do not trust column Seconds_Behind_Master of SHOW SLAVE STATUS"
);
sql_print_warning
(
"
\"
SELECT UNIX_TIMESTAMP()
\"
failed on master, "
"do not trust column Seconds_Behind_Master of SHOW "
"SLAVE STATUS. Error: %s (%d)"
,
mysql_error
(
mysql
),
mysql_errno
(
mysql
));
}
if
(
master_res
)
mysql_free_result
(
master_res
);
...
...
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