List:Commits« Previous MessageNext Message »
From:msvensson Date:May 16 2007 2:01pm
Subject:bk commit into 5.1 tree (msvensson:1.2494)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 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@stripped, 2007-05-16 14:01:14+02:00, msvensson@stripped +1 -0
  Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
  into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
  MERGE: 1.1810.2904.6

  BitKeeper/deleted/.del-ps_6bdb.result@stripped, 2007-05-16 14:01:11+02:00,
msvensson@stripped +0 -0
    Auto merged
    MERGE: 1.27.12.2

  BitKeeper/deleted/.del-ps_6bdb.result@stripped, 2007-05-16 14:01:11+02:00,
msvensson@stripped +0 -0
    Merge rename: mysql-test/r/ps_6bdb.result -> BitKeeper/deleted/.del-ps_6bdb.result

# 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:	pilot.blaudden
# Root:	/home/msvensson/mysql/mysql-5.1-new-maint/RESYNC

--- 1.27.12.1/mysql-test/r/ps_6bdb.result	2007-05-16 14:00:46 +02:00
+++ 1.56/BitKeeper/deleted/.del-ps_6bdb.result	2007-05-16 14:01:11 +02:00
@@ -1287,7 +1287,7 @@ set @arg00=NULL;
 set @arg01=2;
 execute stmt1 using @arg00, @arg01;
 Warnings:
-Warning	1263	Column was set to data type implicit default; NULL supplied for NOT NULL
column 'a' at row 1
+Warning	1048	Column 'a' cannot be null
 select a,b from t1 order by a;
 a	b
 0	two
@@ -1409,7 +1409,7 @@ select a,b from t1 where b = @arg00;
 a	b
 6	six
 execute stmt1 using @arg00;
-ERROR 23000: Duplicate entry '6' for key 1
+ERROR 23000: Duplicate entry '6' for key 'PRIMARY'
 set @arg00=NULL ;
 prepare stmt1 from 'insert into t1 values(0, ? )';
 execute stmt1 using @arg00;
@@ -1522,7 +1522,7 @@ a	b
 set @arg00=81 ;
 set @arg01=1 ;
 execute stmt1 using @arg00, @arg01;
-ERROR 23000: Duplicate entry '82' for key 1
+ERROR 23000: Duplicate entry '82' for key 'PRIMARY'
 drop table if exists t2 ;
 create table t2 (id int auto_increment primary key) 
 ENGINE= 'BDB'  ;
