Commit 312034fa authored by unknown's avatar unknown
Browse files

Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.1-engines 

into  chilla.local:/home/mydev/mysql-5.1-bug18775


sql/ha_myisam.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/sql_db.cc:
  Bug#18775 - Temporary table from alter table visible to other threads
  Manual merge
parents 3232bd58 ef976d20

mysql-test/r/alter_table.result

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

abc	5

DROP TABLE t1;

DROP DATABASE IF EXISTS mysqltest;

CREATE DATABASE mysqltest;

use mysqltest;

DROP TABLE IF EXISTS `t1_ngel`, `t1_blten`;

CREATE TABLE `t1_ngel` (c1 INT);

ALTER TABLE  `t1_ngel` RENAME `t1_blten`;

CREATE TABLE `t1_ngel` (c1 INT);

ALTER TABLE  `t1_ngel` RENAME `t1_blten`;

ERROR 42S01: Table 't1_blЭten' already exists

DROP TABLE   `t1_ngel`, `t1_blten`;

CREATE TEMPORARY TABLE `tt1_ngel` (c1 INT);

ALTER TABLE  `tt1_ngel` RENAME `tt1_blten`;

CREATE TEMPORARY TABLE `tt1_ngel` (c1 INT);

ALTER TABLE  `tt1_ngel` RENAME `tt1_blten`;

ERROR 42S01: Table 'tt1_blЭten' already exists

SHOW CREATE TABLE `tt1_blten`;

Table	Create Table

tt1_blten	CREATE TEMPORARY TABLE `tt1_blten` (

  `c1` int(11) DEFAULT NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

DROP TABLE   `tt1_ngel`, `tt1_blten`;

CREATE TABLE `#sql1` (c1 INT);

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

SHOW TABLES;

Tables_in_mysqltest

#sql1

@0023sql2

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

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

SHOW TABLES;

Tables_in_mysqltest

#sql2

@0023sql1

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

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

SHOW TABLES;

Tables_in_mysqltest

#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_mysqltest

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

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

SHOW TABLES;

Tables_in_mysqltest

INSERT INTO `#sql2`      VALUES (1);

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

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`;

use test;

DROP DATABASE mysqltest;

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-blten`;

CREATE  TABLE `t-blten` (c1 INT);

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

BACKUP  TABLE `t-blten` TO '../tmp';

Table	Op	Msg_type	Msg_text

test.t-blten	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-blten`;

RESTORE TABLE `t-blten` FROM '../tmp';

Table	Op	Msg_type	Msg_text

test.t-blten	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-blten`;

c1

1

2

3

DROP    TABLE `t-blten`;

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;

mysql-test/t/alter_table.test

+63 −0
Original line number Diff line number Diff line
@@ -482,3 +482,66 @@ SELECT * FROM t1; 
ALTER TABLE t1 MODIFY COLUMN v VARCHAR(4);

SELECT * FROM t1;

DROP TABLE t1;



# End of 5.0 tests



#

# Bug#18775 - Temporary table from alter table visible to other threads

#

# Use a special database to avoid name clashes with user tables.

--disable_warnings

DROP DATABASE IF EXISTS mysqltest;

--enable_warnings

CREATE DATABASE mysqltest;

use mysqltest;

#

# Check if non-ASCII alphabetic characters work and duplicates are detected.

--disable_warnings

DROP TABLE IF EXISTS `t1_ngel`, `t1_blten`;

--enable_warnings

CREATE TABLE `t1_ngel` (c1 INT);

ALTER TABLE  `t1_ngel` RENAME `t1_blten`;

CREATE TABLE `t1_ngel` (c1 INT);

--error ER_TABLE_EXISTS_ERROR

ALTER TABLE  `t1_ngel` RENAME `t1_blten`;

DROP TABLE   `t1_ngel`, `t1_blten`;

#

# Same for temporary tables though these names do not become file names.

CREATE TEMPORARY TABLE `tt1_ngel` (c1 INT);

ALTER TABLE  `tt1_ngel` RENAME `tt1_blten`;

CREATE TEMPORARY TABLE `tt1_ngel` (c1 INT);

--error ER_TABLE_EXISTS_ERROR

ALTER TABLE  `tt1_ngel` RENAME `tt1_blten`;

SHOW CREATE TABLE `tt1_blten`;

DROP TABLE   `tt1_ngel`, `tt1_blten`;

#

# Check if special characters as in tmp_file_prefix work.

CREATE TABLE `#sql1` (c1 INT);

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

SHOW TABLES;

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

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

SHOW TABLES;

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

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

SHOW TABLES;

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

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

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

#

# Same for temporary tables though these names do not become file names.

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

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

SHOW TABLES;

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

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

SHOW TABLES;

INSERT INTO `#sql2`      VALUES (1);

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

SHOW CREATE TABLE `@0023sql1`;

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

#

# Cleanup

use test;

DROP DATABASE mysqltest;

mysql-test/t/backup.test

+19 −0
Original line number Diff line number Diff line
@@ -58,3 +58,22 @@ drop table t5; 
--system rm $MYSQLTEST_VARDIR/tmp/t?.*



# End of 4.1 tests

# End of 5.0 tests



#

# Bug#18775 - Temporary table from alter table visible to other threads

#

# Backup did not encode table names.

--disable_warnings

DROP TABLE IF EXISTS `t-blten`;

--enable_warnings

CREATE  TABLE `t-blten` (c1 INT);

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

BACKUP  TABLE `t-blten` TO '../tmp';

DROP    TABLE `t-blten`;

#

# Same for restore.

RESTORE TABLE `t-blten` FROM '../tmp';

SELECT * FROM `t-blten`;

DROP    TABLE `t-blten`;