Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0

DROP TABLE IF EXISTS t1, `"t"1`;

DROP TABLE IF EXISTS t1, `"t"1`, t1aa,t2aa;

drop database if exists mysqldump_test_db;

CREATE TABLE t1(a int);

INSERT INTO t1 VALUES (1), (2);

drop table if exists t1,t2;

drop table if exists t1aa,t2aa;

drop database if exists mysqltest;

delete from mysql.user where user='mysqltest_1' || user='mysqltest_2' || user='mysqltest_3';

delete from mysql.db where user='mysqltest_1' || user='mysqltest_2' || user='mysqltest_3';

drop procedure bug3368|

drop table t3|

drop table if exists t3|

create table t3 (f1 int, f2 int);

insert into t3 values (1,1);

--disable_warnings|

create table t3 (f1 int, f2 int)|

insert into t3 values (1,1)|

drop procedure if exists bug4579_1|

Warnings:

Note	1305	PROCEDURE bug4579_1 does not exist

create procedure bug4579_1 ()

begin

declare sf1 int;

drop table if exists t1;

CREATE TABLE t1 (x1 int);

 ALTER TABLE t1 CHANGE x1 x2 int;

CREATE TABLE t2 LIKE t1;

drop table if exists t1,t1aa,t2aa;

show tables;

Tables_in_db

columns_priv