@@ -1758,31 +1758,31 @@ NULL                        as const12, 
 show create table t5 ;
 Table	Create Table
 t5	CREATE TABLE `t5` (
-  `const01` int(1) NOT NULL default '0',
-  `param01` bigint(20) default NULL,
-  `const02` decimal(2,1) NOT NULL default '0.0',
-  `param02` decimal(65,30) default NULL,
-  `const03` double NOT NULL default '0',
-  `param03` double default NULL,
-  `const04` varchar(3) NOT NULL default '',
+  `const01` int(1) NOT NULL DEFAULT '0',
+  `param01` bigint(20) DEFAULT NULL,
+  `const02` decimal(2,1) NOT NULL DEFAULT '0.0',
+  `param02` decimal(65,30) DEFAULT NULL,
+  `const03` double NOT NULL DEFAULT '0',
+  `param03` double DEFAULT NULL,
+  `const04` varchar(3) NOT NULL DEFAULT '',
   `param04` longtext,
-  `const05` varbinary(3) NOT NULL default '',
+  `const05` varbinary(3) NOT NULL DEFAULT '',
   `param05` longblob,
-  `const06` varchar(10) NOT NULL default '',
+  `const06` varchar(10) NOT NULL DEFAULT '',
   `param06` longtext,
-  `const07` date default NULL,
+  `const07` date DEFAULT NULL,
   `param07` longblob,
-  `const08` varchar(19) NOT NULL default '',
+  `const08` varchar(19) NOT NULL DEFAULT '',
   `param08` longtext,
-  `const09` datetime default NULL,
+  `const09` datetime DEFAULT NULL,
   `param09` longblob,
-  `const10` int(10) NOT NULL default '0',
-  `param10` bigint(20) default NULL,
-  `const11` int(4) default NULL,
-  `param11` bigint(20) default NULL,
-  `const12` binary(0) default NULL,
-  `param12` bigint(20) default NULL,
-  `param13` decimal(65,30) default NULL,
+  `const10` int(10) NOT NULL DEFAULT '0',
+  `param10` bigint(20) DEFAULT NULL,
+  `const11` int(4) DEFAULT NULL,
+  `param11` bigint(20) DEFAULT NULL,
+  `const12` binary(0) DEFAULT NULL,
+  `param12` bigint(20) DEFAULT NULL,
+  `param13` decimal(65,30) DEFAULT NULL,
   `param14` longtext,
   `param15` longblob
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
@@ -1912,26 +1912,26 @@ def					@arg09	253	23	1	Y	128	31	63
 def					@arg10	253	23	1	Y	128	31	63
 def					@arg11	253	67	6	Y	128	30	63
 def					@arg12	253	67	6	Y	128	30	63
-def					@arg13	253	8192	10	Y	128	31	63
-def					@arg14	253	8192	19	Y	128	31	63
-def					@arg15	253	8192	19	Y	128	31	63
-def					@arg16	253	8192	8	Y	128	31	63
+def					@arg13	253	16777216	10	Y	128	31	63
+def					@arg14	253	16777216	19	Y	128	31	63
+def					@arg15	253	16777216	19	Y	128	31	63
+def					@arg16	253	16777216	8	Y	128	31	63
 def					@arg17	253	20	4	Y	128	0	63
 def					@arg18	253	20	1	Y	128	0	63
 def					@arg19	253	20	1	Y	128	0	63
-def					@arg20	253	8192	1	Y	0	31	8
-def					@arg21	253	8192	10	Y	0	31	8
-def					@arg22	253	8192	30	Y	0	31	8
-def					@arg23	253	8192	8	Y	128	31	63
-def					@arg24	253	8192	8	Y	0	31	8
-def					@arg25	253	8192	4	Y	128	31	63
-def					@arg26	253	8192	4	Y	0	31	8
-def					@arg27	253	8192	10	Y	128	31	63
-def					@arg28	253	8192	10	Y	0	31	8
-def					@arg29	253	8192	8	Y	128	31	63
-def					@arg30	253	8192	8	Y	0	31	8
-def					@arg31	253	8192	3	Y	0	31	8
-def					@arg32	253	8192	6	Y	0	31	8
+def					@arg20	253	16777216	1	Y	0	31	8
+def					@arg21	253	16777216	10	Y	0	31	8
+def					@arg22	253	16777216	30	Y	0	31	8
+def					@arg23	253	16777216	8	Y	128	31	63
+def					@arg24	253	16777216	8	Y	0	31	8
+def					@arg25	253	16777216	4	Y	128	31	63
+def					@arg26	253	16777216	4	Y	0	31	8
+def					@arg27	253	16777216	10	Y	128	31	63
+def					@arg28	253	16777216	10	Y	0	31	8
+def					@arg29	253	16777216	8	Y	128	31	63
+def					@arg30	253	16777216	8	Y	0	31	8
+def					@arg31	253	16777216	3	Y	0	31	8
+def					@arg32	253	16777216	6	Y	0	31	8
 @arg01	@arg02	@arg03	@arg04	@arg05	@arg06	@arg07	@arg08	@arg09	@arg10	@arg11	@arg12	@arg13	@arg14	@arg15	@arg16	@arg17	@arg18	@arg19	@arg20	@arg21	@arg22	@arg23	@arg24	@arg25	@arg26	@arg27	@arg28	@arg29	@arg30	@arg31	@arg32
 1	1	1	1	1	1	1	1	1	1	1.0000	1.0000	2004-02-29	2004-02-29 11:11:11	2004-02-29
11:11:11	11:11:11	2004	1	1	a	123456789a	123456789a123456789b123456789c	tinyblob	tinytext	blob	text	mediumblob	mediumtext	longblob	longtext	one	monday
 select @arg01:=  c1, @arg02:=  c2, @arg03:=  c3, @arg04:=  c4,
@@ -1959,26 +1959,26 @@ def					@arg09	253	23	0	Y	128	31	63
 def					@arg10	253	23	0	Y	128	31	63
 def					@arg11	253	67	0	Y	128	30	63
 def					@arg12	253	67	0	Y	128	30	63
-def					@arg13	253	8192	0	Y	128	31	63
-def					@arg14	253	8192	0	Y	128	31	63
-def					@arg15	253	8192	19	Y	128	31	63
-def					@arg16	253	8192	0	Y	128	31	63
+def					@arg13	253	16777216	0	Y	128	31	63
+def					@arg14	253	16777216	0	Y	128	31	63
+def					@arg15	253	16777216	19	Y	128	31	63
+def					@arg16	253	16777216	0	Y	128	31	63
 def					@arg17	253	20	0	Y	128	0	63
 def					@arg18	253	20	0	Y	128	0	63
 def					@arg19	253	20	0	Y	128	0	63
-def					@arg20	253	8192	0	Y	0	31	8
-def					@arg21	253	8192	0	Y	0	31	8
-def					@arg22	253	8192	0	Y	0	31	8
-def					@arg23	253	8192	0	Y	128	31	63
-def					@arg24	253	8192	0	Y	0	31	8
-def					@arg25	253	8192	0	Y	128	31	63
-def					@arg26	253	8192	0	Y	0	31	8
-def					@arg27	253	8192	0	Y	128	31	63
-def					@arg28	253	8192	0	Y	0	31	8
-def					@arg29	253	8192	0	Y	128	31	63
-def					@arg30	253	8192	0	Y	0	31	8
-def					@arg31	253	8192	0	Y	0	31	8
-def					@arg32	253	8192	0	Y	0	31	8
+def					@arg20	253	16777216	0	Y	0	31	8
+def					@arg21	253	16777216	0	Y	0	31	8
+def					@arg22	253	16777216	0	Y	0	31	8
+def					@arg23	253	16777216	0	Y	128	31	63
+def					@arg24	253	16777216	0	Y	0	31	8
+def					@arg25	253	16777216	0	Y	128	31	63
+def					@arg26	253	16777216	0	Y	0	31	8
+def					@arg27	253	16777216	0	Y	128	31	63
+def					@arg28	253	16777216	0	Y	0	31	8
+def					@arg29	253	16777216	0	Y	128	31	63
+def					@arg30	253	16777216	0	Y	0	31	8
+def					@arg31	253	16777216	0	Y	0	31	8
+def					@arg32	253	16777216	0	Y	0	31	8
 @arg01	@arg02	@arg03	@arg04	@arg05	@arg06	@arg07	@arg08	@arg09	@arg10	@arg11	@arg12	@arg13	@arg14	@arg15	@arg16	@arg17	@arg18	@arg19	@arg20	@arg21	@arg22	@arg23	@arg24	@arg25	@arg26	@arg27	@arg28	@arg29	@arg30	@arg31	@arg32
 0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	1991-01-01
01:01:01	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 prepare stmt1 from "select 
@@ -2009,26 +2009,26 @@ def					@arg09	253	23	1	Y	128	31	63
 def					@arg10	253	23	1	Y	128	31	63
 def					@arg11	253	67	6	Y	128	30	63
 def					@arg12	253	67	6	Y	128	30	63
-def					@arg13	253	8192	10	Y	128	31	63
-def					@arg14	253	8192	19	Y	128	31	63
-def					@arg15	253	8192	19	Y	128	31	63
-def					@arg16	253	8192	8	Y	128	31	63
+def					@arg13	253	16777216	10	Y	128	31	63
+def					@arg14	253	16777216	19	Y	128	31	63
+def					@arg15	253	16777216	19	Y	128	31	63
+def					@arg16	253	16777216	8	Y	128	31	63
 def					@arg17	253	20	4	Y	128	0	63
 def					@arg18	253	20	1	Y	128	0	63
 def					@arg19	253	20	1	Y	128	0	63
-def					@arg20	253	8192	1	Y	0	31	8
-def					@arg21	253	8192	10	Y	0	31	8
-def					@arg22	253	8192	30	Y	0	31	8
-def					@arg23	253	8192	8	Y	128	31	63
-def					@arg24	253	8192	8	Y	0	31	8
-def					@arg25	253	8192	4	Y	128	31	63
-def					@arg26	253	8192	4	Y	0	31	8
-def					@arg27	253	8192	10	Y	128	31	63
-def					@arg28	253	8192	10	Y	0	31	8
-def					@arg29	253	8192	8	Y	128	31	63
-def					@arg30	253	8192	8	Y	0	31	8
-def					@arg31	253	8192	3	Y	0	31	8
-def					@arg32	253	8192	6	Y	0	31	8
+def					@arg20	253	16777216	1	Y	0	31	8
+def					@arg21	253	16777216	10	Y	0	31	8
+def					@arg22	253	16777216	30	Y	0	31	8
+def					@arg23	253	16777216	8	Y	128	31	63
+def					@arg24	253	16777216	8	Y	0	31	8
+def					@arg25	253	16777216	4	Y	128	31	63
+def					@arg26	253	16777216	4	Y	0	31	8
+def					@arg27	253	16777216	10	Y	128	31	63
+def					@arg28	253	16777216	10	Y	0	31	8
+def					@arg29	253	16777216	8	Y	128	31	63
+def					@arg30	253	16777216	8	Y	0	31	8
+def					@arg31	253	16777216	3	Y	0	31	8
+def					@arg32	253	16777216	6	Y	0	31	8
 @arg01	@arg02	@arg03	@arg04	@arg05	@arg06	@arg07	@arg08	@arg09	@arg10	@arg11	@arg12	@arg13	@arg14	@arg15	@arg16	@arg17	@arg18	@arg19	@arg20	@arg21	@arg22	@arg23	@arg24	@arg25	@arg26	@arg27	@arg28	@arg29	@arg30	@arg31	@arg32
 1	1	1	1	1	1	1	1	1	1	1.0000	1.0000	2004-02-29	2004-02-29 11:11:11	2004-02-29
11:11:11	11:11:11	2004	1	1	a	123456789a	123456789a123456789b123456789c	tinyblob	tinytext	blob	text	mediumblob	mediumtext	longblob	longtext	one	monday
 set @my_key= 0 ;
@@ -2049,26 +2049,26 @@ def					@arg09	253	23	0	Y	128	31	63
 def					@arg10	253	23	0	Y	128	31	63
 def					@arg11	253	67	0	Y	128	30	63
 def					@arg12	253	67	0	Y	128	30	63
-def					@arg13	253	8192	0	Y	128	31	63
-def					@arg14	253	8192	0	Y	128	31	63
-def					@arg15	253	8192	19	Y	128	31	63
-def					@arg16	253	8192	0	Y	128	31	63
+def					@arg13	253	16777216	0	Y	128	31	63
+def					@arg14	253	16777216	0	Y	128	31	63
+def					@arg15	253	16777216	19	Y	128	31	63
+def					@arg16	253	16777216	0	Y	128	31	63
 def					@arg17	253	20	0	Y	128	0	63
 def					@arg18	253	20	0	Y	128	0	63
 def					@arg19	253	20	0	Y	128	0	63
-def					@arg20	253	8192	0	Y	0	31	8
-def					@arg21	253	8192	0	Y	0	31	8
-def					@arg22	253	8192	0	Y	0	31	8
-def					@arg23	253	8192	0	Y	128	31	63
-def					@arg24	253	8192	0	Y	0	31	8
-def					@arg25	253	8192	0	Y	128	31	63
-def					@arg26	253	8192	0	Y	0	31	8
-def					@arg27	253	8192	0	Y	128	31	63
-def					@arg28	253	8192	0	Y	0	31	8
-def					@arg29	253	8192	0	Y	128	31	63
-def					@arg30	253	8192	0	Y	0	31	8
-def					@arg31	253	8192	0	Y	0	31	8
-def					@arg32	253	8192	0	Y	0	31	8
+def					@arg20	253	16777216	0	Y	0	31	8
+def					@arg21	253	16777216	0	Y	0	31	8
+def					@arg22	253	16777216	0	Y	0	31	8
+def					@arg23	253	16777216	0	Y	128	31	63
+def					@arg24	253	16777216	0	Y	0	31	8
+def					@arg25	253	16777216	0	Y	128	31	63
+def					@arg26	253	16777216	0	Y	0	31	8
+def					@arg27	253	16777216	0	Y	128	31	63
+def					@arg28	253	16777216	0	Y	0	31	8
+def					@arg29	253	16777216	0	Y	128	31	63
+def					@arg30	253	16777216	0	Y	0	31	8
+def					@arg31	253	16777216	0	Y	0	31	8
+def					@arg32	253	16777216	0	Y	0	31	8
 @arg01	@arg02	@arg03	@arg04	@arg05	@arg06	@arg07	@arg08	@arg09	@arg10	@arg11	@arg12	@arg13	@arg14	@arg15	@arg16	@arg17	@arg18	@arg19	@arg20	@arg21	@arg22	@arg23	@arg24	@arg25	@arg26	@arg27	@arg28	@arg29	@arg30	@arg31	@arg32
 0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	1991-01-01
01:01:01	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 prepare stmt1 from "select ? := c1 from t9 where c1= 1" ;
@@ -2097,26 +2097,26 @@ def					@arg09	253	23	1	Y	128	31	63
 def					@arg10	253	23	1	Y	128	31	63
 def					@arg11	253	67	6	Y	128	30	63
 def					@arg12	253	67	6	Y	128	30	63
-def					@arg13	253	8192	10	Y	128	31	63
-def					@arg14	253	8192	19	Y	128	31	63
-def					@arg15	253	8192	19	Y	128	31	63
-def					@arg16	253	8192	8	Y	128	31	63
+def					@arg13	253	16777216	10	Y	128	31	63
+def					@arg14	253	16777216	19	Y	128	31	63
+def					@arg15	253	16777216	19	Y	128	31	63
+def					@arg16	253	16777216	8	Y	128	31	63
 def					@arg17	253	20	4	Y	128	0	63
 def					@arg18	253	20	1	Y	128	0	63
 def					@arg19	253	20	1	Y	128	0	63
-def					@arg20	253	8192	1	Y	0	31	8
-def					@arg21	253	8192	10	Y	0	31	8
-def					@arg22	253	8192	30	Y	0	31	8
-def					@arg23	253	8192	8	Y	128	31	63
-def					@arg24	253	8192	8	Y	0	31	8
-def					@arg25	253	8192	4	Y	128	31	63
-def					@arg26	253	8192	4	Y	0	31	8
-def					@arg27	253	8192	10	Y	128	31	63
-def					@arg28	253	8192	10	Y	0	31	8
-def					@arg29	253	8192	8	Y	128	31	63
-def					@arg30	253	8192	8	Y	0	31	8
-def					@arg31	253	8192	3	Y	0	31	8
-def					@arg32	253	8192	6	Y	0	31	8
+def					@arg20	253	16777216	1	Y	0	31	8
+def					@arg21	253	16777216	10	Y	0	31	8
+def					@arg22	253	16777216	30	Y	0	31	8
+def					@arg23	253	16777216	8	Y	128	31	63
+def					@arg24	253	16777216	8	Y	0	31	8
+def					@arg25	253	16777216	4	Y	128	31	63
+def					@arg26	253	16777216	4	Y	0	31	8
+def					@arg27	253	16777216	10	Y	128	31	63
+def					@arg28	253	16777216	10	Y	0	31	8
+def					@arg29	253	16777216	8	Y	128	31	63
+def					@arg30	253	16777216	8	Y	0	31	8
+def					@arg31	253	16777216	3	Y	0	31	8
+def					@arg32	253	16777216	6	Y	0	31	8
 @arg01	@arg02	@arg03	@arg04	@arg05	@arg06	@arg07	@arg08	@arg09	@arg10	@arg11	@arg12	@arg13	@arg14	@arg15	@arg16	@arg17	@arg18	@arg19	@arg20	@arg21	@arg22	@arg23	@arg24	@arg25	@arg26	@arg27	@arg28	@arg29	@arg30	@arg31	@arg32
 1	1	1	1	1	1	1	1	1	1	1.0000	1.0000	2004-02-29	2004-02-29 11:11:11	2004-02-29
11:11:11	11:11:11	2004	1	1	a	123456789a	123456789a123456789b123456789c	tinyblob	tinytext	blob	text	mediumblob	mediumtext	longblob	longtext	one	monday
 select c1, c2, c3, c4, c5, c6, c7, c8, c9, c10, c11, c12,
@@ -2141,26 +2141,26 @@ def					@arg09	253	23	0	Y	128	31	63
 def					@arg10	253	23	0	Y	128	31	63
 def					@arg11	253	67	0	Y	128	30	63
 def					@arg12	253	67	0	Y	128	30	63
-def					@arg13	253	8192	0	Y	128	31	63
-def					@arg14	253	8192	0	Y	128	31	63
-def					@arg15	253	8192	19	Y	128	31	63
-def					@arg16	253	8192	0	Y	128	31	63
+def					@arg13	253	16777216	0	Y	128	31	63
+def					@arg14	253	16777216	0	Y	128	31	63
+def					@arg15	253	16777216	19	Y	128	31	63
+def					@arg16	253	16777216	0	Y	128	31	63
 def					@arg17	253	20	0	Y	128	0	63
 def					@arg18	253	20	0	Y	128	0	63
 def					@arg19	253	20	0	Y	128	0	63
-def					@arg20	253	8192	0	Y	0	31	8
-def					@arg21	253	8192	0	Y	0	31	8
-def					@arg22	253	8192	0	Y	0	31	8
-def					@arg23	253	8192	0	Y	128	31	63
-def					@arg24	253	8192	0	Y	0	31	8
-def					@arg25	253	8192	0	Y	128	31	63
-def					@arg26	253	8192	0	Y	0	31	8
-def					@arg27	253	8192	0	Y	128	31	63
-def					@arg28	253	8192	0	Y	0	31	8
-def					@arg29	253	8192	0	Y	128	31	63
-def					@arg30	253	8192	0	Y	0	31	8
-def					@arg31	253	8192	0	Y	0	31	8
-def					@arg32	253	8192	0	Y	0	31	8
+def					@arg20	253	16777216	0	Y	0	31	8
+def					@arg21	253	16777216	0	Y	0	31	8
+def					@arg22	253	16777216	0	Y	0	31	8
+def					@arg23	253	16777216	0	Y	128	31	63
+def					@arg24	253	16777216	0	Y	0	31	8
+def					@arg25	253	16777216	0	Y	128	31	63
+def					@arg26	253	16777216	0	Y	0	31	8
+def					@arg27	253	16777216	0	Y	128	31	63
+def					@arg28	253	16777216	0	Y	0	31	8
+def					@arg29	253	16777216	0	Y	128	31	63
+def					@arg30	253	16777216	0	Y	0	31	8
+def					@arg31	253	16777216	0	Y	0	31	8
+def					@arg32	253	16777216	0	Y	0	31	8
 @arg01	@arg02	@arg03	@arg04	@arg05	@arg06	@arg07	@arg08	@arg09	@arg10	@arg11	@arg12	@arg13	@arg14	@arg15	@arg16	@arg17	@arg18	@arg19	@arg20	@arg21	@arg22	@arg23	@arg24	@arg25	@arg26	@arg27	@arg28	@arg29	@arg30	@arg31	@arg32
 0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	1991-01-01
01:01:01	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 prepare stmt1 from "select c1, c2, c3, c4, c5, c6, c7, c8, c9, c10, c11, c12,
@@ -2187,26 +2187,26 @@ def					@arg09	253	23	1	Y	128	31	63
 def					@arg10	253	23	1	Y	128	31	63
 def					@arg11	253	67	6	Y	128	30	63
 def					@arg12	253	67	6	Y	128	30	63
-def					@arg13	253	8192	10	Y	128	31	63
-def					@arg14	253	8192	19	Y	128	31	63
-def					@arg15	253	8192	19	Y	128	31	63
-def					@arg16	253	8192	8	Y	128	31	63
+def					@arg13	253	16777216	10	Y	128	31	63
+def					@arg14	253	16777216	19	Y	128	31	63
+def					@arg15	253	16777216	19	Y	128	31	63
+def					@arg16	253	16777216	8	Y	128	31	63
 def					@arg17	253	20	4	Y	128	0	63
 def					@arg18	253	20	1	Y	128	0	63
 def					@arg19	253	20	1	Y	128	0	63
-def					@arg20	253	8192	1	Y	0	31	8
-def					@arg21	253	8192	10	Y	0	31	8
-def					@arg22	253	8192	30	Y	0	31	8
-def					@arg23	253	8192	8	Y	128	31	63
-def					@arg24	253	8192	8	Y	0	31	8
-def					@arg25	253	8192	4	Y	128	31	63
-def					@arg26	253	8192	4	Y	0	31	8
-def					@arg27	253	8192	10	Y	128	31	63
-def					@arg28	253	8192	10	Y	0	31	8
-def					@arg29	253	8192	8	Y	128	31	63
-def					@arg30	253	8192	8	Y	0	31	8
-def					@arg31	253	8192	3	Y	0	31	8
-def					@arg32	253	8192	6	Y	0	31	8
+def					@arg20	253	16777216	1	Y	0	31	8
+def					@arg21	253	16777216	10	Y	0	31	8
+def					@arg22	253	16777216	30	Y	0	31	8
+def					@arg23	253	16777216	8	Y	128	31	63
+def					@arg24	253	16777216	8	Y	0	31	8
+def					@arg25	253	16777216	4	Y	128	31	63
+def					@arg26	253	16777216	4	Y	0	31	8
+def					@arg27	253	16777216	10	Y	128	31	63
+def					@arg28	253	16777216	10	Y	0	31	8
+def					@arg29	253	16777216	8	Y	128	31	63
+def					@arg30	253	16777216	8	Y	0	31	8
+def					@arg31	253	16777216	3	Y	0	31	8
+def					@arg32	253	16777216	6	Y	0	31	8
 @arg01	@arg02	@arg03	@arg04	@arg05	@arg06	@arg07	@arg08	@arg09	@arg10	@arg11	@arg12	@arg13	@arg14	@arg15	@arg16	@arg17	@arg18	@arg19	@arg20	@arg21	@arg22	@arg23	@arg24	@arg25	@arg26	@arg27	@arg28	@arg29	@arg30	@arg31	@arg32
 1	1	1	1	1	1	1	1	1	1	1.0000	1.0000	2004-02-29	2004-02-29 11:11:11	2004-02-29
11:11:11	11:11:11	2004	1	1	a	123456789a	123456789a123456789b123456789c	tinyblob	tinytext	blob	text	mediumblob	mediumtext	longblob	longtext	one	monday
 set @my_key= 0 ;
@@ -2225,26 +2225,26 @@ def					@arg09	253	23	0	Y	128	31	63
 def					@arg10	253	23	0	Y	128	31	63
 def					@arg11	253	67	0	Y	128	30	63
 def					@arg12	253	67	0	Y	128	30	63
-def					@arg13	253	8192	0	Y	128	31	63
-def					@arg14	253	8192	0	Y	128	31	63
-def					@arg15	253	8192	19	Y	128	31	63
-def					@arg16	253	8192	0	Y	128	31	63
+def					@arg13	253	16777216	0	Y	128	31	63
+def					@arg14	253	16777216	0	Y	128	31	63
+def					@arg15	253	16777216	19	Y	128	31	63
+def					@arg16	253	16777216	0	Y	128	31	63
 def					@arg17	253	20	0	Y	128	0	63
 def					@arg18	253	20	0	Y	128	0	63
 def					@arg19	253	20	0	Y	128	0	63
-def					@arg20	253	8192	0	Y	0	31	8
-def					@arg21	253	8192	0	Y	0	31	8
-def					@arg22	253	8192	0	Y	0	31	8
-def					@arg23	253	8192	0	Y	128	31	63
-def					@arg24	253	8192	0	Y	0	31	8
-def					@arg25	253	8192	0	Y	128	31	63
-def					@arg26	253	8192	0	Y	0	31	8
-def					@arg27	253	8192	0	Y	128	31	63
-def					@arg28	253	8192	0	Y	0	31	8
-def					@arg29	253	8192	0	Y	128	31	63
-def					@arg30	253	8192	0	Y	0	31	8
-def					@arg31	253	8192	0	Y	0	31	8
-def					@arg32	253	8192	0	Y	0	31	8
+def					@arg20	253	16777216	0	Y	0	31	8
+def					@arg21	253	16777216	0	Y	0	31	8
+def					@arg22	253	16777216	0	Y	0	31	8
+def					@arg23	253	16777216	0	Y	128	31	63
+def					@arg24	253	16777216	0	Y	0	31	8
+def					@arg25	253	16777216	0	Y	128	31	63
+def					@arg26	253	16777216	0	Y	0	31	8
+def					@arg27	253	16777216	0	Y	128	31	63
+def					@arg28	253	16777216	0	Y	0	31	8
+def					@arg29	253	16777216	0	Y	128	31	63
+def					@arg30	253	16777216	0	Y	0	31	8
+def					@arg31	253	16777216	0	Y	0	31	8
+def					@arg32	253	16777216	0	Y	0	31	8
 @arg01	@arg02	@arg03	@arg04	@arg05	@arg06	@arg07	@arg08	@arg09	@arg10	@arg11	@arg12	@arg13	@arg14	@arg15	@arg16	@arg17	@arg18	@arg19	@arg20	@arg21	@arg22	@arg23	@arg24	@arg25	@arg26	@arg27	@arg28	@arg29	@arg30	@arg31	@arg32
 0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	1991-01-01
01:01:01	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 prepare stmt1 from "select c1 into ? from t9 where c1= 1" ;
@@ -2555,12 +2555,12 @@ set @arg00= 9223372036854775807 ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c1' at row 1
-Warning	1264	Out of range value adjusted for column 'c2' at row 1
-Warning	1264	Out of range value adjusted for column 'c3' at row 1
-Warning	1264	Out of range value adjusted for column 'c4' at row 1
-Warning	1264	Out of range value adjusted for column 'c5' at row 1
-Warning	1264	Out of range value adjusted for column 'c12' at row 1
+Warning	1264	Out of range value for column 'c1' at row 1
+Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c3' at row 1
+Warning	1264	Out of range value for column 'c4' at row 1
+Warning	1264	Out of range value for column 'c5' at row 1
+Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
 c1	127
 c2	32767
@@ -2578,12 +2578,12 @@ set @arg00= '9223372036854775807' ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c1' at row 1
-Warning	1264	Out of range value adjusted for column 'c2' at row 1
-Warning	1264	Out of range value adjusted for column 'c3' at row 1
-Warning	1264	Out of range value adjusted for column 'c4' at row 1
-Warning	1264	Out of range value adjusted for column 'c5' at row 1
-Warning	1264	Out of range value adjusted for column 'c12' at row 1
+Warning	1264	Out of range value for column 'c1' at row 1
+Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c3' at row 1
+Warning	1264	Out of range value for column 'c4' at row 1
+Warning	1264	Out of range value for column 'c5' at row 1
+Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
 c1	127
 c2	32767
@@ -2601,12 +2601,12 @@ set @arg00= -9223372036854775808 ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c1' at row 1
-Warning	1264	Out of range value adjusted for column 'c2' at row 1
-Warning	1264	Out of range value adjusted for column 'c3' at row 1
-Warning	1264	Out of range value adjusted for column 'c4' at row 1
-Warning	1264	Out of range value adjusted for column 'c5' at row 1
-Warning	1264	Out of range value adjusted for column 'c12' at row 1
+Warning	1264	Out of range value for column 'c1' at row 1
+Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c3' at row 1
+Warning	1264	Out of range value for column 'c4' at row 1
+Warning	1264	Out of range value for column 'c5' at row 1
+Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
 c1	-128
 c2	-32768
@@ -2624,12 +2624,12 @@ set @arg00= '-9223372036854775808' ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c1' at row 1
-Warning	1264	Out of range value adjusted for column 'c2' at row 1
-Warning	1264	Out of range value adjusted for column 'c3' at row 1
-Warning	1264	Out of range value adjusted for column 'c4' at row 1
-Warning	1264	Out of range value adjusted for column 'c5' at row 1
-Warning	1264	Out of range value adjusted for column 'c12' at row 1
+Warning	1264	Out of range value for column 'c1' at row 1
+Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c3' at row 1
+Warning	1264	Out of range value for column 'c4' at row 1
+Warning	1264	Out of range value for column 'c5' at row 1
+Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
 c1	-128
 c2	-32768
@@ -2647,14 +2647,14 @@ set @arg00= 1.11111111111111111111e+50 ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c1' at row 1
-Warning	1264	Out of range value adjusted for column 'c2' at row 1
-Warning	1264	Out of range value adjusted for column 'c3' at row 1
-Warning	1264	Out of range value adjusted for column 'c4' at row 1
-Warning	1264	Out of range value adjusted for column 'c5' at row 1
-Warning	1264	Out of range value adjusted for column 'c6' at row 1
-Warning	1264	Out of range value adjusted for column 'c7' at row 1
-Warning	1264	Out of range value adjusted for column 'c12' at row 1
+Warning	1264	Out of range value for column 'c1' at row 1
+Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c3' at row 1
+Warning	1264	Out of range value for column 'c4' at row 1
+Warning	1264	Out of range value for column 'c5' at row 1
+Warning	1264	Out of range value for column 'c6' at row 1
+Warning	1264	Out of range value for column 'c7' at row 1
+Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
 c1	127
 c2	32767
@@ -2678,8 +2678,8 @@ Warning	1264	Out of range value adjusted
 Warning	1264	Out of range value adjusted for column 'c4' at row 1
 Warning	1264	Out of range value adjusted for column 'c5' at row 1
 Warning	1264	Out of range value adjusted for column 'c6' at row 1
-Warning	1264	Out of range value adjusted for column 'c7' at row 1
-Warning	1264	Out of range value adjusted for column 'c12' at row 1
+Warning	1264	Out of range value for column 'c7' at row 1
+Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
 c1	127
 c2	32767
@@ -2697,14 +2697,14 @@ set @arg00= -1.11111111111111111111e+50 
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c1' at row 1
-Warning	1264	Out of range value adjusted for column 'c2' at row 1
-Warning	1264	Out of range value adjusted for column 'c3' at row 1
-Warning	1264	Out of range value adjusted for column 'c4' at row 1
-Warning	1264	Out of range value adjusted for column 'c5' at row 1
-Warning	1264	Out of range value adjusted for column 'c6' at row 1
-Warning	1264	Out of range value adjusted for column 'c7' at row 1
-Warning	1264	Out of range value adjusted for column 'c12' at row 1
+Warning	1264	Out of range value for column 'c1' at row 1
+Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c3' at row 1
+Warning	1264	Out of range value for column 'c4' at row 1
+Warning	1264	Out of range value for column 'c5' at row 1
+Warning	1264	Out of range value for column 'c6' at row 1
+Warning	1264	Out of range value for column 'c7' at row 1
+Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
 c1	-128
 c2	-32768
@@ -2728,8 +2728,8 @@ Warning	1264	Out of range value adjusted
 Warning	1264	Out of range value adjusted for column 'c4' at row 1
 Warning	1264	Out of range value adjusted for column 'c5' at row 1
 Warning	1264	Out of range value adjusted for column 'c6' at row 1
-Warning	1264	Out of range value adjusted for column 'c7' at row 1
-Warning	1264	Out of range value adjusted for column 'c12' at row 1
+Warning	1264	Out of range value for column 'c7' at row 1
+Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
 c1	-128
 c2	-32768
@@ -2966,46 +2966,46 @@ Warnings:
 Note	1265	Data truncated for column 'c13' at row 1
 Warning	1265	Data truncated for column 'c17' at row 1
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c13' at row 1
-Warning	1264	Out of range value adjusted for column 'c14' at row 1
+Warning	1264	Out of range value for column 'c13' at row 1
+Warning	1264	Out of range value for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value adjusted for column 'c16' at row 1
-Warning	1264	Out of range value adjusted for column 'c17' at row 1
+Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1264	Out of range value for column 'c17' at row 1
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c13' at row 1
-Warning	1264	Out of range value adjusted for column 'c14' at row 1
+Warning	1264	Out of range value for column 'c13' at row 1
+Warning	1264	Out of range value for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value adjusted for column 'c16' at row 1
-Warning	1264	Out of range value adjusted for column 'c17' at row 1
+Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1264	Out of range value for column 'c17' at row 1
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c13' at row 1
-Warning	1264	Out of range value adjusted for column 'c14' at row 1
+Warning	1264	Out of range value for column 'c13' at row 1
+Warning	1264	Out of range value for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value adjusted for column 'c16' at row 1
-Warning	1264	Out of range value adjusted for column 'c17' at row 1
+Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1264	Out of range value for column 'c17' at row 1
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c13' at row 1
-Warning	1264	Out of range value adjusted for column 'c14' at row 1
+Warning	1264	Out of range value for column 'c13' at row 1
+Warning	1264	Out of range value for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value adjusted for column 'c16' at row 1
-Warning	1264	Out of range value adjusted for column 'c17' at row 1
+Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1264	Out of range value for column 'c17' at row 1
 Warnings:
 Note	1265	Data truncated for column 'c13' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value adjusted for column 'c16' at row 1
-Warning	1264	Out of range value adjusted for column 'c17' at row 1
+Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1264	Out of range value for column 'c17' at row 1
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value adjusted for column 'c16' at row 1
-Warning	1264	Out of range value adjusted for column 'c17' at row 1
+Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1264	Out of range value for column 'c17' at row 1
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value adjusted for column 'c16' at row 1
-Warning	1264	Out of range value adjusted for column 'c17' at row 1
+Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1264	Out of range value for column 'c17' at row 1
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value adjusted for column 'c16' at row 1
-Warning	1264	Out of range value adjusted for column 'c17' at row 1
+Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1264	Out of range value for column 'c17' at row 1
 select c1, c13, c14, c15, c16, c17 from t9 order by c1 ;
 c1	c13	c14	c15	c16	c17
 20	1991-01-01	1991-01-01 01:01:01	1991-01-01 01:01:01	01:01:01	1991
Thread
• bk commit into 5.1 tree (msvensson:1.2494)msvensson16 May