From: Date: October 26 2005 5:14pm
Subject: bk commit into 5.0 tree (pem:1.1940) BUG#14233
List-Archive: http://lists.mysql.com/internals/31506
X-Bug: 14233
Message-Id: <200510261514.j9QFE1Un005297@mail.mysql.com>

Below is the list of changes that have just been committed into a local
5.0 repository of pem. When pem 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
  1.1940 05/10/26 16:35:59 pem@stripped +2 -0
  Follow-up for BUG#14233 fix. Changed backup method for the mysql.proc table
  in sp-destruct.test since using "create ... as ..." didn't preserve everything,
  which made the system_mysql_db test fail.

  mysql-test/t/sp-destruct.test
    1.2 05/10/26 16:35:49 pem@stripped +6 -10
    Changed backup method for mysql.proc.

  mysql-test/r/sp-destruct.result
    1.2 05/10/26 16:35:49 pem@stripped +0 -8
    Updated result.

# 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:	pem
# Host:	mysql.comhem.se
# Root:	/usr/home/pem/bug14233/mysql-5.0

--- 1.1/mysql-test/r/sp-destruct.result	2005-10-26 15:34:47 +02:00
+++ 1.2/mysql-test/r/sp-destruct.result	2005-10-26 16:35:49 +02:00
@@ -1,6 +1,3 @@
-use mysql;
-drop table if exists proc_backup;
-create table proc_backup as select * from proc;
 use test;
 drop procedure if exists bug14233;
 drop function if exists bug14233;
@@ -33,10 +30,6 @@
 ERROR 42S02: Table 'mysql.proc' doesn't exist
 insert into t1 values (0);
 ERROR 42S02: Table 'mysql.proc' doesn't exist
-use mysql;
-create table proc as select * from proc_backup;
-alter table proc add primary key (db,name,type);
-use test;
 flush table mysql.proc;
 flush privileges;
 delete from mysql.proc where name like 'bug14233%';
@@ -81,7 +74,6 @@
 insert into t1 values (0);
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'wpsj sa ^#!@ ' at line 3
 delete from mysql.proc where name like 'bug14233%';
-drop table mysql.proc_backup;
 drop trigger t1_ai;
 drop table t1;
 drop view v1;

--- 1.1/mysql-test/t/sp-destruct.test	2005-10-26 15:34:48 +02:00
+++ 1.2/mysql-test/t/sp-destruct.test	2005-10-26 16:35:49 +02:00
@@ -11,11 +11,10 @@
 --source include/not_windows.inc
 
 # Backup proc table
-use mysql;
---disable_warnings
-drop table if exists proc_backup;
---enable_warnings
-create table proc_backup as select * from proc;
+--system rm -rf var/master-data/mysql/backup
+--system mkdir var/master-data/mysql/backup
+--system cp var/master-data/mysql/proc.* var/master-data/mysql/backup/
+
 use test;
 
 --disable_warnings
@@ -67,10 +66,8 @@
 insert into t1 values (0);
 
 # Restore mysql.proc
-use mysql;
-create table proc as select * from proc_backup;
-alter table proc add primary key (db,name,type);
-use test;
+--system mv var/master-data/mysql/backup/* var/master-data/mysql/
+--system rmdir var/master-data/mysql/backup
 
 flush table mysql.proc;
 flush privileges;
@@ -124,7 +121,6 @@
 
 # Clean-up
 delete from mysql.proc where name like 'bug14233%';
-drop table mysql.proc_backup;
 drop trigger t1_ai;
 drop table t1;
 drop view v1;