Commit d470c233 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-4.1-runtime 

into  bodhi.local:/opt/local/work/mysql-4.1-4968-to-push


sql/mysql_priv.h:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Manual merge.
sql/sql_table.cc:
  Manual merge.
parents 5f9a8075 e47ded81

mysql-test/r/ps.result

+67 −0
Original line number Diff line number Diff line
@@ -1035,4 +1035,71 @@ EXECUTE stmt USING @a; 
0	0

DEALLOCATE PREPARE stmt;

DROP TABLE t1;

DROP TABLE IF EXISTS t1, t2;

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;

Field	Type	Null	Key	Default	Extra

j	int(11)	YES	MUL	NULL	

i	int(11)	YES	MUL	NULL	

DROP TABLE t2;

EXECUTE st_19182;

DESC t2;

Field	Type	Null	Key	Default	Extra

j	int(11)	YES	MUL	NULL	

i	int(11)	YES	MUL	NULL	

DEALLOCATE PREPARE st_19182;

DROP TABLE t2, t1;

drop database if exists mysqltest;

drop table if exists t1, t2;

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;

Table	Create Table

t1	CREATE TABLE `t1` (

  `c` char(10) default NULL

) ENGINE=MyISAM DEFAULT CHARSET=utf8

show create table mysqltest.t2;

Table	Create Table

t2	CREATE TABLE `t2` (

  `test` char(4) character set latin1 NOT NULL default ''

) ENGINE=MyISAM DEFAULT CHARSET=utf8

drop table mysqltest.t1;

drop table mysqltest.t2;

alter database mysqltest character set latin1;

execute stmt1;

execute stmt2;

show create table mysqltest.t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `c` char(10) character set utf8 default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

show create table mysqltest.t2;

Table	Create Table

t2	CREATE TABLE `t2` (

  `test` char(4) NOT NULL default ''

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop database mysqltest;

deallocate prepare stmt1;

deallocate prepare stmt2;

execute stmt;

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `c` char(10) default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1 DATA DIRECTORY='MYSQLTEST_VARDIR/tmp/'

drop table t1;

execute stmt;

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `c` char(10) default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1 DATA DIRECTORY='MYSQLTEST_VARDIR/tmp/'

drop table t1;

deallocate prepare stmt;

End of 4.1 tests.

mysql-test/t/ps.test

+72 −0
Original line number Diff line number Diff line
@@ -1068,5 +1068,77 @@ EXECUTE stmt USING @a; 
DEALLOCATE PREPARE stmt;

DROP TABLE t1;



#

# 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

--disable_query_log

eval prepare stmt from "create table t1 (c char(10)) data directory='$MYSQLTEST_VARDIR/tmp'";

--enable_query_log

execute stmt;

--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR

show create table t1;

drop table t1;

execute stmt;

--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR

show create table t1;

drop table t1;

deallocate prepare stmt;

#

--echo End of 4.1 tests.

sql/mysql_priv.h

+7 −12
Original line number Diff line number Diff line
@@ -563,25 +563,22 @@ int mysql_prepare_table(THD *thd, HA_CREATE_INFO *create_info, 
		       uint &key_count, int select_field_count);

int mysql_create_table(THD *thd,const char *db, const char *table_name,

		       HA_CREATE_INFO *create_info,

		       List<create_field> &fields, List<Key> &keys,

                       Alter_info *alter_info,

		       bool tmp_table, uint select_field_count);



TABLE *create_table_from_items(THD *thd, HA_CREATE_INFO *create_info,

			       const char *db, const char *name,

			       List<create_field> *extra_fields,

			       List<Key> *keys,

                               Alter_info *alter_info,

			       List<Item> *items,

			       MYSQL_LOCK **lock);

int mysql_alter_table(THD *thd, char *new_db, char *new_name,

		      HA_CREATE_INFO *create_info,

		      TABLE_LIST *table_list,

		      List<create_field> &fields,

		      List<Key> &keys,

                      Alter_info *alter_info,

		      uint order_num, ORDER *order,

		      enum enum_duplicates handle_duplicates,

                      bool ignore,

		      ALTER_INFO *alter_info, bool do_send_ok=1);

int mysql_recreate_table(THD *thd, TABLE_LIST *table_list, bool do_send_ok);

                      bool ignore);

int mysql_recreate_table(THD *thd, TABLE_LIST *table_list);

int mysql_create_like_table(THD *thd, TABLE_LIST *table,

                            HA_CREATE_INFO *create_info,

                            Table_ident *src_table);
@@ -590,9 +587,6 @@ bool mysql_rename_table(enum db_type base, 
			const char * old_name,

			const char *new_db,

			const char * new_name);

int mysql_create_index(THD *thd, TABLE_LIST *table_list, List<Key> &keys);

int mysql_drop_index(THD *thd, TABLE_LIST *table_list,

		     ALTER_INFO *alter_info);

int mysql_prepare_update(THD *thd, TABLE_LIST *table_list,

			 TABLE_LIST *update_table_list,

			 Item **conds, uint order_num, ORDER *order);
@@ -679,7 +673,8 @@ int get_quote_char_for_identifier(THD *thd, const char *name, uint length); 
void mysqld_list_fields(THD *thd,TABLE_LIST *table, const char *wild);

int mysqld_dump_create_info(THD *thd, TABLE *table, int fd = -1);

int mysqld_show_create(THD *thd, TABLE_LIST *table_list);

int mysqld_show_create_db(THD *thd, char *dbname, HA_CREATE_INFO *create);

int mysqld_show_create_db(THD *thd, char *dbname,

                          const HA_CREATE_INFO *create);



void mysqld_list_processes(THD *thd,const char *user,bool verbose);

int mysqld_show_status(THD *thd);

sql/sql_class.h

+10 −9
Original line number Diff line number Diff line
@@ -1293,20 +1293,21 @@ class select_create: public select_insert { 
  ORDER *group;

  const char *db;

  const char *name;

  List<create_field> *extra_fields;

  List<Key> *keys;

  HA_CREATE_INFO *create_info;

  Alter_info *alter_info;

  MYSQL_LOCK *lock;

  Field **field;

public:

  select_create(const char *db_name, const char *table_name,

		HA_CREATE_INFO *create_info_par,

		List<create_field> &fields_par,

		List<Key> &keys_par,

		List<Item> &select_fields,enum_duplicates duplic, bool ignore)

    :select_insert (NULL, &select_fields, duplic, ignore), db(db_name),

    name(table_name), extra_fields(&fields_par),keys(&keys_par),

    create_info(create_info_par), lock(0)

                HA_CREATE_INFO *create_info_arg,

                Alter_info *alter_info_arg,

                List<Item> &select_fields,

                enum_duplicates duplic, bool ignore)

    :select_insert(NULL, &select_fields, duplic, ignore),

    db(db_name), name(table_name),

    create_info(create_info_arg),

    alter_info(alter_info_arg),

    lock(0)

    {}

  int prepare(List<Item> &list, SELECT_LEX_UNIT *u);

  void store_values(List<Item> &values);

sql/sql_insert.cc

+1 −1
Original line number Diff line number Diff line
@@ -1805,7 +1805,7 @@ select_create::prepare(List<Item> &values, SELECT_LEX_UNIT *u) 


  unit= u;

  table= create_table_from_items(thd, create_info, db, name,

				 extra_fields, keys, &values, &lock);

                                 alter_info, &values, &lock);

  if (!table)

    DBUG_RETURN(-1);				// abort() deletes table