Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet
1.2004 05/06/27 13:12:10 msvensson@neptunus.(none) +22 -0
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/bug10466
sql/share/errmsg.txt
1.35 05/06/27 13:12:09 msvensson@neptunus.(none) +0 -0
Auto merged
sql/sql_parse.cc
1.460 05/06/27 13:12:08 msvensson@neptunus.(none) +0 -0
Auto merged
mysql-test/t/select.test
1.50 05/06/27 13:12:08 msvensson@neptunus.(none) +0 -0
Auto merged
mysql-test/t/ps.test
1.42 05/06/27 13:12:08 msvensson@neptunus.(none) +0 -0
Auto merged
mysql-test/t/innodb.test
1.95 05/06/27 13:12:08 msvensson@neptunus.(none) +0 -0
Auto merged
mysql-test/t/group_by.test
1.44 05/06/27 13:12:08 msvensson@neptunus.(none) +0 -0
Auto merged
mysql-test/t/func_time.test
1.35 05/06/27 13:12:08 msvensson@neptunus.(none) +0 -0
Auto merged
mysql-test/t/func_str.test
1.74 05/06/27 13:12:08 msvensson@neptunus.(none) +0 -0
Auto merged
mysql-test/t/alias.test
1.8 05/06/27 13:12:08 msvensson@neptunus.(none) +0 -0
Auto merged
mysql-test/r/select.result
1.66 05/06/27 13:12:08 msvensson@neptunus.(none) +0 -0
Auto merged
mysql-test/r/ps_7ndb.result
1.32 05/06/27 13:12:07 msvensson@neptunus.(none) +0 -0
Auto merged
mysql-test/r/ps_6bdb.result
1.32 05/06/27 13:12:07 msvensson@neptunus.(none) +0 -0
Auto merged
mysql-test/r/ps_5merge.result
1.29 05/06/27 13:12:07 msvensson@neptunus.(none) +0 -0
Auto merged
mysql-test/r/ps_4heap.result
1.28 05/06/27 13:12:07 msvensson@neptunus.(none) +0 -0
Auto merged
mysql-test/r/ps_3innodb.result
1.32 05/06/27 13:12:07 msvensson@neptunus.(none) +0 -0
Auto merged
mysql-test/r/ps_2myisam.result
1.29 05/06/27 13:12:07 msvensson@neptunus.(none) +0 -0
Auto merged
mysql-test/r/ps.result
1.43 05/06/27 13:12:07 msvensson@neptunus.(none) +0 -0
Auto merged
mysql-test/r/innodb.result
1.122 05/06/27 13:12:07 msvensson@neptunus.(none) +0 -0
Auto merged
mysql-test/r/group_by.result
1.57 05/06/27 13:12:07 msvensson@neptunus.(none) +0 -0
Auto merged
mysql-test/r/func_time.result
1.42 05/06/27 13:12:07 msvensson@neptunus.(none) +0 -0
Auto merged
mysql-test/r/func_str.result
1.100 05/06/27 13:12:07 msvensson@neptunus.(none) +0 -0
Auto merged
mysql-test/r/alias.result
1.9 05/06/27 13:12:07 msvensson@neptunus.(none) +0 -0
Auto merged
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: msvensson
# Host: neptunus.(none)
# Root: /home/msvensson/mysql/bug10466/RESYNC
--- 1.459/sql/sql_parse.cc 2005-06-23 19:06:52 +02:00
+++ 1.460/sql/sql_parse.cc 2005-06-27 13:12:08 +02:00
@@ -5493,6 +5493,23 @@
DBUG_RETURN(1);
}
+ if (type == FIELD_TYPE_TIMESTAMP && length)
+ {
+ /* Display widths are no longer supported for TIMSTAMP as of MySQL 4.1.
+ In other words, for declarations such as TIMESTAMP(2), TIMESTAMP(4),
+ and so on, the display width is ignored.
+ */
+ char buff[32];
+ String str(buff,(uint32) sizeof(buff), system_charset_info);
+ str.append("TIMESTAMP(");
+ str.append(length);
+ str.append(")");
+ push_warning_printf(thd,MYSQL_ERROR::WARN_LEVEL_WARN,
+ ER_WARN_DEPRECATED_SYNTAX,
+ ER(ER_WARN_DEPRECATED_SYNTAX),
+ str.c_ptr(), "TIMESTAMP");
+ }
+
if (!(new_field= new_create_field(thd, field_name, type, length, decimals,
type_modifier, default_value, on_update_value,
comment, change, interval_list, cs, uint_geom_type)))
--- 1.34/sql/share/errmsg.txt 2005-06-20 13:38:09 +02:00
+++ 1.35/sql/share/errmsg.txt 2005-06-27 13:12:09 +02:00
@@ -5021,7 +5021,7 @@
spa "La tabla destino %-.100s del %s no es actualizable"
ER_FEATURE_DISABLED
eng "The '%s' feature is disabled; you need MySQL built with '%s' to have it working"
--- 1.28/mysql-test/r/ps_2myisam.result 2005-06-14 16:40:26 +02:00
+++ 1.29/mysql-test/r/ps_2myisam.result 2005-06-27 13:12:07 +02:00
@@ -10,7 +10,7 @@
c1 tinyint, c2 smallint, c3 mediumint, c4 int,
c5 integer, c6 bigint, c7 float, c8 double,
c9 double precision, c10 real, c11 decimal(7, 4), c12 numeric(8, 4),
-c13 date, c14 datetime, c15 timestamp(14), c16 time,
+c13 date, c14 datetime, c15 timestamp, c16 time,
c17 year, c18 tinyint, c19 bool, c20 char,
c21 char(10), c22 varchar(30), c23 tinyblob, c24 tinytext,
c25 blob, c26 text, c27 mediumblob, c28 mediumtext,
--- 1.31/mysql-test/r/ps_3innodb.result 2005-06-14 16:40:26 +02:00
+++ 1.32/mysql-test/r/ps_3innodb.result 2005-06-27 13:12:07 +02:00
@@ -10,7 +10,7 @@
c1 tinyint, c2 smallint, c3 mediumint, c4 int,
c5 integer, c6 bigint, c7 float, c8 double,
c9 double precision, c10 real, c11 decimal(7, 4), c12 numeric(8, 4),
-c13 date, c14 datetime, c15 timestamp(14), c16 time,
+c13 date, c14 datetime, c15 timestamp, c16 time,
c17 year, c18 tinyint, c19 bool, c20 char,
c21 char(10), c22 varchar(30), c23 tinyblob, c24 tinytext,
c25 blob, c26 text, c27 mediumblob, c28 mediumtext,
--- 1.27/mysql-test/r/ps_4heap.result 2005-06-14 16:40:26 +02:00
+++ 1.28/mysql-test/r/ps_4heap.result 2005-06-27 13:12:07 +02:00
@@ -11,7 +11,7 @@
c1 tinyint, c2 smallint, c3 mediumint, c4 int,
c5 integer, c6 bigint, c7 float, c8 double,
c9 double precision, c10 real, c11 decimal(7, 4), c12 numeric(8, 4),
-c13 date, c14 datetime, c15 timestamp(14), c16 time,
+c13 date, c14 datetime, c15 timestamp, c16 time,
c17 year, c18 tinyint, c19 bool, c20 char,
c21 char(10), c22 varchar(30), c23 varchar(100), c24 varchar(100),
c25 varchar(100), c26 varchar(100), c27 varchar(100), c28 varchar(100),
--- 1.28/mysql-test/r/ps_5merge.result 2005-06-14 16:40:26 +02:00
+++ 1.29/mysql-test/r/ps_5merge.result 2005-06-27 13:12:07 +02:00
@@ -12,7 +12,7 @@
c1 tinyint, c2 smallint, c3 mediumint, c4 int,
c5 integer, c6 bigint, c7 float, c8 double,
c9 double precision, c10 real, c11 decimal(7, 4), c12 numeric(8, 4),
-c13 date, c14 datetime, c15 timestamp(14), c16 time,
+c13 date, c14 datetime, c15 timestamp, c16 time,
c17 year, c18 tinyint, c19 bool, c20 char,
c21 char(10), c22 varchar(30), c23 tinyblob, c24 tinytext,
c25 blob, c26 text, c27 mediumblob, c28 mediumtext,
@@ -32,7 +32,7 @@
c1 tinyint, c2 smallint, c3 mediumint, c4 int,
c5 integer, c6 bigint, c7 float, c8 double,
c9 double precision, c10 real, c11 decimal(7, 4), c12 numeric(8, 4),
-c13 date, c14 datetime, c15 timestamp(14), c16 time,
+c13 date, c14 datetime, c15 timestamp, c16 time,
c17 year, c18 tinyint, c19 bool, c20 char,
c21 char(10), c22 varchar(30), c23 tinyblob, c24 tinytext,
c25 blob, c26 text, c27 mediumblob, c28 mediumtext,
@@ -52,7 +52,7 @@
c1 tinyint, c2 smallint, c3 mediumint, c4 int,
c5 integer, c6 bigint, c7 float, c8 double,
c9 double precision, c10 real, c11 decimal(7, 4), c12 numeric(8, 4),
-c13 date, c14 datetime, c15 timestamp(14), c16 time,
+c13 date, c14 datetime, c15 timestamp, c16 time,
c17 year, c18 tinyint, c19 bool, c20 char,
c21 char(10), c22 varchar(30), c23 tinyblob, c24 tinytext,
c25 blob, c26 text, c27 mediumblob, c28 mediumtext,
@@ -3064,7 +3064,7 @@
c1 tinyint, c2 smallint, c3 mediumint, c4 int,
c5 integer, c6 bigint, c7 float, c8 double,
c9 double precision, c10 real, c11 decimal(7, 4), c12 numeric(8, 4),
-c13 date, c14 datetime, c15 timestamp(14), c16 time,
+c13 date, c14 datetime, c15 timestamp, c16 time,
c17 year, c18 tinyint, c19 bool, c20 char,
c21 char(10), c22 varchar(30), c23 tinyblob, c24 tinytext,
c25 blob, c26 text, c27 mediumblob, c28 mediumtext,
--- 1.31/mysql-test/r/ps_6bdb.result 2005-06-14 16:40:26 +02:00
+++ 1.32/mysql-test/r/ps_6bdb.result 2005-06-27 13:12:07 +02:00
@@ -10,7 +10,7 @@
c1 tinyint, c2 smallint, c3 mediumint, c4 int,
c5 integer, c6 bigint, c7 float, c8 double,
c9 double precision, c10 real, c11 decimal(7, 4), c12 numeric(8, 4),
-c13 date, c14 datetime, c15 timestamp(14), c16 time,
+c13 date, c14 datetime, c15 timestamp, c16 time,
c17 year, c18 tinyint, c19 bool, c20 char,
c21 char(10), c22 varchar(30), c23 tinyblob, c24 tinytext,
c25 blob, c26 text, c27 mediumblob, c28 mediumtext,
--- 1.31/mysql-test/r/ps_7ndb.result 2005-06-14 16:40:26 +02:00
+++ 1.32/mysql-test/r/ps_7ndb.result 2005-06-27 13:12:07 +02:00
@@ -10,7 +10,7 @@
c1 tinyint, c2 smallint, c3 mediumint, c4 int,
c5 integer, c6 bigint, c7 float, c8 double,
c9 double precision, c10 real, c11 decimal(7, 4), c12 numeric(8, 4),
-c13 date, c14 datetime, c15 timestamp(14), c16 time,
+c13 date, c14 datetime, c15 timestamp, c16 time,
c17 year, c18 tinyint, c19 bool, c20 char,
c21 char(10), c22 varchar(30), c23 tinyblob, c24 tinytext,
c25 blob, c26 text, c27 mediumblob, c28 mediumtext,
--- 1.8/mysql-test/r/alias.result 2005-06-15 09:12:44 +02:00
+++ 1.9/mysql-test/r/alias.result 2005-06-27 13:12:07 +02:00
@@ -27,7 +27,7 @@
prov_hdl_nr int(11) NOT NULL default '0',
auto_wirknetz varchar(50) default NULL,
auto_billing varchar(50) default NULL,
-touch timestamp(14) NOT NULL,
+touch timestamp NOT NULL,
kategorie varchar(50) default NULL,
kundentyp varchar(20) NOT NULL default '',
sammel_rech_msisdn varchar(30) NOT NULL default '',
--- 1.56/mysql-test/r/group_by.result 2005-06-21 17:15:22 +02:00
+++ 1.57/mysql-test/r/group_by.result 2005-06-27 13:12:07 +02:00
@@ -117,7 +117,7 @@
bug_severity enum('blocker','critical','major','normal','minor','trivial','enhancement') DEFAULT 'blocker' NOT NULL,
bug_status enum('','NEW','ASSIGNED','REOPENED','RESOLVED','VERIFIED','CLOSED') DEFAULT 'NEW' NOT NULL,
creation_ts datetime DEFAULT '0000-00-00 00:00:00' NOT NULL,
-delta_ts timestamp(14),
+delta_ts timestamp,
short_desc mediumtext,
long_desc mediumtext,
op_sys enum('All','Windows 3.1','Windows 95','Windows 98','Windows NT','Windows 2000','Linux','other') DEFAULT 'All' NOT NULL,
--- 1.121/mysql-test/r/innodb.result 2005-06-24 08:56:50 +02:00
+++ 1.122/mysql-test/r/innodb.result 2005-06-27 13:12:07 +02:00
@@ -972,9 +972,9 @@
cname char(15) NOT NULL default '',
carrier_id smallint(6) NOT NULL default '0',
privacy tinyint(4) NOT NULL default '0',
-last_mod_date timestamp(14) NOT NULL,
+last_mod_date timestamp NOT NULL,
last_mod_id smallint(6) NOT NULL default '0',
-last_app_date timestamp(14) NOT NULL,
+last_app_date timestamp NOT NULL,
last_app_id smallint(6) default '-1',
version smallint(6) NOT NULL default '0',
assigned_scps int(11) default '0',
@@ -991,9 +991,9 @@
cname char(15) NOT NULL default '',
carrier_id smallint(6) NOT NULL default '0',
privacy tinyint(4) NOT NULL default '0',
-last_mod_date timestamp(14) NOT NULL,
+last_mod_date timestamp NOT NULL,
last_mod_id smallint(6) NOT NULL default '0',
-last_app_date timestamp(14) NOT NULL,
+last_app_date timestamp NOT NULL,
last_app_id smallint(6) default '-1',
version smallint(6) NOT NULL default '0',
assigned_scps int(11) default '0',
--- 1.65/mysql-test/r/select.result 2005-06-16 09:17:06 +02:00
+++ 1.66/mysql-test/r/select.result 2005-06-27 13:12:08 +02:00
@@ -2073,7 +2073,7 @@
SELECT 1 as rnd1 from t1 where rand() > 2;
rnd1
DROP TABLE t1;
-CREATE TABLE t1 (gvid int(10) unsigned default NULL, hmid int(10) unsigned default NULL, volid int(10) unsigned default NULL, mmid int(10) unsigned default NULL, hdid int(10) unsigned default NULL, fsid int(10) unsigned default NULL, ctid int(10) unsigned default NULL, dtid int(10) unsigned default NULL, cost int(10) unsigned default NULL, performance int(10) unsigned default NULL, serialnumber bigint(20) unsigned default NULL, monitored tinyint(3) unsigned default '1', removed tinyint(3) unsigned default '0', target tinyint(3) unsigned default '0', dt_modified timestamp(14) NOT NULL, name varchar(255) binary default NULL, description varchar(255) default NULL, UNIQUE KEY hmid (hmid,volid)) ENGINE=MyISAM;
+CREATE TABLE t1 (gvid int(10) unsigned default NULL, hmid int(10) unsigned default NULL, volid int(10) unsigned default NULL, mmid int(10) unsigned default NULL, hdid int(10) unsigned default NULL, fsid int(10) unsigned default NULL, ctid int(10) unsigned default NULL, dtid int(10) unsigned default NULL, cost int(10) unsigned default NULL, performance int(10) unsigned default NULL, serialnumber bigint(20) unsigned default NULL, monitored tinyint(3) unsigned default '1', removed tinyint(3) unsigned default '0', target tinyint(3) unsigned default '0', dt_modified timestamp NOT NULL, name varchar(255) binary default NULL, description varchar(255) default NULL, UNIQUE KEY hmid (hmid,volid)) ENGINE=MyISAM;
INSERT INTO t1 VALUES (200001,2,1,1,100,1,1,1,0,0,0,1,0,1,20020425060057,'\\\\ARKIVIO-TESTPDC\\E$',''),(200002,2,2,1,101,1,1,1,0,0,0,1,0,1,20020425060057,'\\\\ARKIVIO-TESTPDC\\C$',''),(200003,1,3,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,1,20020425060427,'c:',NULL);
CREATE TABLE t2 ( hmid int(10) unsigned default NULL, volid int(10) unsigned default NULL, sampletid smallint(5) unsigned default NULL, sampletime datetime default NULL, samplevalue bigint(20) unsigned default NULL, KEY idx1 (hmid,volid,sampletid,sampletime)) ENGINE=MyISAM;
INSERT INTO t2 VALUES (1,3,10,'2002-06-01 08:00:00',35),(1,3,1010,'2002-06-01 12:00:01',35);
--- 1.7/mysql-test/t/alias.test 2005-06-16 17:03:47 +02:00
+++ 1.8/mysql-test/t/alias.test 2005-06-27 13:12:08 +02:00
@@ -30,7 +30,7 @@
prov_hdl_nr int(11) NOT NULL default '0',
auto_wirknetz varchar(50) default NULL,
auto_billing varchar(50) default NULL,
- touch timestamp(14) NOT NULL,
+ touch timestamp NOT NULL,
kategorie varchar(50) default NULL,
kundentyp varchar(20) NOT NULL default '',
sammel_rech_msisdn varchar(30) NOT NULL default '',
--- 1.43/mysql-test/t/group_by.test 2005-06-21 17:14:16 +02:00
+++ 1.44/mysql-test/t/group_by.test 2005-06-27 13:12:08 +02:00
@@ -135,7 +135,7 @@
bug_severity enum('blocker','critical','major','normal','minor','trivial','enhancement') DEFAULT 'blocker' NOT NULL,
bug_status enum('','NEW','ASSIGNED','REOPENED','RESOLVED','VERIFIED','CLOSED') DEFAULT 'NEW' NOT NULL,
creation_ts datetime DEFAULT '0000-00-00 00:00:00' NOT NULL,
- delta_ts timestamp(14),
+ delta_ts timestamp,
short_desc mediumtext,
long_desc mediumtext,
op_sys enum('All','Windows 3.1','Windows 95','Windows 98','Windows NT','Windows 2000','Linux','other') DEFAULT 'All' NOT NULL,
--- 1.94/mysql-test/t/innodb.test 2005-06-07 13:28:28 +02:00
+++ 1.95/mysql-test/t/innodb.test 2005-06-27 13:12:08 +02:00
@@ -660,9 +660,9 @@
cname char(15) NOT NULL default '',
carrier_id smallint(6) NOT NULL default '0',
privacy tinyint(4) NOT NULL default '0',
- last_mod_date timestamp(14) NOT NULL,
+ last_mod_date timestamp NOT NULL,
last_mod_id smallint(6) NOT NULL default '0',
- last_app_date timestamp(14) NOT NULL,
+ last_app_date timestamp NOT NULL,
last_app_id smallint(6) default '-1',
version smallint(6) NOT NULL default '0',
assigned_scps int(11) default '0',
@@ -679,9 +679,9 @@
cname char(15) NOT NULL default '',
carrier_id smallint(6) NOT NULL default '0',
privacy tinyint(4) NOT NULL default '0',
- last_mod_date timestamp(14) NOT NULL,
+ last_mod_date timestamp NOT NULL,
last_mod_id smallint(6) NOT NULL default '0',
- last_app_date timestamp(14) NOT NULL,
+ last_app_date timestamp NOT NULL,
last_app_id smallint(6) default '-1',
version smallint(6) NOT NULL default '0',
assigned_scps int(11) default '0',
--- 1.49/mysql-test/t/select.test 2005-06-16 09:17:07 +02:00
+++ 1.50/mysql-test/t/select.test 2005-06-27 13:12:08 +02:00
@@ -1789,7 +1789,7 @@
# Test of bug with SUM(CASE...)
#
-CREATE TABLE t1 (gvid int(10) unsigned default NULL, hmid int(10) unsigned default NULL, volid int(10) unsigned default NULL, mmid int(10) unsigned default NULL, hdid int(10) unsigned default NULL, fsid int(10) unsigned default NULL, ctid int(10) unsigned default NULL, dtid int(10) unsigned default NULL, cost int(10) unsigned default NULL, performance int(10) unsigned default NULL, serialnumber bigint(20) unsigned default NULL, monitored tinyint(3) unsigned default '1', removed tinyint(3) unsigned default '0', target tinyint(3) unsigned default '0', dt_modified timestamp(14) NOT NULL, name varchar(255) binary default NULL, description varchar(255) default NULL, UNIQUE KEY hmid (hmid,volid)) ENGINE=MyISAM;
+CREATE TABLE t1 (gvid int(10) unsigned default NULL, hmid int(10) unsigned default NULL, volid int(10) unsigned default NULL, mmid int(10) unsigned default NULL, hdid int(10) unsigned default NULL, fsid int(10) unsigned default NULL, ctid int(10) unsigned default NULL, dtid int(10) unsigned default NULL, cost int(10) unsigned default NULL, performance int(10) unsigned default NULL, serialnumber bigint(20) unsigned default NULL, monitored tinyint(3) unsigned default '1', removed tinyint(3) unsigned default '0', target tinyint(3) unsigned default '0', dt_modified timestamp NOT NULL, name varchar(255) binary default NULL, description varchar(255) default NULL, UNIQUE KEY hmid (hmid,volid)) ENGINE=MyISAM;
INSERT INTO t1 VALUES (200001,2,1,1,100,1,1,1,0,0,0,1,0,1,20020425060057,'\\\\ARKIVIO-TESTPDC\\E$',''),(200002,2,2,1,101,1,1,1,0,0,0,1,0,1,20020425060057,'\\\\ARKIVIO-TESTPDC\\C$',''),(200003,1,3,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,1,20020425060427,'c:',NULL);
CREATE TABLE t2 ( hmid int(10) unsigned default NULL, volid int(10) unsigned default NULL, sampletid smallint(5) unsigned default NULL, sampletime datetime default NULL, samplevalue bigint(20) unsigned default NULL, KEY idx1 (hmid,volid,sampletid,sampletime)) ENGINE=MyISAM;
INSERT INTO t2 VALUES (1,3,10,'2002-06-01 08:00:00',35),(1,3,1010,'2002-06-01 12:00:01',35);
--- 1.99/mysql-test/r/func_str.result 2005-06-20 12:08:54 +02:00
+++ 1.100/mysql-test/r/func_str.result 2005-06-27 13:12:07 +02:00
@@ -800,3 +800,14 @@
select field(NULL,1,2,NULL), field(NULL,1,2,0);
field(NULL,1,2,NULL) field(NULL,1,2,0)
0 0
+CREATE TABLE t1 (str varchar(20) PRIMARY KEY);
+CREATE TABLE t2 (num int primary key);
+INSERT INTO t1 VALUES ('notnumber');
+INSERT INTO t2 VALUES (0), (1);
+SELECT * FROM t1, t2 WHERE num=str;
+str num
+notnumber 0
+SELECT * FROM t1, t2 WHERE num=substring(str from 1 for 6);
+str num
+notnumber 0
+DROP TABLE t1,t2;
--- 1.73/mysql-test/t/func_str.test 2005-06-20 12:08:55 +02:00
+++ 1.74/mysql-test/t/func_str.test 2005-06-27 13:12:08 +02:00
@@ -529,3 +529,17 @@
#
select field(0,NULL,1,0), field("",NULL,"bar",""), field(0.0,NULL,1.0,0.0);
select field(NULL,1,2,NULL), field(NULL,1,2,0);
+
+#
+# Bug #10124: access by integer index with a string key that is not a number
+#
+
+CREATE TABLE t1 (str varchar(20) PRIMARY KEY);
+CREATE TABLE t2 (num int primary key);
+INSERT INTO t1 VALUES ('notnumber');
+INSERT INTO t2 VALUES (0), (1);
+
+SELECT * FROM t1, t2 WHERE num=str;
+SELECT * FROM t1, t2 WHERE num=substring(str from 1 for 6);
+
+DROP TABLE t1,t2;
--- 1.42/mysql-test/r/ps.result 2005-06-20 12:08:54 +02:00
+++ 1.43/mysql-test/r/ps.result 2005-06-27 13:12:07 +02:00
@@ -675,3 +675,9 @@
10
drop table t1;
deallocate prepare stmt;
+create table t1 (id int);
+prepare stmt from "insert into t1 (id) select id from t1 union select id from t1";
+execute stmt;
+execute stmt;
+deallocate prepare stmt;
+drop table t1;
--- 1.41/mysql-test/t/ps.test 2005-06-20 12:08:55 +02:00
+++ 1.42/mysql-test/t/ps.test 2005-06-27 13:12:08 +02:00
@@ -693,3 +693,15 @@
drop table t1;
deallocate prepare stmt;
+
+#
+# Bug#11060 "Server crashes on calling stored procedure with INSERT SELECT
+# UNION SELECT" aka "Server crashes on re-execution of prepared INSERT ...
+# SELECT with UNION".
+#
+create table t1 (id int);
+prepare stmt from "insert into t1 (id) select id from t1 union select id from t1";
+execute stmt;
+execute stmt;
+deallocate prepare stmt;
+drop table t1;
| Thread |
|---|
| • bk commit into 5.0 tree (msvensson:1.2004) | msvensson | 27 Jun |
