Skip to content

M
mariadb
Commit 738cd74b authored by lars/lthalmann@mysql.com/dl145j.mysql.com's avatar lars/lthalmann@mysql.com/dl145j.mysql.com
Browse files
Options

After merge fixes

parent 2c5dc57e
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 30 deletions
mysql-test/r/rpl_insert_id.result
View file @ 738cd74b
...@@ -91,10 +91,10 @@ CREATE TABLE t1 ( a INT UNIQUE ); ...@@ -91,10 +91,10 @@ CREATE TABLE t1 ( a INT UNIQUE );
SET FOREIGN_KEY_CHECKS=0; SET FOREIGN_KEY_CHECKS=0;
INSERT INTO t1 VALUES (1),(1); INSERT INTO t1 VALUES (1),(1);
ERROR 23000: Duplicate entry '1' for key 1 ERROR 23000: Duplicate entry '1' for key 1
drop table t1;
# #
# Bug#14553: NULL in WHERE resets LAST_INSERT_ID # Bug#14553: NULL in WHERE resets LAST_INSERT_ID
# #
drop table t1;
create table t1(a int auto_increment, key(a)); create table t1(a int auto_increment, key(a));
create table t2(a int); create table t2(a int);
insert into t1 (a) values (null); insert into t1 (a) values (null);
...@@ -234,3 +234,6 @@ n b ...@@ -234,3 +234,6 @@ n b
2 100 2 100
3 350 3 350
drop table t1; drop table t1;
# End of 5.0 tests
mysql-test/r/rpl_max_relay_size.result
View file @ 738cd74b
...@@ -27,9 +27,9 @@ Master_User root ...@@ -27,9 +27,9 @@ Master_User root
Master_Port MASTER_PORT Master_Port MASTER_PORT
Connect_Retry 1 Connect_Retry 1
Master_Log_File master-bin.000001 Master_Log_File master-bin.000001
Read_Master_Log_Pos 50477 Read_Master_Log_Pos 72952
Relay_Log_File slave-relay-bin.000014 Relay_Log_File #
Relay_Log_Pos 1221 Relay_Log_Pos #
Relay_Master_Log_File master-bin.000001 Relay_Master_Log_File master-bin.000001
Slave_IO_Running Yes Slave_IO_Running Yes
Slave_SQL_Running Yes Slave_SQL_Running Yes
...@@ -42,8 +42,8 @@ Replicate_Wild_Ignore_Table ...@@ -42,8 +42,8 @@ Replicate_Wild_Ignore_Table
Last_Errno 0 Last_Errno 0
Last_Error Last_Error
Skip_Counter 0 Skip_Counter 0
Exec_Master_Log_Pos 50477 Exec_Master_Log_Pos 72952
Relay_Log_Space 1221 Relay_Log_Space #
Until_Condition None Until_Condition None
Until_Log_File Until_Log_File
Until_Log_Pos 0 Until_Log_Pos 0
...@@ -70,9 +70,9 @@ Master_User root ...@@ -70,9 +70,9 @@ Master_User root
Master_Port MASTER_PORT Master_Port MASTER_PORT
Connect_Retry 1 Connect_Retry 1
Master_Log_File master-bin.000001 Master_Log_File master-bin.000001
Read_Master_Log_Pos 50477 Read_Master_Log_Pos 72952
Relay_Log_File slave-relay-bin.000004 Relay_Log_File #
Relay_Log_Pos 9457 Relay_Log_Pos #
Relay_Master_Log_File master-bin.000001 Relay_Master_Log_File master-bin.000001
Slave_IO_Running Yes Slave_IO_Running Yes
Slave_SQL_Running Yes Slave_SQL_Running Yes
...@@ -85,8 +85,8 @@ Replicate_Wild_Ignore_Table ...@@ -85,8 +85,8 @@ Replicate_Wild_Ignore_Table
Last_Errno 0 Last_Errno 0
Last_Error Last_Error
Skip_Counter 0 Skip_Counter 0
Exec_Master_Log_Pos 50477 Exec_Master_Log_Pos 72952
Relay_Log_Space 9457 Relay_Log_Space #
Until_Condition None Until_Condition None
Until_Log_File Until_Log_File
Until_Log_Pos 0 Until_Log_Pos 0
...@@ -113,9 +113,9 @@ Master_User root ...@@ -113,9 +113,9 @@ Master_User root
Master_Port MASTER_PORT Master_Port MASTER_PORT
Connect_Retry 1 Connect_Retry 1
Master_Log_File master-bin.000001 Master_Log_File master-bin.000001
Read_Master_Log_Pos 50477 Read_Master_Log_Pos 72952
Relay_Log_File slave-relay-bin.000008 Relay_Log_File #
Relay_Log_Pos 1283 Relay_Log_Pos #
Relay_Master_Log_File master-bin.000001 Relay_Master_Log_File master-bin.000001
Slave_IO_Running Yes Slave_IO_Running Yes
Slave_SQL_Running Yes Slave_SQL_Running Yes
...@@ -128,8 +128,8 @@ Replicate_Wild_Ignore_Table ...@@ -128,8 +128,8 @@ Replicate_Wild_Ignore_Table
Last_Errno 0 Last_Errno 0
Last_Error Last_Error
Skip_Counter 0 Skip_Counter 0
Exec_Master_Log_Pos 50477 Exec_Master_Log_Pos 72952
Relay_Log_Space 1283 Relay_Log_Space #
Until_Condition None Until_Condition None
Until_Log_File Until_Log_File
Until_Log_Pos 0 Until_Log_Pos 0
...@@ -154,8 +154,8 @@ Master_Port MASTER_PORT ...@@ -154,8 +154,8 @@ Master_Port MASTER_PORT
Connect_Retry 1 Connect_Retry 1
Master_Log_File Master_Log_File
Read_Master_Log_Pos 4 Read_Master_Log_Pos 4
Relay_Log_File slave-relay-bin.000001 Relay_Log_File #
Relay_Log_Pos 4 Relay_Log_Pos #
Relay_Master_Log_File Relay_Master_Log_File
Slave_IO_Running No Slave_IO_Running No
Slave_SQL_Running No Slave_SQL_Running No
...@@ -169,7 +169,7 @@ Last_Errno 0 ...@@ -169,7 +169,7 @@ Last_Errno 0
Last_Error Last_Error
Skip_Counter 0 Skip_Counter 0
Exec_Master_Log_Pos 0 Exec_Master_Log_Pos 0
Relay_Log_Space 4 Relay_Log_Space #
Until_Condition None Until_Condition None
Until_Log_File Until_Log_File
Until_Log_Pos 0 Until_Log_Pos 0
...@@ -194,9 +194,9 @@ Master_User root ...@@ -194,9 +194,9 @@ Master_User root
Master_Port MASTER_PORT Master_Port MASTER_PORT
Connect_Retry 1 Connect_Retry 1
Master_Log_File master-bin.000001 Master_Log_File master-bin.000001
Read_Master_Log_Pos 50535 Read_Master_Log_Pos 73038
Relay_Log_File slave-relay-bin.000009 Relay_Log_File #
Relay_Log_Pos 62 Relay_Log_Pos #
Relay_Master_Log_File master-bin.000001 Relay_Master_Log_File master-bin.000001
Slave_IO_Running Yes Slave_IO_Running Yes
Slave_SQL_Running Yes Slave_SQL_Running Yes
...@@ -209,8 +209,8 @@ Replicate_Wild_Ignore_Table ...@@ -209,8 +209,8 @@ Replicate_Wild_Ignore_Table
Last_Errno 0 Last_Errno 0
Last_Error Last_Error
Skip_Counter 0 Skip_Counter 0
Exec_Master_Log_Pos 50535 Exec_Master_Log_Pos 73038
Relay_Log_Space 62 Relay_Log_Space #
Until_Condition None Until_Condition None
Until_Log_File Until_Log_File
Until_Log_Pos 0 Until_Log_Pos 0
...@@ -233,9 +233,9 @@ Master_User root ...@@ -233,9 +233,9 @@ Master_User root
Master_Port MASTER_PORT Master_Port MASTER_PORT
Connect_Retry 1 Connect_Retry 1
Master_Log_File master-bin.000001 Master_Log_File master-bin.000001
Read_Master_Log_Pos 50583 Read_Master_Log_Pos 73114
Relay_Log_File slave-relay-bin.000010 Relay_Log_File #
Relay_Log_Pos 52 Relay_Log_Pos #
Relay_Master_Log_File master-bin.000001 Relay_Master_Log_File master-bin.000001
Slave_IO_Running Yes Slave_IO_Running Yes
Slave_SQL_Running Yes Slave_SQL_Running Yes
...@@ -248,8 +248,8 @@ Replicate_Wild_Ignore_Table ...@@ -248,8 +248,8 @@ Replicate_Wild_Ignore_Table
Last_Errno 0 Last_Errno 0
Last_Error Last_Error
Skip_Counter 0 Skip_Counter 0
Exec_Master_Log_Pos 50583 Exec_Master_Log_Pos 73114
Relay_Log_Space 52 Relay_Log_Space #
Until_Condition None Until_Condition None
Until_Log_File Until_Log_File
Until_Log_Pos 0 Until_Log_Pos 0
...@@ -263,6 +263,9 @@ Seconds_Behind_Master # ...@@ -263,6 +263,9 @@ Seconds_Behind_Master #
flush logs; flush logs;
show master status; show master status;
File master-bin.000002 File master-bin.000002
Position 4 Position 98
Binlog_Do_DB Binlog_Do_DB
Binlog_Ignore_DB Binlog_Ignore_DB
#
# End of 4.1 tests
#
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7