Merge work.mysql.com:/home/bk/mysql

into work.mysql.com:/d1/users/tim/my/work

9 files changed, 65 insertions, 21 deletions

diff --git a/mysql-test/r/backup.result b/mysql-test/r/backup.result
index a801e1cd28d..4b7b62f3ee8 100644
--- a/mysql-test/r/backup.result
+++ b/mysql-test/r/backup.result
@@ -37,3 +37,7 @@ k
 223
 245
 267
+Table	Op	Msg_type	Msg_text
+test.t1	restore	status	OK
+Table	Op	Msg_type	Msg_text
+test.t1	backup	status	OK
diff --git a/mysql-test/r/distinct.result b/mysql-test/r/distinct.result
index 79c55e45342..1199cd07e2e 100644
--- a/mysql-test/r/distinct.result
+++ b/mysql-test/r/distinct.result
@@ -153,3 +153,17 @@ j_lj_t3	index	id	id	4	NULL	2	where used; Using index; Distinct
 t3_lj	index	id	id	8	NULL	1	where used; Using index; Distinct
 id
 2
+a	sec_to_time(sum(time_to_sec(t)))
+1	00:06:15
+1	00:36:30
+1	00:36:30
+a	sec_to_time(sum(time_to_sec(t)))
+1	00:06:15
+1	00:36:30
+a	sec_to_time(sum(time_to_sec(t)))
+1	00:06:15
+1	00:36:30
+1	00:36:30
+a	sec_to_time(sum(time_to_sec(t)))
+1	00:06:15
+1	00:36:30
diff --git a/mysql-test/r/merge.result b/mysql-test/r/merge.result
index 5ef58bcef3f..aa9ea098e0a 100644
--- a/mysql-test/r/merge.result
+++ b/mysql-test/r/merge.result
@@ -106,4 +106,10 @@ incr	othr
 2	24
 4	33
 3	53
+count(*)
+10
+count(*)
+20
+count(*)
+20
 a
diff --git a/mysql-test/r/rpl000014.result b/mysql-test/r/rpl000014.result
index 9e45b9c10a3..d2cb8ee5436 100644
--- a/mysql-test/r/rpl000014.result
+++ b/mysql-test/r/rpl000014.result
@@ -1,13 +1,13 @@
 File	Position	Binlog_do_db	Binlog_ignore_db
 master-bin.001	73		
-Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db
-127.0.0.1	root	9306	1	master-bin.001	73	Yes		
-Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db
-127.0.0.1	root	9306	1	master-bin.001	73	No		
-Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db
-127.0.0.1	root	9306	1	master-bin.001	73	Yes		
-Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db
-127.0.0.1	root	9306	1	master-bin.001	173	Yes		
+Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter
+127.0.0.1	root	9306	1	master-bin.001	73	Yes			0		0
+Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter
+127.0.0.1	root	9306	1	master-bin.001	73	No			0		0
+Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter
+127.0.0.1	root	9306	1	master-bin.001	73	Yes			0		0
+Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter
+127.0.0.1	root	9306	1	master-bin.001	173	Yes			0		0
 File	Position	Binlog_do_db	Binlog_ignore_db
 master-bin.001	73		
 n
diff --git a/mysql-test/r/rpl000015.result b/mysql-test/r/rpl000015.result
index 59a1a21be17..5899d76c82f 100644
--- a/mysql-test/r/rpl000015.result
+++ b/mysql-test/r/rpl000015.result
@@ -1,13 +1,13 @@
 File	Position	Binlog_do_db	Binlog_ignore_db
 master-bin.001	73		
-Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db
-		0	0		0	No		
-Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db
-127.0.0.1	test	3306	60		4	No		
-Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db
-127.0.0.1	root	9306	60		4	No		
-Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db
-127.0.0.1	root	9306	60	master-bin.001	73	Yes		
+Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter
+		0	0		0	No			0		0
+Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter
+127.0.0.1	test	3306	60		4	No			0		0
+Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter
+127.0.0.1	root	9306	60		4	No			0		0
+Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter
+127.0.0.1	root	9306	60	master-bin.001	73	Yes			0		0
 n
 10
 45
diff --git a/mysql-test/r/rpl000016.result b/mysql-test/r/rpl000016.result
index ae5b83a4a85..39ea7234e2a 100644
--- a/mysql-test/r/rpl000016.result
+++ b/mysql-test/r/rpl000016.result
@@ -1,5 +1,5 @@
-Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db
-127.0.0.1	root	9306	60	master-bin.001	216	Yes		
+Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter
+127.0.0.1	root	9306	60	master-bin.001	216	Yes			0		0
 s
 Could not break slave
 Tried hard
@@ -9,10 +9,17 @@ master-bin.002
 master-bin.003
 Log_name
 master-bin.003
-Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db
-127.0.0.1	root	9306	60	master-bin.003	128	Yes		
+Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter
+127.0.0.1	root	9306	60	master-bin.003	184	Yes			0		0
 m
 34
+65
 67
 123
-65
+1234
+Log_name
+master-bin.003
+master-bin.004
+master-bin.005
+count(*)
+100
diff --git a/mysql-test/r/rpl000017.result b/mysql-test/r/rpl000017.result
new file mode 100644
index 00000000000..e4f324047f8
--- /dev/null
+++ b/mysql-test/r/rpl000017.result
@@ -0,0 +1,2 @@
+n
+24
diff --git a/mysql-test/r/rpl000018.result b/mysql-test/r/rpl000018.result
new file mode 100644
index 00000000000..7c89c2ef2b2
--- /dev/null
+++ b/mysql-test/r/rpl000018.result
@@ -0,0 +1,5 @@
+Log_name
+master-bin.001
+master-bin.002
+n
+3351
diff --git a/mysql-test/r/status.result b/mysql-test/r/status.result
new file mode 100644
index 00000000000..8f3ad3e0d59
--- /dev/null
+++ b/mysql-test/r/status.result
@@ -0,0 +1,6 @@
+Variable_name	Value
+Table_locks_immediate	0
+Table_locks_waited	0
+Variable_name	Value
+Table_locks_immediate	3
+Table_locks_waited	1