MySQL Lists: internals: bk commit into 5.1 tree (tulin:1.1949)

List:	Internals	« Previous Message Next Message »
From:	tomas	Date:	June 7 2005 10:33pm
Subject:	bk commit into 5.1 tree (tulin:1.1949)
View as plain text
Below is the list of changes that have just been committed into a local
5.1 repository of ndbdev. When ndbdev 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.1949 05/06/07 22:33:35 tulin@stripped +11 -0
  Many files:
    changed error codes back to match 5.0

  sql/share/errmsg.txt
    1.36 05/06/07 22:33:05 ndbdev@stripped +30 -30
    changed error codes back to match 5.0

  mysql-test/t/strict.test
    1.16 05/06/07 22:33:02 ndbdev@stripped +9 -9
    changed error codes back to match 5.0

  mysql-test/t/partition_range.test
    1.4 05/06/07 22:33:00 ndbdev@stripped +9 -9
    changed error codes back to match 5.0

  mysql-test/t/partition_list.test
    1.4 05/06/07 22:32:58 ndbdev@stripped +7 -7
    changed error codes back to match 5.0

  mysql-test/t/partition.test
    1.12 05/06/07 22:32:56 ndbdev@stripped +16 -16
    changed error codes back to match 5.0

  mysql-test/t/ndb_partition_key.test
    1.4 05/06/07 22:32:53 ndbdev@stripped +1 -1
    changed error codes back to match 5.0

  mysql-test/t/ndb_alter_table.test
    1.24 05/06/07 22:32:51 ndbdev@stripped +1 -1
    changed error codes back to match 5.0

  mysql-test/t/loaddata.test
    1.12 05/06/07 22:32:49 ndbdev@stripped +1 -1
    changed error codes back to match 5.0

  mysql-test/t/gis-rtree.test
    1.14 05/06/07 22:32:46 ndbdev@stripped +1 -1
    changed error codes back to match 5.0

  mysql-test/r/strict.result
    1.21 05/06/07 22:32:40 ndbdev@stripped +6 -6
    changed error codes back to match 5.0

  mysql-test/r/date_formats.result
    1.20 05/06/07 22:32:12 ndbdev@stripped +32 -32
    changed error codes back to match 5.0

# 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:	tulin
# Host:	dl145c.mysql.com
# Root:	/home/ndbdev/tomas/wl2325-wl1354-new

--- 1.35/sql/share/errmsg.txt	Tue Jun  7 15:59:12 2005
+++ 1.36/sql/share/errmsg.txt	Tue Jun  7 22:33:05 2005
@@ -5328,6 +5328,36 @@
 	eng "Data too long for column '%s' at row %ld"
 ER_SP_BAD_SQLSTATE 42000
 	eng "Bad SQLSTATE: '%s'"
