merging

1 files changed, 0 insertions, 109 deletions

diff --git a/mysql-test/t/ps.test b/mysql-test/t/ps.test
index 22eb51c6327..1fd1cc4a405 100644
--- a/mysql-test/t/ps.test
+++ b/mysql-test/t/ps.test
@@ -1120,115 +1120,6 @@ DROP TABLE t1;
 
 --echo End of 4.1 tests.
 
-#
-# Bug#19182: CREATE TABLE bar (m INT) SELECT n FROM foo; doesn't work
-# from stored procedure.
-#
-# The cause of a bug was that cached LEX::create_list was modified,
-# and then together with LEX::key_list was reset.
-#
---disable_warnings
-DROP TABLE IF EXISTS t1, t2;
---enable_warnings
-
-CREATE TABLE t1 (i INT);
-
-PREPARE st_19182
-FROM "CREATE TABLE t2 (i INT, j INT, KEY (i), KEY(j)) SELECT i FROM t1";
-
-EXECUTE st_19182;
-DESC t2;
-
-DROP TABLE t2;
-
-# Check that on second execution we don't loose 'j' column and the keys
-# on 'i' and 'j' columns.
-EXECUTE st_19182;
-DESC t2;
-
-DEALLOCATE PREPARE st_19182;
-DROP TABLE t2, t1;
-
-#
-# Bug #22060 "ALTER TABLE x AUTO_INCREMENT=y in SP crashes server"
-#
-# Code which implemented CREATE/ALTER TABLE and CREATE DATABASE
-# statement modified HA_CREATE_INFO structure in LEX, making these
-# statements PS/SP-unsafe (their re-execution might have resulted
-# in incorrect results).
-#
---disable_warnings
-drop database if exists mysqltest;
-drop table if exists t1, t2;
---enable_warnings
-# CREATE TABLE and CREATE TABLE ... SELECT
-create database mysqltest character set utf8;
-prepare stmt1 from "create table mysqltest.t1 (c char(10))";
-prepare stmt2 from "create table mysqltest.t2 select 'test'";
-execute stmt1;
-execute stmt2;
-show create table mysqltest.t1;
-show create table mysqltest.t2;
-drop table mysqltest.t1;
-drop table mysqltest.t2;
-alter database mysqltest character set latin1;
-execute stmt1;
-execute stmt2;
-show create table mysqltest.t1;
-show create table mysqltest.t2;
-drop database mysqltest;
-deallocate prepare stmt1;
-deallocate prepare stmt2;
-#
-# CREATE TABLE with DATA DIRECTORY option
-#
-# Protect ourselves from data left in tmp/ by a previos possibly failed
-# test
---system rm -f $MYSQLTEST_VARDIR/tmp/t1.*
---disable_warnings
---disable_query_log
-eval prepare stmt from "create table t1 (c char(10)) data directory='$MYSQLTEST_VARDIR/tmp'";
---enable_query_log
-execute stmt;
-#
-# DATA DIRECTORY option does not always work: if the operating
-# system does not support symlinks, have_symlinks option is automatically
-# disabled.
-# In this case DATA DIRECTORY is silently ignored when
-# creating a table, and is not output by SHOW CREATE TABLE.
-#
---disable_result_log
-show create table t1;
---enable_result_log
-drop table t1;
-execute stmt;
---disable_result_log
-show create table t1;
---enable_result_log
---enable_warnings
-drop table t1;
-deallocate prepare stmt;
-#
-
-#
-# Bug #27937: crash on the second execution for prepared statement 
-#             from UNION with ORDER BY an expression containing RAND()
-#
-
-CREATE TABLE t1(a int);
-INSERT INTO t1 VALUES (2), (3), (1);
-
-PREPARE st1 FROM
-  '(SELECT a FROM t1) UNION (SELECT a+10 FROM t1) ORDER BY RAND()*0+a';
-
-EXECUTE st1;
-EXECUTE st1;
-
-DEALLOCATE PREPARE st1;
-DROP TABLE t1;
-
---echo End of 4.1 tests.
-
 ############################# 5.0 tests start ################################
 #
 #