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
11e90a65
Commit
11e90a65
authored
Sep 03, 2007
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into station.:/mnt/raid/alik/MySQL/5.1-rt-build
parents
46d7b333
81dff135
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
68 additions
and
30 deletions
+68
-30
include/my_global.h
include/my_global.h
+6
-6
mysql-test/suite/rpl/r/rpl_ps.result
mysql-test/suite/rpl/r/rpl_ps.result
+25
-14
mysql-test/suite/rpl/t/rpl_ps.test
mysql-test/suite/rpl/t/rpl_ps.test
+37
-10
No files found.
include/my_global.h
View file @
11e90a65
...
...
@@ -562,12 +562,6 @@ int __void__;
#define PURIFY_OR_LINT_INIT(var)
#endif
/* Define some useful general macros */
#if !defined(max)
#define max(a, b) ((a) > (b) ? (a) : (b))
#define min(a, b) ((a) < (b) ? (a) : (b))
#endif
#if !defined(HAVE_UINT)
#undef HAVE_UINT
#define HAVE_UINT
...
...
@@ -1508,4 +1502,10 @@ inline void operator delete[](void*, void*) { /* Do nothing */ }
/* Length of decimal number represented by INT64. */
#define MY_INT64_NUM_DECIMAL_DIGITS 21
/* Define some useful general macros (should be done after all headers). */
#if !defined(max)
#define max(a, b) ((a) > (b) ? (a) : (b))
#define min(a, b) ((a) < (b) ? (a) : (b))
#endif
#endif
/* my_global_h */
mysql-test/suite/rpl/r/rpl_ps.result
View file @
11e90a65
...
...
@@ -34,17 +34,18 @@ stop slave;
#
########################################################################
#
# Check that binlog is filled properly.
#
# Connection: slave
CREATE DATABASE mysqltest1;
CREATE TABLE t1(c INT);
RESET MASTER;
RESET SLAVE;
START SLAVE;
# Connection: master
PREPARE stmt_d_1 FROM 'INSERT INTO t1 VALUES(1)';
CREATE DATABASE mysqltest1;
CREATE TABLE t1(db_name CHAR(32), db_col_name CHAR(32));
PREPARE stmt_d_1 FROM 'INSERT INTO t1 VALUES(DATABASE(), @@collation_database)';
EXECUTE stmt_d_1;
...
...
@@ -52,18 +53,28 @@ use mysqltest1;
EXECUTE stmt_d_1;
FLUSH LOGS;
SHOW BINLOG EVENTS FROM 106;
Log_name Pos Event_type Server_id End_log_pos Info
slave-bin.000001 106 Query 2 193 use `test`; INSERT INTO t1 VALUES(1)
slave-bin.000001 193 Query 2 280 use `test`; INSERT INTO t1 VALUES(1)
slave-bin.000001 280 Rotate 2 323 slave-bin.000002;pos=4
# Connection: slave
SELECT * FROM t1;
db_name db_col_name
test latin1_swedish_ci
test latin1_swedish_ci
# Connection: master
DROP DATABASE mysqltest1;
use test;
# Connection: slave
STOP SLAVE;
########################################################################
reset master;
reset slave;
mysql-test/suite/rpl/t/rpl_ps.test
View file @
11e90a65
...
...
@@ -73,20 +73,24 @@ stop slave;
###############################################################################
--
echo
--
echo
#
--
echo
# Check that binlog is filled properly.
--
echo
#
--
echo
#
Connection: slave
--
echo
--
connection
slave
--
echo
CREATE
DATABASE
mysqltest1
;
CREATE
TABLE
t1
(
c
INT
);
START
SLAVE
;
--
echo
RESET
MASTER
;
RESET
SLAVE
;
--
echo
# Connection: master
--
echo
--
connection
master
--
echo
PREPARE
stmt_d_1
FROM
'INSERT INTO t1 VALUES(1)'
;
CREATE
DATABASE
mysqltest1
;
CREATE
TABLE
t1
(
db_name
CHAR
(
32
),
db_col_name
CHAR
(
32
));
--
echo
PREPARE
stmt_d_1
FROM
'INSERT INTO t1 VALUES(DATABASE(), @@collation_database)'
;
--
echo
EXECUTE
stmt_d_1
;
...
...
@@ -98,10 +102,21 @@ use mysqltest1;
EXECUTE
stmt_d_1
;
--
echo
FLUSH
LOGS
;
--
save_master_pos
--
echo
--
echo
# Connection: slave
--
echo
--
connection
slave
--
sync_with_master
--
echo
SHOW
BINLOG
EVENTS
FROM
106
;
SELECT
*
FROM
t1
;
--
echo
--
echo
# Connection: master
--
echo
--
connection
master
--
echo
DROP
DATABASE
mysqltest1
;
...
...
@@ -109,6 +124,18 @@ DROP DATABASE mysqltest1;
--
echo
use
test
;
--
echo
--
save_master_pos
--
echo
--
echo
# Connection: slave
--
echo
--
connection
slave
--
sync_with_master
--
echo
STOP
SLAVE
;
--
echo
--
echo
########################################################################
...
...
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