+ER_STARTUP
+	eng "%s: ready for connections.\nVersion: '%s'  socket: '%s'  port: %d  %s"
+ER_LOAD_FROM_FIXED_SIZE_ROWS_TO_VAR
+        eng "Can't load value from file with fixed size rows to variable"
+ER_CANT_CREATE_USER_WITH_GRANT 42000
+	eng "You are not allowed to create a user with GRANT"
+ER_WRONG_VALUE_FOR_TYPE  
+	eng "Incorrect %-.32s value: '%-.128s' for function %-.32s"
+ER_TABLE_DEF_CHANGED
+	eng "Table definition has changed, please retry transaction"
+ER_SP_DUP_HANDLER 42000
+	eng "Duplicate handler declared in the same block"
+ER_SP_NOT_VAR_ARG 42000
+	eng "OUT or INOUT argument %d for routine %s is not a variable"
+ER_SP_NO_RETSET_IN_FUNC 0A000
+	eng "Not allowed to return a result set from a function"
+ER_CANT_CREATE_GEOMETRY_OBJECT 22003 
+	eng "Cannot get geometry object from data you send to the GEOMETRY field"
+ER_FAILED_ROUTINE_BREAK_BINLOG
+	eng "A routine failed and is declared to modify data and binary logging is enabled; if
non-transactional tables were updated, the binary log will miss their changes"
+ER_BINLOG_UNSAFE_ROUTINE
+	eng "This routine is declared to be non-deterministic and to modify data and binary
logging is enabled (you *might* want to use the less safe log_bin_trust_routine_creators
variable)"
+ER_BINLOG_CREATE_ROUTINE_NEED_SUPER
+	eng "You do not have SUPER privilege and binary logging is enabled (you *might* want to
use the less safe log_bin_trust_routine_creators variable)"
+ER_EXEC_STMT_WITH_OPEN_CURSOR
+	eng "You can't execute a prepared statement which has an open cursor associated with it.
Reset the statement to re-execute it."
+ER_STMT_HAS_NO_OPEN_CURSOR
+	eng "The statement (%d) has no open cursor."
+ER_COMMIT_NOT_ALLOWED_IN_SF_OR_TRG
+        eng "Explicit or implicit commit is not allowed in stored function or trigger."
 ER_PARTITION_REQUIRES_VALUES_ERROR
         eng "%s PARTITIONING requires definition of VALUES %s for each partition"
 ER_PARTITION_WRONG_VALUES_ERROR
@@ -5384,33 +5414,3 @@
         eng "A %s need to include all fields in the partition function"
 ER_NO_PARTS_ERROR
         eng "Number of %s 0 is not an allowed value"
-ER_STARTUP
-	eng "%s: ready for connections.\nVersion: '%s'  socket: '%s'  port: %d  %s"
-ER_LOAD_FROM_FIXED_SIZE_ROWS_TO_VAR
-        eng "Can't load value from file with fixed size rows to variable"
-ER_CANT_CREATE_USER_WITH_GRANT 42000
-	eng "You are not allowed to create a user with GRANT"
-ER_WRONG_VALUE_FOR_TYPE  
-	eng "Incorrect %-.32s value: '%-.128s' for function %-.32s"
-ER_TABLE_DEF_CHANGED
-	eng "Table definition has changed, please retry transaction"
-ER_SP_DUP_HANDLER 42000
-	eng "Duplicate handler declared in the same block"
-ER_SP_NOT_VAR_ARG 42000
-	eng "OUT or INOUT argument %d for routine %s is not a variable"
-ER_SP_NO_RETSET_IN_FUNC 0A000
-	eng "Not allowed to return a result set from a function"
-ER_CANT_CREATE_GEOMETRY_OBJECT 22003 
-	eng "Cannot get geometry object from data you send to the GEOMETRY field"
-ER_FAILED_ROUTINE_BREAK_BINLOG
-	eng "A routine failed and is declared to modify data and binary logging is enabled; if
non-transactional tables were updated, the binary log will miss their changes"
-ER_BINLOG_UNSAFE_ROUTINE
-	eng "This routine is declared to be non-deterministic and to modify data and binary
logging is enabled (you *might* want to use the less safe log_bin_trust_routine_creators
variable)"
-ER_BINLOG_CREATE_ROUTINE_NEED_SUPER
-	eng "You do not have SUPER privilege and binary logging is enabled (you *might* want to
use the less safe log_bin_trust_routine_creators variable)"
-ER_EXEC_STMT_WITH_OPEN_CURSOR
-	eng "You can't execute a prepared statement which has an open cursor associated with it.
Reset the statement to re-execute it."
-ER_STMT_HAS_NO_OPEN_CURSOR
-	eng "The statement (%d) has no open cursor."
-ER_COMMIT_NOT_ALLOWED_IN_SF_OR_TRG
-        eng "Explicit or implicit commit is not allowed in stored function or trigger."

--- 1.11/mysql-test/t/partition.test	Thu May 26 23:21:26 2005
+++ 1.12/mysql-test/t/partition.test	Tue Jun  7 22:32:56 2005
@@ -148,7 +148,7 @@
 #
 # Partition by key list, number of partitions defined, no partition defined
 #
