bk commit into 5.0 tree (ram:1.1813)

[ramil]

Below is the list of changes that have just been committed into a local
5.0 repository of ram. When ram 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://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.1813 05/01/19 12:05:59 ram@stripped +3 -0
  Merge rkalimullin@stripped:/home/bk/mysql-5.0
  into gw.mysql.r18.ru:/usr/home/ram/work/5.0.b6999

  sql/field.cc
    1.226 05/01/19 12:05:57 ram@stripped +0 -0
    Auto merged

  mysql-test/t/strict.test
    1.11 05/01/19 12:05:57 ram@stripped +0 -0
    Auto merged

  mysql-test/r/strict.result
    1.14 05/01/19 12:05:57 ram@stripped +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:	ram
# Host:	gw.mysql.r18.ru
# Root:	/usr/home/ram/work/5.0.b6999/RESYNC

--- 1.225/sql/field.cc	2005-01-15 19:38:37 +04:00
+++ 1.226/sql/field.cc	2005-01-19 12:05:57 +04:00
@@ -4370,8 +4370,12 @@
       error= 1;
   }
   if (error)
-    set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_TRUNCATED, 1);
-
+  {
+    if (table->in_use->abort_on_warning)
+      set_warning(MYSQL_ERROR::WARN_LEVEL_ERROR, ER_DATA_TOO_LONG, 1);
+    else
+      set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_TRUNCATED, 1);
+  }
   return error;
 }
 

--- 1.13/mysql-test/r/strict.result	2005-01-15 14:28:32 +04:00
+++ 1.14/mysql-test/r/strict.result	2005-01-19 12:05:57 +04:00
@@ -814,14 +814,14 @@
 CREATE TABLE t1 (col1 CHAR(5), col2 VARCHAR(6));
 INSERT INTO t1 VALUES ('hello', 'hello'),('he', 'he'),('hello   ', 'hello ');
 INSERT INTO t1 (col1) VALUES ('hellobob');
-ERROR 01000: Data truncated for column 'col1' at row 1
+ERROR 22001: Data too long for column 'col1' at row 1
 INSERT INTO t1 (col2) VALUES ('hellobob');
 ERROR 01000: Data truncated for column 'col2' at row 1
 INSERT INTO t1 (col2) VALUES ('hello  ');
 Warnings:
 Note	1265	Data truncated for column 'col2' at row 1
 UPDATE t1 SET col1 ='hellobob' WHERE col1 ='he';
-ERROR 01000: Data truncated for column 'col1' at row 2
+ERROR 22001: Data too long for column 'col1' at row 2
 UPDATE t1 SET col2 ='hellobob' WHERE col2 ='he';
 ERROR 01000: Data truncated for column 'col2' at row 2
 INSERT IGNORE INTO t1 VALUES ('hellobob', 'hellobob');

--- 1.10/mysql-test/t/strict.test	2005-01-15 14:28:32 +04:00
+++ 1.11/mysql-test/t/strict.test	2005-01-19 12:05:57 +04:00
@@ -565,12 +565,12 @@
 
 CREATE TABLE t1 (col1 CHAR(5), col2 VARCHAR(6));
 INSERT INTO t1 VALUES ('hello', 'hello'),('he', 'he'),('hello   ', 'hello ');
---error 1265
+--error 1400
 INSERT INTO t1 (col1) VALUES ('hellobob');
 --error 1265
 INSERT INTO t1 (col2) VALUES ('hellobob');
 INSERT INTO t1 (col2) VALUES ('hello  ');
---error 1265
+--error 1400
 UPDATE t1 SET col1 ='hellobob' WHERE col1 ='he';
 --error 1265
 UPDATE t1 SET col2 ='hellobob' WHERE col2 ='he';