Commit 2f48a591 authored by unknown's avatar unknown
Browse files

Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 

into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-engines-merge


sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
parents eef51cd8 fab1b2f5

mysql-test/r/alter_table.result

+65 −0
Original line number Diff line number Diff line
@@ -657,3 +657,68 @@ SELECT * FROM t1; 
v	b

abc	5

DROP TABLE t1;

DROP TABLE IF EXISTS `t+1`, `t+2`;

CREATE TABLE `t+1` (c1 INT);

ALTER TABLE  `t+1` RENAME `t+2`;

CREATE TABLE `t+1` (c1 INT);

ALTER TABLE  `t+1` RENAME `t+2`;

ERROR 42S01: Table 't+2' already exists

DROP TABLE   `t+1`, `t+2`;

CREATE TEMPORARY TABLE `tt+1` (c1 INT);

ALTER TABLE  `tt+1` RENAME `tt+2`;

CREATE TEMPORARY TABLE `tt+1` (c1 INT);

ALTER TABLE  `tt+1` RENAME `tt+2`;

ERROR 42S01: Table 'tt+2' already exists

SHOW CREATE TABLE `tt+1`;

Table	Create Table

tt+1	CREATE TEMPORARY TABLE `tt+1` (

  `c1` int(11) DEFAULT NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

SHOW CREATE TABLE `tt+2`;

Table	Create Table

tt+2	CREATE TEMPORARY TABLE `tt+2` (

  `c1` int(11) DEFAULT NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

DROP TABLE   `tt+1`, `tt+2`;

CREATE TABLE `#sql1` (c1 INT);

CREATE TABLE `@0023sql2` (c1 INT);

SHOW TABLES;

Tables_in_test

#sql1

@0023sql2

RENAME TABLE `#sql1`     TO `@0023sql1`;

RENAME TABLE `@0023sql2` TO `#sql2`;

SHOW TABLES;

Tables_in_test

#sql2

@0023sql1

ALTER TABLE `@0023sql1`  RENAME `#sql-1`;

ALTER TABLE `#sql2`      RENAME `@0023sql-2`;

SHOW TABLES;

Tables_in_test

#sql-1

@0023sql-2

INSERT INTO `#sql-1`     VALUES (1);

INSERT INTO `@0023sql-2` VALUES (2);

DROP TABLE `#sql-1`, `@0023sql-2`;

CREATE TEMPORARY TABLE `#sql1` (c1 INT);

CREATE TEMPORARY TABLE `@0023sql2` (c1 INT);

SHOW TABLES;

Tables_in_test

ALTER TABLE `#sql1`      RENAME `@0023sql1`;

ALTER TABLE `@0023sql2`  RENAME `#sql2`;

SHOW TABLES;

Tables_in_test

INSERT INTO `#sql2`      VALUES (1);

INSERT INTO `@0023sql1`  VALUES (2);

SHOW CREATE TABLE `#sql2`;

Table	Create Table

#sql2	CREATE TEMPORARY TABLE `#sql2` (

  `c1` int(11) DEFAULT NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

SHOW CREATE TABLE `@0023sql1`;

Table	Create Table

@0023sql1	CREATE TEMPORARY TABLE `@0023sql1` (

  `c1` int(11) DEFAULT NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

DROP TABLE `#sql2`, `@0023sql1`;

mysql-test/r/backup.result

+20 −0
Original line number Diff line number Diff line
@@ -101,3 +101,23 @@ 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.

drop table t5;

DROP TABLE IF EXISTS `t+1`;

CREATE  TABLE `t+1` (c1 INT);

INSERT  INTO  `t+1` VALUES (1), (2), (3);

BACKUP  TABLE `t+1` TO '../tmp';

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.

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.

SELECT * FROM `t+1`;

c1

1

2

3

DROP    TABLE `t+1`;

mysql-test/r/federated_transactions.result

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ CREATE TABLE federated.t1 ( 
`id` int(20) NOT NULL,

`name` varchar(32) NOT NULL default ''

    )

DEFAULT CHARSET=latin1 ENGINE=BerkeleyDB;

DEFAULT CHARSET=latin1 ENGINE=InnoDB;

DROP TABLE IF EXISTS federated.t1;

Warnings:

Note	1051	Unknown table 't1'

mysql-test/r/keywords.result

+16 −0
Original line number Diff line number Diff line
@@ -16,3 +16,19 @@ select events.binlog from events; 
binlog

1

drop table events;

create procedure p1()

begin

declare n int default 2;

authors: while n > 0 do

set n = n -1;

end while authors;

end|

create procedure p2()

begin

declare n int default 2;

contributors: while n > 0 do

set n = n -1;

end while contributors;

end|

drop procedure p1;

drop procedure p2;

mysql-test/r/repair.result

+6 −0
Original line number Diff line number Diff line
@@ -41,3 +41,9 @@ Table Op Msg_type Msg_text 
test.t1	repair	warning	Number of rows changed from 0 to 1

test.t1	repair	status	OK

drop table t1;

DROP TABLE IF EXISTS tt1;

CREATE TEMPORARY TABLE tt1 (c1 INT);

REPAIR TABLE tt1 USE_FRM;

Table	Op	Msg_type	Msg_text

tt1	repair	error	Cannot repair temporary table from .frm file

DROP TABLE tt1;