---error 1420
+--error 1435
 CREATE TABLE t1 (
 a int not null,
 b int not null,
@@ -160,7 +160,7 @@
 #
 # Partition by key list, wrong result type
 #
---error 1419
+--error 1434
 CREATE TABLE t1 (
 a int not null,
 b int not null,
@@ -205,7 +205,7 @@
 #
 # Partition by key, invalid field in field list
 #
---error 1416
+--error 1431
 CREATE TABLE t1 (
 a int not null,
 b int not null,
@@ -234,7 +234,7 @@
 #
 # Partition by hash, invalid result type
 #
---error 1419
+--error 1434
 CREATE TABLE t1 (
 a int not null,
 b int not null,
@@ -301,7 +301,7 @@
 #
 # Partition by hash, values less than error
 #
---error 1409
+--error 1424
 CREATE TABLE t1 (
 a int not null,
 b int not null,
@@ -315,7 +315,7 @@
 #
 # Partition by hash, values in error
 #
---error 1409
+--error 1424
 CREATE TABLE t1 (
 a int not null,
 b int not null,
@@ -329,7 +329,7 @@
 #
 # Partition by hash, values in error
 #
---error 1409
+--error 1424
 CREATE TABLE t1 (
 a int not null,
 b int not null,
@@ -343,7 +343,7 @@
 #
 # Subpartition by key, no partitions defined, single field
 #
---error 1429
+--error 1444
 CREATE TABLE t1 (
 a int not null,
 b int not null,
@@ -355,7 +355,7 @@
 #
 # Subpartition by key, no partitions defined, list of fields
 #
---error 1429
+--error 1444
 CREATE TABLE t1 (
 a int not null,
 b int not null,
@@ -367,7 +367,7 @@
 #
 # Subpartition by hash, no partitions defined
 #
---error 1429
+--error 1444
 CREATE TABLE t1 (
 a int not null,
 b int not null,
@@ -379,7 +379,7 @@
 #
 # Subpartition by key, no partitions defined, single field
 #
---error 1429
+--error 1444
 CREATE TABLE t1 (
 a int not null,
 b int not null,
@@ -391,7 +391,7 @@
 #
 # Subpartition by key, no partitions defined, list of fields
 #
---error 1429
+--error 1444
 CREATE TABLE t1 (
 a int not null,
 b int not null,
@@ -403,7 +403,7 @@
 #
 # Subpartition by hash, no partitions defined
 #
---error 1429
+--error 1444
 CREATE TABLE t1 (
 a int not null,
 b int not null,
@@ -427,7 +427,7 @@
 #
 # Subpartition by hash, wrong subpartition function
 #
---error 1429
+--error 1444
 CREATE TABLE t1 (
 a int not null,
 b int not null,
@@ -455,7 +455,7 @@
 #
 # Subpartition by hash, no partitions defined, wrong subpartition function
 #
---error 1416
+--error 1431
 CREATE TABLE t1 (
 a int not null,
 b int not null,
@@ -469,7 +469,7 @@
 #
 # Subpartition by hash, no partitions defined, wrong subpartition function
 #
---error 1429
+--error 1444
 CREATE TABLE t1 (
 a int not null,
 b int not null,

--- 1.19/mysql-test/r/date_formats.result	Thu Jun  2 06:36:39 2005
+++ 1.20/mysql-test/r/date_formats.result	Tue Jun  7 22:32:12 2005
@@ -86,7 +86,7 @@
 STR_TO_DATE('2004.12.12 22.30.61','%Y.%m.%d %T')
 NULL
 Warnings:
-Error	1439	Incorrect time value: '22.30.61' for function str_to_time
+Error	1411	Incorrect time value: '22.30.61' for function str_to_time
 create table t1 (date char(30), format char(30) not null);
 insert into t1 values
 ('2003-01-02 10:11:12', '%Y-%m-%d %H:%i:%S'),
@@ -344,21 +344,21 @@
 7 53 1998	%w %u %Y	NULL
 NULL	%m.%d.%Y	NULL
 Warnings:
-Error	1439	Incorrect datetime value: '2003-01-02 10:11:12 PM' for function str_to_time
-Error	1439	Incorrect datetime value: '2003-01-02 10:11:12.123456' for function
str_to_time
-Error	1439	Incorrect datetime value: '2003-01-02 10:11:12AM' for function str_to_time
-Error	1439	Incorrect datetime value: '2003-01-02 10:11:12AN' for function str_to_time
-Error	1439	Incorrect datetime value: '2003-01-02 10:11:12 PM' for function str_to_time
-Error	1439	Incorrect datetime value: '10:20:10AM' for function str_to_time
-Error	1439	Incorrect datetime value: '15 Septembei 2001' for function str_to_time
-Error	1439	Incorrect datetime value: '15 Ju 2001' for function str_to_time
-Error	1439	Incorrect datetime value: 'Sund 15 MA' for function str_to_time
-Error	1439	Incorrect datetime value: 'Thursdai 12 1998' for function str_to_time
-Error	1439	Incorrect datetime value: 'Sunday 01 2001' for function str_to_time
-Error	1439	Incorrect datetime value: 'Tuesday 52 2001' for function str_to_time
-Error	1439	Incorrect datetime value: 'Tuesday 52 2001' for function str_to_time
-Error	1439	Incorrect datetime value: 'Tuesday 52 2001' for function str_to_time
-Error	1439	Incorrect datetime value: '7 53 1998' for function str_to_time
+Error	1411	Incorrect datetime value: '2003-01-02 10:11:12 PM' for function str_to_time
+Error	1411	Incorrect datetime value: '2003-01-02 10:11:12.123456' for function
str_to_time
+Error	1411	Incorrect datetime value: '2003-01-02 10:11:12AM' for function str_to_time
+Error	1411	Incorrect datetime value: '2003-01-02 10:11:12AN' for function str_to_time
+Error	1411	Incorrect datetime value: '2003-01-02 10:11:12 PM' for function str_to_time
+Error	1411	Incorrect datetime value: '10:20:10AM' for function str_to_time
+Error	1411	Incorrect datetime value: '15 Septembei 2001' for function str_to_time
+Error	1411	Incorrect datetime value: '15 Ju 2001' for function str_to_time
+Error	1411	Incorrect datetime value: 'Sund 15 MA' for function str_to_time
+Error	1411	Incorrect datetime value: 'Thursdai 12 1998' for function str_to_time
+Error	1411	Incorrect datetime value: 'Sunday 01 2001' for function str_to_time
+Error	1411	Incorrect datetime value: 'Tuesday 52 2001' for function str_to_time
+Error	1411	Incorrect datetime value: 'Tuesday 52 2001' for function str_to_time
+Error	1411	Incorrect datetime value: 'Tuesday 52 2001' for function str_to_time
+Error	1411	Incorrect datetime value: '7 53 1998' for function str_to_time
 select date,format,concat(str_to_date(date, format),'') as con from t1;
 date	format	con
 2003-01-02 10:11:12 PM	%Y-%m-%d %H:%i:%S %p	NULL
@@ -378,21 +378,21 @@
 7 53 1998	%w %u %Y	NULL
 NULL	%m.%d.%Y	NULL
 Warnings:
-Error	1439	Incorrect datetime value: '2003-01-02 10:11:12 PM' for function str_to_time
-Error	1439	Incorrect datetime value: '2003-01-02 10:11:12.123456' for function
str_to_time
-Error	1439	Incorrect datetime value: '2003-01-02 10:11:12AM' for function str_to_time
-Error	1439	Incorrect datetime value: '2003-01-02 10:11:12AN' for function str_to_time
-Error	1439	Incorrect datetime value: '2003-01-02 10:11:12 PM' for function str_to_time
-Error	1439	Incorrect datetime value: '10:20:10AM' for function str_to_time
-Error	1439	Incorrect datetime value: '15 Septembei 2001' for function str_to_time
-Error	1439	Incorrect datetime value: '15 Ju 2001' for function str_to_time
-Error	1439	Incorrect datetime value: 'Sund 15 MA' for function str_to_time
-Error	1439	Incorrect datetime value: 'Thursdai 12 1998' for function str_to_time
-Error	1439	Incorrect datetime value: 'Sunday 01 2001' for function str_to_time
-Error	1439	Incorrect datetime value: 'Tuesday 52 2001' for function str_to_time
-Error	1439	Incorrect datetime value: 'Tuesday 52 2001' for function str_to_time
-Error	1439	Incorrect datetime value: 'Tuesday 52 2001' for function str_to_time
-Error	1439	Incorrect datetime value: '7 53 1998' for function str_to_time
+Error	1411	Incorrect datetime value: '2003-01-02 10:11:12 PM' for function str_to_time
+Error	1411	Incorrect datetime value: '2003-01-02 10:11:12.123456' for function
str_to_time
+Error	1411	Incorrect datetime value: '2003-01-02 10:11:12AM' for function str_to_time
+Error	1411	Incorrect datetime value: '2003-01-02 10:11:12AN' for function str_to_time
+Error	1411	Incorrect datetime value: '2003-01-02 10:11:12 PM' for function str_to_time
+Error	1411	Incorrect datetime value: '10:20:10AM' for function str_to_time
+Error	1411	Incorrect datetime value: '15 Septembei 2001' for function str_to_time
+Error	1411	Incorrect datetime value: '15 Ju 2001' for function str_to_time
+Error	1411	Incorrect datetime value: 'Sund 15 MA' for function str_to_time
+Error	1411	Incorrect datetime value: 'Thursdai 12 1998' for function str_to_time
+Error	1411	Incorrect datetime value: 'Sunday 01 2001' for function str_to_time
+Error	1411	Incorrect datetime value: 'Tuesday 52 2001' for function str_to_time
+Error	1411	Incorrect datetime value: 'Tuesday 52 2001' for function str_to_time
+Error	1411	Incorrect datetime value: 'Tuesday 52 2001' for function str_to_time
+Error	1411	Incorrect datetime value: '7 53 1998' for function str_to_time
 truncate table t1;
 insert into t1 values
 ('10:20:10AM', '%h:%i:%s'),
@@ -432,7 +432,7 @@
 str_to_date('15-01-2001 12:59:59', GET_FORMAT(DATE,'USA'))
 NULL
 Warnings:
-Error	1439	Incorrect datetime value: '15-01-2001 12:59:59' for function str_to_time
+Error	1411	Incorrect datetime value: '15-01-2001 12:59:59' for function str_to_time
 explain extended select makedate(1997,1), addtime("31.12.97 11.59.59.999999 PM", "1
1.1.1.000002"),subtime("31.12.97 11.59.59.999999 PM", "1
1.1.1.000002"),timediff("01.01.97 11:59:59.000001 PM","31.12.95 11:59:59.000002
PM"),cast(str_to_date("15-01-2001 12:59:59", "%d-%m-%Y %H:%i:%S") as TIME),
maketime(23,11,12),microsecond("1997-12-31 23:59:59.000001");
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used

--- 1.23/mysql-test/t/ndb_alter_table.test	Thu Jun  2 06:36:40 2005
+++ 1.24/mysql-test/t/ndb_alter_table.test	Tue Jun  7 22:32:51 2005
@@ -148,7 +148,7 @@
 connection server1;
 alter table t1 drop index c;
 connection server2;
---error 1440
+--error 1412
 select * from t1 where b = 'two';
 select * from t1 where b = 'two';
 connection server1;

--- 1.20/mysql-test/r/strict.result	Thu Jun  2 06:36:39 2005
+++ 1.21/mysql-test/r/strict.result	Tue Jun  7 22:32:40 2005
@@ -1075,13 +1075,13 @@
 Warning	1292	Truncated incorrect datetime value: '31.10.2004 15.30 abc'
 insert into t1 values(STR_TO_DATE('32.10.2004 15.30','%d.%m.%Y %H.%i'));
 Warnings:
-Error	1439	Incorrect datetime value: '32.10.2004 15.30' for function str_to_time
+Error	1411	Incorrect datetime value: '32.10.2004 15.30' for function str_to_time
 insert into t1 values(STR_TO_DATE('2004.12.12 22:22:33 AM','%Y.%m.%d %r'));
 Warnings:
-Error	1439	Incorrect time value: '22:22:33 AM' for function str_to_time
+Error	1411	Incorrect time value: '22:22:33 AM' for function str_to_time
 insert into t1 values(STR_TO_DATE('2004.12.12 abc','%Y.%m.%d %T'));
 Warnings:
-Error	1439	Incorrect time value: 'abc' for function str_to_time
+Error	1411	Incorrect time value: 'abc' for function str_to_time
 insert into t1 values(STR_TO_DATE('31.10.2004 15.30','%d.%m.%Y %H.%i'));
 insert into t1 values(STR_TO_DATE('2004.12.12 11:22:33 AM','%Y.%m.%d %r'));
 insert into t1 values(STR_TO_DATE('2004.12.12 10:22:59','%Y.%m.%d %T'));
@@ -1099,9 +1099,9 @@
 count(*)
 7
 Warnings:
-Error	1439	Incorrect datetime value: '2004.12.12 10:22:61' for function str_to_time
-Error	1439	Incorrect datetime value: '2004.12.12 10:22:61' for function str_to_time
-Error	1439	Incorrect datetime value: '2004.12.12 10:22:61' for function str_to_time
+Error	1411	Incorrect datetime value: '2004.12.12 10:22:61' for function str_to_time
+Error	1411	Incorrect datetime value: '2004.12.12 10:22:61' for function str_to_time
+Error	1411	Incorrect datetime value: '2004.12.12 10:22:61' for function str_to_time
 drop table t1;
 create table t1 (col1 char(3), col2 integer);
 insert into t1 (col1) values (cast(1000 as char(3)));

--- 1.15/mysql-test/t/strict.test	Thu Jun  2 06:36:40 2005
+++ 1.16/mysql-test/t/strict.test	Tue Jun  7 22:33:02 2005
@@ -198,11 +198,11 @@
 INSERT INTO t1 (col1) VALUES(STR_TO_DATE('0.10.2004 15.30','%d.%m.%Y %H.%i'));
 --error 1292
 INSERT INTO t1 (col1) VALUES(STR_TO_DATE('31.9.2004 15.30','%d.%m.%Y %H.%i'));
---error 1439
+--error 1411
 INSERT INTO t1 (col1) VALUES(STR_TO_DATE('32.10.2004 15.30','%d.%m.%Y %H.%i'));
 --error 1292
 INSERT INTO t1 (col1) VALUES(STR_TO_DATE('29.02.2003 15.30','%d.%m.%Y %H.%i'));
---error 1439
+--error 1411
 INSERT INTO t1 (col1) VALUES(STR_TO_DATE('15.13.2004 15.30','%d.%m.%Y %H.%i'));
 --error 1292
 INSERT INTO t1 (col1) VALUES(STR_TO_DATE('00.00.0000','%d.%m.%Y'));
@@ -219,11 +219,11 @@
 INSERT INTO t1 (col2) VALUES(STR_TO_DATE('0.10.2004 15.30','%d.%m.%Y %H.%i'));
 --error 1292
 INSERT INTO t1 (col2) VALUES(STR_TO_DATE('31.9.2004 15.30','%d.%m.%Y %H.%i'));
---error 1439
+--error 1411
 INSERT INTO t1 (col2) VALUES(STR_TO_DATE('32.10.2004 15.30','%d.%m.%Y %H.%i'));
 --error 1292
 INSERT INTO t1 (col2) VALUES(STR_TO_DATE('29.02.2003 15.30','%d.%m.%Y %H.%i'));
---error 1439
+--error 1411
 INSERT INTO t1 (col2) VALUES(STR_TO_DATE('15.13.2004 15.30','%d.%m.%Y %H.%i'));
 --error 1292
 INSERT INTO t1 (col2) VALUES(STR_TO_DATE('00.00.0000','%d.%m.%Y'));
@@ -240,11 +240,11 @@
 INSERT INTO t1 (col3) VALUES(STR_TO_DATE('0.10.2004 15.30','%d.%m.%Y %H.%i'));
 --error 1292
 INSERT INTO t1 (col3) VALUES(STR_TO_DATE('31.9.2004 15.30','%d.%m.%Y %H.%i'));
---error 1439
+--error 1411
 INSERT INTO t1 (col3) VALUES(STR_TO_DATE('32.10.2004 15.30','%d.%m.%Y %H.%i'));
 --error 1292
 INSERT INTO t1 (col3) VALUES(STR_TO_DATE('29.02.2003 15.30','%d.%m.%Y %H.%i'));
---error 1439
+--error 1411
 INSERT INTO t1 (col3) VALUES(STR_TO_DATE('15.13.2004 15.30','%d.%m.%Y %H.%i'));
 --error 1292
 INSERT INTO t1 (col3) VALUES(STR_TO_DATE('00.00.0000','%d.%m.%Y'));
@@ -945,11 +945,11 @@
 create table t1 (col1 datetime);
 --error 1292
 insert into t1 values(STR_TO_DATE('31.10.2004 15.30 abc','%d.%m.%Y %H.%i'));
---error 1439
+--error 1411
 insert into t1 values(STR_TO_DATE('32.10.2004 15.30','%d.%m.%Y %H.%i'));
---error 1439
+--error 1411
 insert into t1 values(STR_TO_DATE('2004.12.12 22:22:33 AM','%Y.%m.%d %r'));
---error 1439
+--error 1411
 insert into t1 values(STR_TO_DATE('2004.12.12 abc','%Y.%m.%d %T'));
 set sql_mode='';
 insert into t1 values(STR_TO_DATE('31.10.2004 15.30 abc','%d.%m.%Y %H.%i'));

--- 1.11/mysql-test/t/loaddata.test	Thu Jun  2 06:36:39 2005
+++ 1.12/mysql-test/t/loaddata.test	Tue Jun  7 22:32:49 2005
@@ -62,7 +62,7 @@
 load data infile '../../std_data/loaddata5.dat' into table t1 fields terminated by ''
enclosed by '' (a, b) set c=concat(a,"+",b,"+",@c,"+",b,"+",if(c is null,"NIL",c));
 select * from t1;
 # and this should bark
---error 1437 
+--error 1409 
 load data infile '../../std_data/loaddata5.dat' into table t1 fields terminated by ''
enclosed by '' (a, @b);
 
 # Now let us test LOAD DATA with subselect

--- 1.3/mysql-test/t/partition_list.test	Thu May 26 23:21:26 2005
+++ 1.4/mysql-test/t/partition_list.test	Tue Jun  7 22:32:58 2005
@@ -193,7 +193,7 @@
 #
 # Partition by list, no partition => error
 #
---error 1420
+--error 1435
 CREATE TABLE t1 (
 a int not null,
 b int not null,
@@ -204,7 +204,7 @@
 #
 # Partition by list, constant partition function not allowed
 #
---error 1414
+--error 1429
 CREATE TABLE t1 (
 a int not null,
 b int not null,
@@ -232,7 +232,7 @@
 # 
 # Partition by list, no values in definition
 # 
---error 1408
+--error 1423
 CREATE TABLE t1 (
 a int not null,
 b int not null,
@@ -246,7 +246,7 @@
 #
 # Partition by list, values less than error
 #
---error 1409
+--error 1424
 CREATE TABLE t1 (
 a int not null,
 b int not null,
@@ -260,7 +260,7 @@
 #
 # Partition by list, no values in definition
 #
---error 1408
+--error 1423
 CREATE TABLE t1 (
 a int not null,
 b int not null,
@@ -274,7 +274,7 @@
 #
 # Partition by list, duplicate values
 #
---error 1423
+--error 1438
 CREATE TABLE t1 (
 a int not null,
 b int not null,
@@ -288,7 +288,7 @@
 #
 # Partition by list, wrong constant result type (not INT)
 #
---error 1422
+--error 1437
 CREATE TABLE t1 (
 a int not null,
 b int not null,

--- 1.3/mysql-test/t/partition_range.test	Thu May 26 23:21:26 2005
+++ 1.4/mysql-test/t/partition_range.test	Tue Jun  7 22:33:00 2005
@@ -126,7 +126,7 @@
 #
 # Partition by range, no partition => error
 #
---error 1420
+--error 1435
 CREATE TABLE t1 (
 a int not null,
 b int not null,
@@ -151,7 +151,7 @@
 #
 # Partition by range, inconsistent partition function and constants
 #
---error 1422
+--error 1437
 CREATE TABLE t1 (
 a int not null,
 b int not null,
@@ -165,7 +165,7 @@
 #
 # Partition by range, constant partition function not allowed
 #
---error 1414
+--error 1429
 CREATE TABLE t1 (
 a int not null,
 b int not null,
@@ -179,7 +179,7 @@
 # 
 # Partition by range, no values less than definition
 # 
---error 1408
+--error 1423
 CREATE TABLE t1 ( 
 a int not null,
 b int not null,
@@ -193,7 +193,7 @@
 #
 # Partition by range, no values in definition allowed
 #
---error 1409
+--error 1424
 CREATE TABLE t1 (
 a int not null,
 b int not null,
@@ -207,7 +207,7 @@
 #
 # Partition by range, values in error
 #
---error 1409
+--error 1424
 CREATE TABLE t1 (
 a int not null,
 b int not null,
@@ -263,7 +263,7 @@
 #
 # Partition by range, not increasing ranges
 #
---error 1421
+--error 1436
 CREATE TABLE t1 (
 a int not null,
 b int not null,
@@ -277,7 +277,7 @@
 #
 # Partition by range, wrong result type of partition function
 #
---error 1419
+--error 1434
 CREATE TABLE t1 (
 a int not null,
 b int not null,
@@ -523,7 +523,7 @@
 #
 # Subpartition with range => error
 #
---error 1408
+--error 1423
 CREATE TABLE t1 (
 a int not null,
 b int not null,

--- 1.3/mysql-test/t/ndb_partition_key.test	Fri May 27 01:44:04 2005
+++ 1.4/mysql-test/t/ndb_partition_key.test	Tue Jun  7 22:32:53 2005
@@ -23,7 +23,7 @@
 drop table t1;
 
 # only support for partition key on primary key
---error 1434
+--error 1449
 CREATE TABLE t1 (a int, b int, c int, d int, PRIMARY KEY(a,b))
   ENGINE = NDB
   PARTITION BY KEY (c);

--- 1.13/mysql-test/t/gis-rtree.test	Thu Jun  2 06:36:39 2005
+++ 1.14/mysql-test/t/gis-rtree.test	Tue Jun  7 22:32:46 2005
@@ -168,6 +168,6 @@
 CREATE TABLE t1 (st varchar(100));
 INSERT INTO t1 VALUES ("Fake string");
 CREATE TABLE t2 (geom GEOMETRY NOT NULL, SPATIAL KEY gk(geom));
---error 1444
+--error 1416
 INSERT INTO t2 SELECT GeomFromText(st) FROM t1;
 drop table t1, t2;
Thread
• bk commit into 5.1 tree (tulin:1.1949)	tomas	7 Jun