bk commit into 5.2 tree (patg:1.2338)

[Patrick Galbraith]

Below is the list of changes that have just been committed into a local
5.2 repository of patg. When patg does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-11-10 17:35:33-05:00, patg@stripped +2 -0
  Post merge changes

  mysql-test/r/backup.result@stripped, 2006-11-10 17:35:30-05:00, patg@stripped +13
-13
    Post merge changes

  mysql-test/r/connect.result@stripped, 2006-11-10 17:35:30-05:00, patg@stripped +3 -0
    Post merge changes

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	patg
# Host:	govinda.patg.net
# Root:	/home/patg/mysql-build/mysql-5.2-wl3031.clone2

--- 1.23/mysql-test/r/connect.result	2006-11-10 17:35:42 -05:00
+++ 1.24/mysql-test/r/connect.result	2006-11-10 17:35:42 -05:00
@@ -14,6 +14,7 @@
 plugin
 proc
 procs_priv
+servers
 slow_log
 tables_priv
 time_zone
@@ -45,6 +46,7 @@
 plugin
 proc
 procs_priv
+servers
 slow_log
 tables_priv
 time_zone
@@ -84,6 +86,7 @@
 plugin
 proc
 procs_priv
+servers
 slow_log
 tables_priv
 time_zone

--- 1.21/mysql-test/r/backup.result	2006-11-10 17:35:42 -05:00
+++ 1.22/mysql-test/r/backup.result	2006-11-10 17:35:42 -05:00
@@ -6,26 +6,26 @@
 test.t4	backup	error	Failed copying .frm file (errno: X)
 test.t4	backup	status	Operation failed
 Warnings:
-Warning	1541	The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 5.2.
Please use MySQL Administrator (mysqldump, mysql) instead
+Warning	1542	The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 5.2.
Please use MySQL Administrator (mysqldump, mysql) instead
 Error	1	Can't create/write to file 'MYSQLTEST_VARDIR/bogus/t4.frm' (Errcode: X)
 backup table t4 to '../tmp';
 Table	Op	Msg_type	Msg_text
 test.t4	backup	status	OK
 Warnings:
-Warning	1541	The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 5.2.
Please use MySQL Administrator (mysqldump, mysql) instead
+Warning	1542	The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 5.2.
Please use MySQL Administrator (mysqldump, mysql) instead
 backup table t4 to '../tmp';
 Table	Op	Msg_type	Msg_text
 test.t4	backup	error	Failed copying .frm file (errno: X)
 test.t4	backup	status	Operation failed
 Warnings:
-Warning	1541	The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 5.2.
Please use MySQL Administrator (mysqldump, mysql) instead
+Warning	1542	The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 5.2.
Please use MySQL Administrator (mysqldump, mysql) instead
 Error	1	Can't create/write to file 'MYSQLTEST_VARDIR/tmp/t4.frm' (Errcode: X)
 drop table t4;
 restore table t4 from '../tmp';
 Table	Op	Msg_type	Msg_text
 test.t4	restore	status	OK
 Warnings:
-Warning	1541	The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 5.2.
Please use MySQL Administrator (mysqldump, mysql) instead
+Warning	1542	The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 5.2.
Please use MySQL Administrator (mysqldump, mysql) instead
 select count(*) from t4;
 count(*)
 0
@@ -35,19 +35,19 @@
 Table	Op	Msg_type	Msg_text
 test.t1	backup	status	OK
 Warnings:
-Warning	1541	The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 5.2.
Please use MySQL Administrator (mysqldump, mysql) instead
+Warning	1542	The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 5.2.
Please use MySQL Administrator (mysqldump, mysql) instead
 drop table t1;
 restore table t1 from '../bogus';
 Table	Op	Msg_type	Msg_text
 t1	restore	error	Failed copying .frm file
 Warnings:
-Warning	1541	The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 5.2.
Please use MySQL Administrator (mysqldump, mysql) instead
+Warning	1542	The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 5.2.
Please use MySQL Administrator (mysqldump, mysql) instead
 Error	29	File 'MYSQLTEST_VARDIR/bogus/t1.frm' not found (Errcode: X)
 restore table t1 from '../tmp';
 Table	Op	Msg_type	Msg_text
 test.t1	restore	status	OK
 Warnings:
-Warning	1541	The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 5.2.
Please use MySQL Administrator (mysqldump, mysql) instead
+Warning	1542	The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 5.2.
Please use MySQL Administrator (mysqldump, mysql) instead
 select n from t1;
 n
 23
@@ -62,7 +62,7 @@
 test.t2	backup	status	OK
 test.t3	backup	status	OK
 Warnings:
-Warning	1541	The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 5.2.
Please use MySQL Administrator (mysqldump, mysql) instead
+Warning	1542	The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 5.2.
Please use MySQL Administrator (mysqldump, mysql) instead
 drop table t1,t2,t3;
 restore table t1,t2,t3 from '../tmp';
 Table	Op	Msg_type	Msg_text
@@ -70,7 +70,7 @@
 test.t2	restore	status	OK
 test.t3	restore	status	OK
 Warnings:
-Warning	1541	The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 5.2.
Please use MySQL Administrator (mysqldump, mysql) instead
+Warning	1542	The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 5.2.
Please use MySQL Administrator (mysqldump, mysql) instead
 select n from t1;
 n
 23
@@ -91,7 +91,7 @@
 Table	Op	Msg_type	Msg_text
 test.t1	restore	status	OK
 Warnings:
-Warning	1541	The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 5.2.
Please use MySQL Administrator (mysqldump, mysql) instead
+Warning	1542	The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 5.2.
Please use MySQL Administrator (mysqldump, mysql) instead
 rename table t1 to t5;
 lock tables t5 write;
 backup table t5 to '../tmp';
@@ -99,7 +99,7 @@
 Table	Op	Msg_type	Msg_text
 test.t5	backup	status	OK
 Warnings:
-Warning	1541	The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 5.2.
Please use MySQL Administrator (mysqldump, mysql) instead
+Warning	1542	The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 5.2.
Please use MySQL Administrator (mysqldump, mysql) instead
 drop table t5;
 DROP TABLE IF EXISTS `t+1`;
 CREATE  TABLE `t+1` (c1 INT);
@@ -108,13 +108,13 @@
 Table	Op	Msg_type	Msg_text
 test.t+1	backup	status	OK
 Warnings:
-Warning	1541	The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 5.2.
Please use MySQL Administrator (mysqldump, mysql) instead
+Warning	1542	The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 5.2.
Please use MySQL Administrator (mysqldump, mysql) instead
 DROP    TABLE `t+1`;
 RESTORE TABLE `t+1` FROM '../tmp';
 Table	Op	Msg_type	Msg_text
 test.t+1	restore	status	OK
 Warnings:
-Warning	1541	The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 5.2.
Please use MySQL Administrator (mysqldump, mysql) instead
+Warning	1542	The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 5.2.
Please use MySQL Administrator (mysqldump, mysql) instead
 SELECT * FROM `t+1`;
 c1
 1