List:Commits« Previous MessageNext Message »
From:antony Date:October 5 2007 4:01pm
Subject:bk commit into 5.2 tree (acurtis:1.2595) BUG#31149
View as plain text  
Below is the list of changes that have just been committed into a local
5.2 repository of antony. When antony 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-10-05 09:01:44-07:00, acurtis@stripped +35 -0
  Bug#31149
    "Warnings and Error messages printed multiple times"
    Many things may result in duplicate error messages which would give user no additional
    information. These messages may be result of different phases of the same action
    (prepare to do action vs executing action) or as consequence of similar but not
    identical tests.
    If a message is pushed and later another identical message but with a higher level
    is pushed, the existing message has its level upgraded. For all duplicates, the
    warn_count property is incremented so no information is lost but we do not do anything
    with this property yet.

  mysql-test/r/comment_column.result@stripped, 2007-10-05 09:01:25-07:00, acurtis@stripped +0 -1
    Removed duplicate warnings

  mysql-test/r/comment_index.result@stripped, 2007-10-05 09:01:25-07:00, acurtis@stripped +0 -4
    Removed duplicate warnings

  mysql-test/r/create.result@stripped, 2007-10-05 09:01:25-07:00, acurtis@stripped +5 -0
    Test for bug31149

  mysql-test/r/date_formats.result@stripped, 2007-10-05 09:01:25-07:00, acurtis@stripped +0 -6
    Removed duplicate warnings

  mysql-test/r/default.result@stripped, 2007-10-05 09:01:25-07:00, acurtis@stripped +0 -4
    Removed duplicate warnings

  mysql-test/r/delete.result@stripped, 2007-10-05 09:01:25-07:00, acurtis@stripped +0 -2
    Removed duplicate warnings

  mysql-test/r/func_compress.result@stripped, 2007-10-05 09:01:25-07:00, acurtis@stripped +0 -1
    Removed duplicate warnings

  mysql-test/r/func_in.result@stripped, 2007-10-05 09:01:25-07:00, acurtis@stripped +0 -3
    Removed duplicate warnings

  mysql-test/r/func_str.result@stripped, 2007-10-05 09:01:26-07:00, acurtis@stripped +0 -60
    Removed duplicate warnings

  mysql-test/r/func_time.result@stripped, 2007-10-05 09:01:26-07:00, acurtis@stripped +0 -5
    Removed duplicate warnings

  mysql-test/r/innodb_mysql.result@stripped, 2007-10-05 09:01:26-07:00, acurtis@stripped +0 -2
    Removed duplicate warnings

  mysql-test/r/insert.result@stripped, 2007-10-05 09:01:26-07:00, acurtis@stripped +0 -13
    Removed duplicate warnings

  mysql-test/r/insert_select.result@stripped, 2007-10-05 09:01:26-07:00, acurtis@stripped +0 -1
    Removed duplicate warnings

  mysql-test/r/insert_update.result@stripped, 2007-10-05 09:01:26-07:00, acurtis@stripped +0 -2
    Removed duplicate warnings

  mysql-test/r/key.result@stripped, 2007-10-05 09:01:26-07:00, acurtis@stripped +0 -1
    Removed duplicate warnings

  mysql-test/r/null.result@stripped, 2007-10-05 09:01:26-07:00, acurtis@stripped +0 -4
    Removed duplicate warnings

  mysql-test/r/range.result@stripped, 2007-10-05 09:01:26-07:00, acurtis@stripped +0 -2
    Removed duplicate warnings

  mysql-test/r/select.result@stripped, 2007-10-05 09:01:26-07:00, acurtis@stripped +0 -1
    Removed duplicate warnings

  mysql-test/r/sp-vars.result@stripped, 2007-10-05 09:01:26-07:00, acurtis@stripped +0 -14
    Removed duplicate warnings

  mysql-test/r/sp.result@stripped, 2007-10-05 09:01:26-07:00, acurtis@stripped +0 -33
    Removed duplicate warnings

  mysql-test/r/strict.result@stripped, 2007-10-05 09:01:27-07:00, acurtis@stripped +0 -11
    Removed duplicate warnings

  mysql-test/r/subselect.result@stripped, 2007-10-05 09:01:27-07:00, acurtis@stripped +0 -1
    Removed duplicate warnings

  mysql-test/r/subselect_no_opts.result@stripped, 2007-10-05 09:01:27-07:00, acurtis@stripped +0 -1
    Removed duplicate warnings

  mysql-test/r/subselect_no_semijoin.result@stripped, 2007-10-05 09:01:27-07:00, acurtis@stripped +0 -1
    Removed duplicate warnings

  mysql-test/r/trigger.result@stripped, 2007-10-05 09:01:27-07:00, acurtis@stripped +0 -1
    Removed duplicate warnings

  mysql-test/r/type_date.result@stripped, 2007-10-05 09:01:27-07:00, acurtis@stripped +0 -3
    Removed duplicate warnings

  mysql-test/r/type_decimal.result@stripped, 2007-10-05 09:01:27-07:00, acurtis@stripped +0 -2
    Removed duplicate warnings

  mysql-test/r/type_newdecimal.result@stripped, 2007-10-05 09:01:27-07:00, acurtis@stripped +0 -19
    Removed duplicate warnings

  mysql-test/r/view.result@stripped, 2007-10-05 09:01:27-07:00, acurtis@stripped +0 -3
    Removed duplicate warnings

  mysql-test/r/xml.result@stripped, 2007-10-05 09:01:27-07:00, acurtis@stripped +0 -6
    Removed duplicate warnings

  mysql-test/suite/ndb/r/ndb_alter_table_online.result@stripped, 2007-10-05 09:01:27-07:00, acurtis@stripped +0 -4
    Removed duplicate warnings

  mysql-test/suite/ndb/r/ndb_dd_alter.result@stripped, 2007-10-05 09:01:28-07:00, acurtis@stripped +0 -5
    Removed duplicate warnings

  mysql-test/t/create.test@stripped, 2007-10-05 09:01:28-07:00, acurtis@stripped +8 -0
    Test for bug31149

  sql/sql_error.cc@stripped, 2007-10-05 09:01:28-07:00, acurtis@stripped +18 -1
    bug31149
      check for duplicate warnings before adding to list.

  sql/sql_error.h@stripped, 2007-10-05 09:01:28-07:00, acurtis@stripped +2 -1
    bug31149
      new property MYSQL_ERROR::warn_count

diff -Nrup a/mysql-test/r/comment_column.result b/mysql-test/r/comment_column.result
--- a/mysql-test/r/comment_column.result	2007-08-28 04:04:32 -07:00
+++ b/mysql-test/r/comment_column.result	2007-10-05 09:01:25 -07:00
@@ -239,7 +239,6 @@ t1	CREATE TABLE `t1` (
 ALTER TABLE t1 ADD COLUMN c11 INTEGER COMMENT 'ABCDEfghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghija!
 bcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdABCDEfghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcde!
 fghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabc
ghijabcdefghijabcdefghijabcdefghijabcdefghijabcdABCDEfghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghija!
 bcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd';
 Warnings:
 Warning	1470	String 'ABCDEfghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghij' is too long for COLUMN COMMENT (should be no longer than 1024)
-Warning	1470	String 'ABCDEfghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghij' is too long for COLUMN COMMENT (should be no longer than 1024)
 SELECT table_comment,char_length(table_comment) FROM information_schema.tables WHERE table_name='t1';
 table_comment	char_length(table_comment)
 ABCDEFGHIJabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefgh!
 ijabcdefghijabcdefghijabcdefghijabcd	1024
diff -Nrup a/mysql-test/r/comment_index.result b/mysql-test/r/comment_index.result
--- a/mysql-test/r/comment_index.result	2007-08-28 04:04:32 -07:00
+++ b/mysql-test/r/comment_index.result	2007-10-05 09:01:25 -07:00
@@ -268,8 +268,6 @@ t1	CREATE TABLE `t1` (
 CREATE INDEX i11 ON t1(c11) COMMENT 'abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghija!
 bcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcde!
 fghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabc
ghijabcdefghijabcdefghijabcdefghijabcd';
 Warnings:
 Warning	1470	String 'abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghij' is too long for INDEX COMMENT (should be no longer than 1024)
-Warning	1470	String 'abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghij' is too long for INDEX COMMENT (should be no longer than 1024)
-Warning	1470	String 'abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghij' is too long for INDEX COMMENT (should be no longer than 1024)
 SELECT table_comment,char_length(table_comment) FROM information_schema.tables WHERE table_name='t1';
 table_comment	char_length(table_comment)
 ABCDEFGHIJabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefgh!
 ijabcdefghijabcdefghijabcdefghijabcd	1024
@@ -321,8 +319,6 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COMMENT='ABCDEFGHIJabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghij!
 abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd'
 ALTER TABLE t1 ADD INDEX (c13) COMMENT 'abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefgh!
 ijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijab!
 cdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghij
defghijabcdefghijabcdefghijabcdefghijabcd';
 Warnings:
-Warning	1470	String 'abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghij' is too long for INDEX COMMENT (should be no longer than 1024)
-Warning	1470	String 'abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghij' is too long for INDEX COMMENT (should be no longer than 1024)
 Warning	1470	String 'abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghij' is too long for INDEX COMMENT (should be no longer than 1024)
 SELECT table_comment,char_length(table_comment) FROM information_schema.tables WHERE table_name='t1';
 table_comment	char_length(table_comment)
diff -Nrup a/mysql-test/r/create.result b/mysql-test/r/create.result
--- a/mysql-test/r/create.result	2007-09-20 04:36:00 -07:00
+++ b/mysql-test/r/create.result	2007-10-05 09:01:25 -07:00
@@ -1699,4 +1699,9 @@ ERROR 42000: Identifier name 'очень
 drop view имя_вью_кодировке_утф8_длиной_больше_чем_42;
 drop table имя_таблицы_в_кодировке_утф8_длиной_больше_чем_48;
 set names default;
+CREATE TABLE t1 (a VARCHAR(30000)) ENGINE=MyISAM;
+CREATE INDEX i1 ON t1 (a);
+Warnings:
+Warning	1071	Specified key was too long; max key length is 1000 bytes
+DROP TABLE t1;
 End of 5.1 tests
diff -Nrup a/mysql-test/r/date_formats.result b/mysql-test/r/date_formats.result
--- a/mysql-test/r/date_formats.result	2007-08-31 00:28:40 -07:00
+++ b/mysql-test/r/date_formats.result	2007-10-05 09:01:25 -07:00
@@ -356,7 +356,6 @@ Error	1411	Incorrect datetime value: '20
 Error	1411	Incorrect datetime value: '2003-01-02 10:11:12.123456' for function str_to_date
 Error	1411	Incorrect datetime value: '2003-01-02 10:11:12AM' for function str_to_date
 Error	1411	Incorrect datetime value: '2003-01-02 10:11:12AN' for function str_to_date
-Error	1411	Incorrect datetime value: '2003-01-02 10:11:12 PM' for function str_to_date
 Error	1411	Incorrect datetime value: '10:20:10AM' for function str_to_date
 Error	1411	Incorrect datetime value: '15 Septembei 2001' for function str_to_date
 Error	1411	Incorrect datetime value: '15 Ju 2001' for function str_to_date
@@ -364,8 +363,6 @@ Error	1411	Incorrect datetime value: 'Su
 Error	1411	Incorrect datetime value: 'Thursdai 12 1998' for function str_to_date
 Error	1411	Incorrect datetime value: 'Sunday 01 2001' for function str_to_date
 Error	1411	Incorrect datetime value: 'Tuesday 52 2001' for function str_to_date
-Error	1411	Incorrect datetime value: 'Tuesday 52 2001' for function str_to_date
-Error	1411	Incorrect datetime value: 'Tuesday 52 2001' for function str_to_date
 Error	1411	Incorrect datetime value: '7 53 1998' for function str_to_date
 select date,format,concat(str_to_date(date, format),'') as con from t1;
 date	format	con
@@ -390,15 +387,12 @@ Error	1411	Incorrect datetime value: '20
 Error	1411	Incorrect datetime value: '2003-01-02 10:11:12.123456' for function str_to_date
 Error	1411	Incorrect datetime value: '2003-01-02 10:11:12AM' for function str_to_date
 Error	1411	Incorrect datetime value: '2003-01-02 10:11:12AN' for function str_to_date
-Error	1411	Incorrect datetime value: '2003-01-02 10:11:12 PM' for function str_to_date
 Error	1411	Incorrect datetime value: '10:20:10AM' for function str_to_date
 Error	1411	Incorrect datetime value: '15 Septembei 2001' for function str_to_date
 Error	1411	Incorrect datetime value: '15 Ju 2001' for function str_to_date
 Error	1411	Incorrect datetime value: 'Sund 15 MA' for function str_to_date
 Error	1411	Incorrect datetime value: 'Thursdai 12 1998' for function str_to_date
 Error	1411	Incorrect datetime value: 'Sunday 01 2001' for function str_to_date
-Error	1411	Incorrect datetime value: 'Tuesday 52 2001' for function str_to_date
-Error	1411	Incorrect datetime value: 'Tuesday 52 2001' for function str_to_date
 Error	1411	Incorrect datetime value: 'Tuesday 52 2001' for function str_to_date
 Error	1411	Incorrect datetime value: '7 53 1998' for function str_to_date
 truncate table t1;
diff -Nrup a/mysql-test/r/default.result b/mysql-test/r/default.result
--- a/mysql-test/r/default.result	2007-09-20 01:56:24 -07:00
+++ b/mysql-test/r/default.result	2007-10-05 09:01:25 -07:00
@@ -108,7 +108,6 @@ create table bug20691 (i int, d datetime
 insert into bug20691 values (1, DEFAULT, DEFAULT), (1, '1975-07-10 07:10:03', '1978-01-13 14:08:51'), (1, DEFAULT, DEFAULT);
 Warnings:
 Warning	1364	Field 'd' doesn't have a default value
-Warning	1364	Field 'd' doesn't have a default value
 insert into bug20691 (i) values (2);
 Warnings:
 Warning	1364	Field 'd' doesn't have a default value
@@ -120,18 +119,15 @@ dn	datetime	NO		0000-00-00 00:00:00	
 insert into bug20691 values (3, DEFAULT, DEFAULT), (3, '1975-07-10 07:10:03', '1978-01-13 14:08:51'), (3, DEFAULT, DEFAULT);
 Warnings:
 Warning	1364	Field 'd' doesn't have a default value
-Warning	1364	Field 'd' doesn't have a default value
 insert into bug20691 (i) values (4);
 Warnings:
 Warning	1364	Field 'd' doesn't have a default value
 insert into bug20691 values (5, DEFAULT, DEFAULT), (5, '1975-07-10 07:10:03', '1978-01-13 14:08:51'), (5, DEFAULT, DEFAULT);
 Warnings:
 Warning	1364	Field 'd' doesn't have a default value
-Warning	1364	Field 'd' doesn't have a default value
 SET sql_mode = 'ALLOW_INVALID_DATES';
 insert into bug20691 values (6, DEFAULT, DEFAULT), (6, '1975-07-10 07:10:03', '1978-01-13 14:08:51'), (6, DEFAULT, DEFAULT);
 Warnings:
-Warning	1364	Field 'd' doesn't have a default value
 Warning	1364	Field 'd' doesn't have a default value
 SET sql_mode = 'STRICT_ALL_TABLES';
 insert into bug20691 values (7, DEFAULT, DEFAULT), (7, '1975-07-10 07:10:03', '1978-01-13 14:08:51'), (7, DEFAULT, DEFAULT);
diff -Nrup a/mysql-test/r/delete.result b/mysql-test/r/delete.result
--- a/mysql-test/r/delete.result	2007-09-11 14:52:24 -07:00
+++ b/mysql-test/r/delete.result	2007-10-05 09:01:25 -07:00
@@ -127,7 +127,6 @@ a	b
 delete ignore t11.*, t12.* from t11,t12 where t11.a = t12.a and t11.b <> (select b from t2 where t11.a < t2.a);
 Warnings:
 Error	1242	Subquery returns more than 1 row
-Error	1242	Subquery returns more than 1 row
 select * from t11;
 a	b
 0	10
@@ -146,7 +145,6 @@ a	b
 2	12
 delete ignore from t11 where t11.b <> (select b from t2 where t11.a < t2.a);
 Warnings:
-Error	1242	Subquery returns more than 1 row
 Error	1242	Subquery returns more than 1 row
 select * from t11;
 a	b
diff -Nrup a/mysql-test/r/func_compress.result b/mysql-test/r/func_compress.result
--- a/mysql-test/r/func_compress.result	2006-10-13 07:33:14 -07:00
+++ b/mysql-test/r/func_compress.result	2007-10-05 09:01:25 -07:00
@@ -114,6 +114,5 @@ a	uncompress(a)	uncompress(a) is null
 foo	NULL	1
 Warnings:
 Error	1259	ZLIB: Input data corrupted
-Error	1259	ZLIB: Input data corrupted
 drop table t1;
 End of 5.0 tests
diff -Nrup a/mysql-test/r/func_in.result b/mysql-test/r/func_in.result
--- a/mysql-test/r/func_in.result	2007-07-06 03:19:41 -07:00
+++ b/mysql-test/r/func_in.result	2007-10-05 09:01:25 -07:00
@@ -536,8 +536,6 @@ f2
 2
 Warnings:
 Warning	1292	Truncated incorrect DOUBLE value: 'a'
-Warning	1292	Truncated incorrect DOUBLE value: 'a'
-Warning	1292	Truncated incorrect DOUBLE value: 'a'
 explain select f2 from t2 where f2 in ('a',2);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t2	index	t2f2	t2f2	5	NULL	3	Using where; Using index
@@ -558,7 +556,6 @@ f2
 0
 1
 Warnings:
-Warning	1292	Truncated incorrect DOUBLE value: 'b'
 Warning	1292	Truncated incorrect DOUBLE value: 'b'
 explain select f2 from t2 where f2 in (1,'b');
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
diff -Nrup a/mysql-test/r/func_str.result b/mysql-test/r/func_str.result
--- a/mysql-test/r/func_str.result	2007-06-18 05:08:52 -07:00
+++ b/mysql-test/r/func_str.result	2007-10-05 09:01:26 -07:00
@@ -1574,7 +1574,6 @@ left('hello', -18446744073709551615)
 
 Warnings:
 Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1292	Truncated incorrect DECIMAL value: ''
 select left('hello', 18446744073709551615);
 left('hello', 18446744073709551615)
 hello
@@ -1583,25 +1582,21 @@ left('hello', -18446744073709551616)
 
 Warnings:
 Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1292	Truncated incorrect DECIMAL value: ''
 select left('hello', 18446744073709551616);
 left('hello', 18446744073709551616)
 hello
 Warnings:
 Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1292	Truncated incorrect DECIMAL value: ''
 select left('hello', -18446744073709551617);
 left('hello', -18446744073709551617)
 
 Warnings:
 Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1292	Truncated incorrect DECIMAL value: ''
 select left('hello', 18446744073709551617);
 left('hello', 18446744073709551617)
 hello
 Warnings:
 Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1292	Truncated incorrect DECIMAL value: ''
 select right('hello', 10);
 right('hello', 10)
 hello
@@ -1634,7 +1629,6 @@ right('hello', -18446744073709551615)
 
 Warnings:
 Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1292	Truncated incorrect DECIMAL value: ''
 select right('hello', 18446744073709551615);
 right('hello', 18446744073709551615)
 hello
@@ -1643,25 +1637,21 @@ right('hello', -18446744073709551616)
 
 Warnings:
 Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1292	Truncated incorrect DECIMAL value: ''
 select right('hello', 18446744073709551616);
 right('hello', 18446744073709551616)
 hello
 Warnings:
 Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1292	Truncated incorrect DECIMAL value: ''
 select right('hello', -18446744073709551617);
 right('hello', -18446744073709551617)
 
 Warnings:
 Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1292	Truncated incorrect DECIMAL value: ''
 select right('hello', 18446744073709551617);
 right('hello', 18446744073709551617)
 hello
 Warnings:
 Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1292	Truncated incorrect DECIMAL value: ''
 select substring('hello', 2, -1);
 substring('hello', 2, -1)
 
@@ -1694,7 +1684,6 @@ substring('hello', -18446744073709551615
 
 Warnings:
 Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1292	Truncated incorrect DECIMAL value: ''
 select substring('hello', 18446744073709551615, 1);
 substring('hello', 18446744073709551615, 1)
 
@@ -1703,25 +1692,21 @@ substring('hello', -18446744073709551616
 
 Warnings:
 Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1292	Truncated incorrect DECIMAL value: ''
 select substring('hello', 18446744073709551616, 1);
 substring('hello', 18446744073709551616, 1)
 
 Warnings:
 Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1292	Truncated incorrect DECIMAL value: ''
 select substring('hello', -18446744073709551617, 1);
 substring('hello', -18446744073709551617, 1)
 
 Warnings:
 Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1292	Truncated incorrect DECIMAL value: ''
 select substring('hello', 18446744073709551617, 1);
 substring('hello', 18446744073709551617, 1)
 
 Warnings:
 Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1292	Truncated incorrect DECIMAL value: ''
 select substring('hello', 1, -1);
 substring('hello', 1, -1)
 
@@ -1748,7 +1733,6 @@ substring('hello', 1, -18446744073709551
 
 Warnings:
 Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1292	Truncated incorrect DECIMAL value: ''
 select substring('hello', 1, 18446744073709551615);
 substring('hello', 1, 18446744073709551615)
 hello
@@ -1757,25 +1741,21 @@ substring('hello', 1, -18446744073709551
 
 Warnings:
 Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1292	Truncated incorrect DECIMAL value: ''
 select substring('hello', 1, 18446744073709551616);
 substring('hello', 1, 18446744073709551616)
 hello
 Warnings:
 Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1292	Truncated incorrect DECIMAL value: ''
 select substring('hello', 1, -18446744073709551617);
 substring('hello', 1, -18446744073709551617)
 
 Warnings:
 Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1292	Truncated incorrect DECIMAL value: ''
 select substring('hello', 1, 18446744073709551617);
 substring('hello', 1, 18446744073709551617)
 hello
 Warnings:
 Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1292	Truncated incorrect DECIMAL value: ''
 select substring('hello', -1, -1);
 substring('hello', -1, -1)
 
@@ -1802,9 +1782,6 @@ substring('hello', -18446744073709551615
 
 Warnings:
 Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1292	Truncated incorrect DECIMAL value: ''
 select substring('hello', 18446744073709551615, 18446744073709551615);
 substring('hello', 18446744073709551615, 18446744073709551615)
 
@@ -1813,33 +1790,21 @@ substring('hello', -18446744073709551616
 
 Warnings:
 Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1292	Truncated incorrect DECIMAL value: ''
 select substring('hello', 18446744073709551616, 18446744073709551616);
 substring('hello', 18446744073709551616, 18446744073709551616)
 
 Warnings:
 Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1292	Truncated incorrect DECIMAL value: ''
 select substring('hello', -18446744073709551617, -18446744073709551617);
 substring('hello', -18446744073709551617, -18446744073709551617)
 
 Warnings:
 Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1292	Truncated incorrect DECIMAL value: ''
 select substring('hello', 18446744073709551617, 18446744073709551617);
 substring('hello', 18446744073709551617, 18446744073709551617)
 
 Warnings:
 Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1292	Truncated incorrect DECIMAL value: ''
 select insert('hello', -1, 1, 'hi');
 insert('hello', -1, 1, 'hi')
 hello
@@ -1964,7 +1929,6 @@ insert('hello', -18446744073709551615, -
 hello
 Warnings:
 Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1292	Truncated incorrect DECIMAL value: ''
 select insert('hello', 18446744073709551615, 18446744073709551615, 'hi');
 insert('hello', 18446744073709551615, 18446744073709551615, 'hi')
 hello
@@ -1973,25 +1937,21 @@ insert('hello', -18446744073709551616, -
 hello
 Warnings:
 Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1292	Truncated incorrect DECIMAL value: ''
 select insert('hello', 18446744073709551616, 18446744073709551616, 'hi');
 insert('hello', 18446744073709551616, 18446744073709551616, 'hi')
 hello
 Warnings:
 Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1292	Truncated incorrect DECIMAL value: ''
 select insert('hello', -18446744073709551617, -18446744073709551617, 'hi');
 insert('hello', -18446744073709551617, -18446744073709551617, 'hi')
 hello
 Warnings:
 Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1292	Truncated incorrect DECIMAL value: ''
 select insert('hello', 18446744073709551617, 18446744073709551617, 'hi');
 insert('hello', 18446744073709551617, 18446744073709551617, 'hi')
 hello
 Warnings:
 Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1292	Truncated incorrect DECIMAL value: ''
 select repeat('hello', -1);
 repeat('hello', -1)
 
@@ -2024,7 +1984,6 @@ repeat('hello', -18446744073709551615)
 
 Warnings:
 Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1292	Truncated incorrect DECIMAL value: ''
 select repeat('hello', 18446744073709551615);
 repeat('hello', 18446744073709551615)
 NULL
@@ -2035,26 +1994,22 @@ repeat('hello', -18446744073709551616)
 
 Warnings:
 Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1292	Truncated incorrect DECIMAL value: ''
 select repeat('hello', 18446744073709551616);
 repeat('hello', 18446744073709551616)
 NULL
 Warnings:
 Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1292	Truncated incorrect DECIMAL value: ''
 Warning	1301	Result of repeat() was larger than max_allowed_packet (1048576) - truncated
 select repeat('hello', -18446744073709551617);
 repeat('hello', -18446744073709551617)
 
 Warnings:
 Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1292	Truncated incorrect DECIMAL value: ''
 select repeat('hello', 18446744073709551617);
 repeat('hello', 18446744073709551617)
 NULL
 Warnings:
 Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1292	Truncated incorrect DECIMAL value: ''
 Warning	1301	Result of repeat() was larger than max_allowed_packet (1048576) - truncated
 select space(-1);
 space(-1)
@@ -2088,7 +2043,6 @@ space(-18446744073709551615)
 
 Warnings:
 Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1292	Truncated incorrect DECIMAL value: ''
 select space(18446744073709551615);
 space(18446744073709551615)
 NULL
@@ -2099,26 +2053,22 @@ space(-18446744073709551616)
 
 Warnings:
 Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1292	Truncated incorrect DECIMAL value: ''
 select space(18446744073709551616);
 space(18446744073709551616)
 NULL
 Warnings:
 Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1292	Truncated incorrect DECIMAL value: ''
 Warning	1301	Result of repeat() was larger than max_allowed_packet (1048576) - truncated
 select space(-18446744073709551617);
 space(-18446744073709551617)
 
 Warnings:
 Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1292	Truncated incorrect DECIMAL value: ''
 select space(18446744073709551617);
 space(18446744073709551617)
 NULL
 Warnings:
 Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1292	Truncated incorrect DECIMAL value: ''
 Warning	1301	Result of repeat() was larger than max_allowed_packet (1048576) - truncated
 select rpad('hello', -1, '1');
 rpad('hello', -1, '1')
@@ -2152,7 +2102,6 @@ rpad('hello', -18446744073709551615, '1'
 NULL
 Warnings:
 Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1292	Truncated incorrect DECIMAL value: ''
 select rpad('hello', 18446744073709551615, '1');
 rpad('hello', 18446744073709551615, '1')
 NULL
@@ -2163,26 +2112,22 @@ rpad('hello', -18446744073709551616, '1'
 NULL
 Warnings:
 Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1292	Truncated incorrect DECIMAL value: ''
 select rpad('hello', 18446744073709551616, '1');
 rpad('hello', 18446744073709551616, '1')
 NULL
 Warnings:
 Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1292	Truncated incorrect DECIMAL value: ''
 Warning	1301	Result of rpad() was larger than max_allowed_packet (1048576) - truncated
 select rpad('hello', -18446744073709551617, '1');
 rpad('hello', -18446744073709551617, '1')
 NULL
 Warnings:
 Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1292	Truncated incorrect DECIMAL value: ''
 select rpad('hello', 18446744073709551617, '1');
 rpad('hello', 18446744073709551617, '1')
 NULL
 Warnings:
 Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1292	Truncated incorrect DECIMAL value: ''
 Warning	1301	Result of rpad() was larger than max_allowed_packet (1048576) - truncated
 select lpad('hello', -1, '1');
 lpad('hello', -1, '1')
@@ -2216,7 +2161,6 @@ lpad('hello', -18446744073709551615, '1'
 NULL
 Warnings:
 Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1292	Truncated incorrect DECIMAL value: ''
 select lpad('hello', 18446744073709551615, '1');
 lpad('hello', 18446744073709551615, '1')
 NULL
@@ -2227,25 +2171,21 @@ lpad('hello', -18446744073709551616, '1'
 NULL
 Warnings:
 Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1292	Truncated incorrect DECIMAL value: ''
 select lpad('hello', 18446744073709551616, '1');
 lpad('hello', 18446744073709551616, '1')
 NULL
 Warnings:
 Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1292	Truncated incorrect DECIMAL value: ''
 Warning	1301	Result of lpad() was larger than max_allowed_packet (1048576) - truncated
 select lpad('hello', -18446744073709551617, '1');
 lpad('hello', -18446744073709551617, '1')
 NULL
 Warnings:
 Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1292	Truncated incorrect DECIMAL value: ''
 select lpad('hello', 18446744073709551617, '1');
 lpad('hello', 18446744073709551617, '1')
 NULL
 Warnings:
-Error	1292	Truncated incorrect DECIMAL value: ''
 Error	1292	Truncated incorrect DECIMAL value: ''
 Warning	1301	Result of lpad() was larger than max_allowed_packet (1048576) - truncated
 SET @orig_sql_mode = @@SQL_MODE;
diff -Nrup a/mysql-test/r/func_time.result b/mysql-test/r/func_time.result
--- a/mysql-test/r/func_time.result	2007-08-03 10:04:50 -07:00
+++ b/mysql-test/r/func_time.result	2007-10-05 09:01:26 -07:00
@@ -487,7 +487,6 @@ dayofyear("0000-00-00")	dayofyear(d)	day
 NULL	NULL	NULL	NULL	NULL
 Warnings:
 Warning	1292	Incorrect datetime value: '0000-00-00'
-Warning	1292	Incorrect datetime value: '0000-00-00'
 select dayofmonth("0000-00-00"),dayofmonth(d),dayofmonth(dt),dayofmonth(t),dayofmonth(c) from t1;
 dayofmonth("0000-00-00")	dayofmonth(d)	dayofmonth(dt)	dayofmonth(t)	dayofmonth(c)
 0	0	0	0	0
@@ -502,7 +501,6 @@ week("0000-00-00")	week(d)	week(dt)	week
 NULL	NULL	NULL	NULL	NULL
 Warnings:
 Warning	1292	Incorrect datetime value: '0000-00-00'
-Warning	1292	Incorrect datetime value: '0000-00-00'
 select year("0000-00-00"),year(d),year(dt),year(t),year(c) from t1;
 year("0000-00-00")	year(d)	year(dt)	year(t)	year(c)
 0	0	0	0	0
@@ -511,13 +509,11 @@ yearweek("0000-00-00")	yearweek(d)	yearw
 NULL	NULL	NULL	NULL	NULL
 Warnings:
 Warning	1292	Incorrect datetime value: '0000-00-00'
-Warning	1292	Incorrect datetime value: '0000-00-00'
 select to_days("0000-00-00"),to_days(d),to_days(dt),to_days(t),to_days(c) from t1;
 to_days("0000-00-00")	to_days(d)	to_days(dt)	to_days(t)	to_days(c)
 NULL	NULL	NULL	NULL	NULL
 Warnings:
 Warning	1292	Incorrect datetime value: '0000-00-00'
-Warning	1292	Incorrect datetime value: '0000-00-00'
 select extract(MONTH FROM "0000-00-00"),extract(MONTH FROM d),extract(MONTH FROM dt),extract(MONTH FROM t),extract(MONTH FROM c) from t1;
 extract(MONTH FROM "0000-00-00")	extract(MONTH FROM d)	extract(MONTH FROM dt)	extract(MONTH FROM t)	extract(MONTH FROM c)
 0	0	0	0	0
@@ -908,7 +904,6 @@ f1
 select f1 from t1 where cast("2006-1-1" as date) between f1 and cast('zzz' as date);
 f1
 Warnings:
-Warning	1292	Incorrect datetime value: 'zzz'
 Warning	1292	Incorrect datetime value: 'zzz'
 select f1 from t1 where makedate(2006,1) between date(f1) and date(f3);
 f1
diff -Nrup a/mysql-test/r/innodb_mysql.result b/mysql-test/r/innodb_mysql.result
--- a/mysql-test/r/innodb_mysql.result	2007-09-19 02:41:52 -07:00
+++ b/mysql-test/r/innodb_mysql.result	2007-10-05 09:01:26 -07:00
@@ -1115,8 +1115,6 @@ insert into t1 values('aaa');
 alter table t1 add index(a(1024));
 Warnings:
 Warning	1071	Specified key was too long; max key length is 767 bytes
-Warning	1071	Specified key was too long; max key length is 767 bytes
-Warning	1071	Specified key was too long; max key length is 767 bytes
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
diff -Nrup a/mysql-test/r/insert.result b/mysql-test/r/insert.result
--- a/mysql-test/r/insert.result	2007-05-31 02:19:10 -07:00
+++ b/mysql-test/r/insert.result	2007-10-05 09:01:26 -07:00
@@ -160,17 +160,11 @@ insert into t1 values(null,@value,@value
 Warnings:
 Warning	1264	Out of range value for column 'f_double' at row 1
 Warning	1264	Out of range value for column 'f_float' at row 1
-Warning	1264	Out of range value for column 'f_float' at row 1
-Warning	1264	Out of range value for column 'f_double_7_2' at row 1
 Warning	1264	Out of range value for column 'f_double_7_2' at row 1
 Warning	1264	Out of range value for column 'f_float_4_3' at row 1
-Warning	1264	Out of range value for column 'f_float_4_3' at row 1
 Warning	1264	Out of range value for column 'f_double_u' at row 1
 Warning	1264	Out of range value for column 'f_float_u' at row 1
-Warning	1264	Out of range value for column 'f_float_u' at row 1
 Warning	1264	Out of range value for column 'f_double_15_1_u' at row 1
-Warning	1264	Out of range value for column 'f_double_15_1_u' at row 1
-Warning	1264	Out of range value for column 'f_float_3_1_u' at row 1
 Warning	1264	Out of range value for column 'f_float_3_1_u' at row 1
 select * from t1 where number =last_insert_id();
 number	4
@@ -188,18 +182,11 @@ insert into t1 values(null,@value,@value
 Warnings:
 Warning	1264	Out of range value for column 'f_double' at row 1
 Warning	1264	Out of range value for column 'f_float' at row 1
-Warning	1264	Out of range value for column 'f_float' at row 1
 Warning	1264	Out of range value for column 'f_double_7_2' at row 1
-Warning	1264	Out of range value for column 'f_double_7_2' at row 1
-Warning	1264	Out of range value for column 'f_float_4_3' at row 1
 Warning	1264	Out of range value for column 'f_float_4_3' at row 1
 Warning	1264	Out of range value for column 'f_double_u' at row 1
-Warning	1264	Out of range value for column 'f_double_u' at row 1
 Warning	1264	Out of range value for column 'f_float_u' at row 1
-Warning	1264	Out of range value for column 'f_float_u' at row 1
-Warning	1264	Out of range value for column 'f_double_15_1_u' at row 1
 Warning	1264	Out of range value for column 'f_double_15_1_u' at row 1
-Warning	1264	Out of range value for column 'f_float_3_1_u' at row 1
 Warning	1264	Out of range value for column 'f_float_3_1_u' at row 1
 select * from t1 where number =last_insert_id();
 number	5
diff -Nrup a/mysql-test/r/insert_select.result b/mysql-test/r/insert_select.result
--- a/mysql-test/r/insert_select.result	2007-07-30 23:12:19 -07:00
+++ b/mysql-test/r/insert_select.result	2007-10-05 09:01:26 -07:00
@@ -607,7 +607,6 @@ create table t2(No int not null, Field i
 insert into t2 Select null, Field, Count From t1 Where Month=20030901 and Type=2;
 Warnings:
 Warning	1048	Column 'No' cannot be null
-Warning	1048	Column 'No' cannot be null
 select * from t2;
 No	Field	Count
 0	1	100
diff -Nrup a/mysql-test/r/insert_update.result b/mysql-test/r/insert_update.result
--- a/mysql-test/r/insert_update.result	2007-09-06 09:22:31 -07:00
+++ b/mysql-test/r/insert_update.result	2007-10-05 09:01:26 -07:00
@@ -378,7 +378,6 @@ id	c1	cnt
 INSERT IGNORE INTO t1 (id,c1) SELECT 1,NULL
 ON DUPLICATE KEY UPDATE c1=NULL, cnt=cnt+1;
 Warnings:
-Warning	1048	Column 'c1' cannot be null
 Error	1048	Column 'c1' cannot be null
 SELECT * FROM t1;
 id	c1	cnt
@@ -386,7 +385,6 @@ id	c1	cnt
 INSERT IGNORE INTO t1 (id,c1) SELECT * FROM t2
 ON DUPLICATE KEY UPDATE c1=NULL, cnt=cnt+1;
 Warnings:
-Warning	1048	Column 'c1' cannot be null
 Error	1048	Column 'c1' cannot be null
 SELECT * FROM t1;
 id	c1	cnt
diff -Nrup a/mysql-test/r/key.result b/mysql-test/r/key.result
--- a/mysql-test/r/key.result	2007-09-20 04:36:00 -07:00
+++ b/mysql-test/r/key.result	2007-10-05 09:01:26 -07:00
@@ -160,7 +160,6 @@ UNIQUE (c,i));
 INSERT INTO t1 (c) VALUES (NULL),(NULL);
 Warnings:
 Warning	1048	Column 'c' cannot be null
-Warning	1048	Column 'c' cannot be null
 SELECT * FROM t1;
 c	i
 	1
diff -Nrup a/mysql-test/r/null.result b/mysql-test/r/null.result
--- a/mysql-test/r/null.result	2007-06-27 10:47:51 -07:00
+++ b/mysql-test/r/null.result	2007-10-05 09:01:26 -07:00
@@ -105,7 +105,6 @@ ERROR 23000: Column 'a' cannot be null
 INSERT INTO t1 (a) values (null),(null);
 Warnings:
 Warning	1048	Column 'a' cannot be null
-Warning	1048	Column 'a' cannot be null
 INSERT INTO t1 (b) values (null);
 ERROR 23000: Column 'b' cannot be null
 INSERT INTO t1 (b) values (1/null);
@@ -113,7 +112,6 @@ ERROR 23000: Column 'b' cannot be null
 INSERT INTO t1 (b) values (null),(null);
 Warnings:
 Warning	1048	Column 'b' cannot be null
-Warning	1048	Column 'b' cannot be null
 INSERT INTO t1 (c) values (null);
 ERROR 23000: Column 'c' cannot be null
 INSERT INTO t1 (c) values (1/null);
@@ -121,14 +119,12 @@ ERROR 23000: Column 'c' cannot be null
 INSERT INTO t1 (c) values (null),(null);
 Warnings:
 Warning	1048	Column 'c' cannot be null
-Warning	1048	Column 'c' cannot be null
 INSERT INTO t1 (d) values (null);
 ERROR 23000: Column 'd' cannot be null
 INSERT INTO t1 (d) values (1/null);
 ERROR 23000: Column 'd' cannot be null
 INSERT INTO t1 (d) values (null),(null);
 Warnings:
-Warning	1048	Column 'd' cannot be null
 Warning	1048	Column 'd' cannot be null
 select * from t1;
 a	b	c	d
diff -Nrup a/mysql-test/r/range.result b/mysql-test/r/range.result
--- a/mysql-test/r/range.result	2007-06-27 15:31:22 -07:00
+++ b/mysql-test/r/range.result	2007-10-05 09:01:26 -07:00
@@ -1106,13 +1106,11 @@ id	select_type	table	type	possible_keys	
 1	SIMPLE	t1	ref	PRIMARY	PRIMARY	20	const	2	Using index condition
 Warnings:
 Warning	1292	Incorrect datetime value: '2005-12-01 24:00:00' for column 'started' at row 1
-Warning	1292	Incorrect datetime value: '2005-12-01 24:00:00' for column 'started' at row 1
 SELECT * FROM t1 WHERE item='A1' AND started<='2005-12-01 24:00:00';
 item	started	price
 A1	2005-11-01 08:00:00	1000.000
 A1	2005-11-15 00:00:00	2000.000
 Warnings:
-Warning	1292	Incorrect datetime value: '2005-12-01 24:00:00' for column 'started' at row 1
 Warning	1292	Incorrect datetime value: '2005-12-01 24:00:00' for column 'started' at row 1
 SELECT * FROM t1 WHERE item='A1' AND started<='2005-12-02 00:00:00';
 item	started	price
diff -Nrup a/mysql-test/r/select.result b/mysql-test/r/select.result
--- a/mysql-test/r/select.result	2007-09-20 04:36:00 -07:00
+++ b/mysql-test/r/select.result	2007-10-05 09:01:26 -07:00
@@ -2116,7 +2116,6 @@ SELECT a.gvid, (SUM(CASE b.sampletid WHE
 gvid	the_success	the_fail	the_size	the_time
 Warnings:
 Warning	1292	Incorrect datetime value: 'wrong-date-value' for column 'sampletime' at row 1
-Warning	1292	Incorrect datetime value: 'wrong-date-value' for column 'sampletime' at row 1
 SELECT a.gvid, (SUM(CASE b.sampletid WHEN 140 THEN b.samplevalue ELSE 0 END)) as the_success,(SUM(CASE b.sampletid WHEN 141 THEN b.samplevalue ELSE 0 END)) as the_fail,(SUM(CASE b.sampletid WHEN 142 THEN b.samplevalue ELSE 0 END)) as the_size,(SUM(CASE b.sampletid WHEN 143 THEN b.samplevalue ELSE 0 END)) as the_time FROM t1 a, t2 b WHERE a.hmid = b.hmid AND a.volid = b.volid AND b.sampletime >= NULL AND b.sampletime < NULL AND b.sampletid IN (140, 141, 142, 143) GROUP BY a.gvid;
 gvid	the_success	the_fail	the_size	the_time
 DROP TABLE t1,t2;
diff -Nrup a/mysql-test/r/sp-vars.result b/mysql-test/r/sp-vars.result
--- a/mysql-test/r/sp-vars.result	2007-05-18 05:29:22 -07:00
+++ b/mysql-test/r/sp-vars.result	2007-10-05 09:01:26 -07:00
@@ -147,17 +147,10 @@ Warning	1264	Out of range value for colu
 Warning	1264	Out of range value for column 'i2' at row 1
 Warning	1264	Out of range value for column 'i3' at row 1
 Warning	1264	Out of range value for column 'i4' at row 1
-Warning	1264	Out of range value for column 'i1' at row 1
-Warning	1264	Out of range value for column 'i2' at row 1
-Warning	1264	Out of range value for column 'i3' at row 1
-Warning	1264	Out of range value for column 'i4' at row 1
 Warning	1264	Out of range value for column 'u1' at row 1
 Warning	1264	Out of range value for column 'u2' at row 1
 Warning	1264	Out of range value for column 'u3' at row 1
 Warning	1264	Out of range value for column 'u4' at row 1
-Warning	1264	Out of range value for column 'u1' at row 1
-Warning	1264	Out of range value for column 'u2' at row 1
-Note	1265	Data truncated for column 'd3' at row 1
 Note	1265	Data truncated for column 'd3' at row 1
 SELECT sp_vars_check_ret1();
 sp_vars_check_ret1()
@@ -235,17 +228,10 @@ Warning	1264	Out of range value for colu
 Warning	1264	Out of range value for column 'i2' at row 1
 Warning	1264	Out of range value for column 'i3' at row 1
 Warning	1264	Out of range value for column 'i4' at row 1
-Warning	1264	Out of range value for column 'i1' at row 1
-Warning	1264	Out of range value for column 'i2' at row 1
-Warning	1264	Out of range value for column 'i3' at row 1
-Warning	1264	Out of range value for column 'i4' at row 1
 Warning	1264	Out of range value for column 'u1' at row 1
 Warning	1264	Out of range value for column 'u2' at row 1
 Warning	1264	Out of range value for column 'u3' at row 1
 Warning	1264	Out of range value for column 'u4' at row 1
-Warning	1264	Out of range value for column 'u1' at row 1
-Warning	1264	Out of range value for column 'u2' at row 1
-Note	1265	Data truncated for column 'd3' at row 1
 Note	1265	Data truncated for column 'd3' at row 1
 SELECT sp_vars_check_ret1();
 sp_vars_check_ret1()
diff -Nrup a/mysql-test/r/sp.result b/mysql-test/r/sp.result
--- a/mysql-test/r/sp.result	2007-09-20 04:36:00 -07:00
+++ b/mysql-test/r/sp.result	2007-10-05 09:01:26 -07:00
@@ -6156,7 +6156,6 @@ bug20777(0) as '0',
 bug20777(-1) as '-1';
 Warnings:
 Warning	1264	Out of range value for column 'f1' at row 1
-Warning	1264	Out of range value for column 'f1' at row 1
 insert into examplebug20777 values (1, 9223372036854775806, 9223372036854775807, 223372036854775808, 9223372036854775809, 18446744073709551614, 18446744073709551615, 8446744073709551616, 0, -1);
 Warnings:
 Warning	1264	Out of range value for column '-1' at row 1
@@ -6202,35 +6201,6 @@ bug5274_f2()
 x
 Warnings:
 Warning	1265	Data truncated for column 'bug5274_f1' at row 1
-Warning	1265	Data truncated for column 'bug5274_f1' at row 1
-Warning	1265	Data truncated for column 'bug5274_f1' at row 1
-Warning	1265	Data truncated for column 'bug5274_f1' at row 1
-Warning	1265	Data truncated for column 'bug5274_f1' at row 1
-Warning	1265	Data truncated for column 'bug5274_f1' at row 1
-Warning	1265	Data truncated for column 'bug5274_f1' at row 1
-Warning	1265	Data truncated for column 'bug5274_f1' at row 1
-Warning	1265	Data truncated for column 'bug5274_f1' at row 1
-Warning	1265	Data truncated for column 'bug5274_f1' at row 1
-Warning	1265	Data truncated for column 'bug5274_f1' at row 1
-Warning	1265	Data truncated for column 'bug5274_f1' at row 1
-Warning	1265	Data truncated for column 'bug5274_f1' at row 1
-Warning	1265	Data truncated for column 'bug5274_f1' at row 1
-Warning	1265	Data truncated for column 'bug5274_f1' at row 1
-Warning	1265	Data truncated for column 'bug5274_f1' at row 1
-Warning	1265	Data truncated for column 'bug5274_f1' at row 1
-Warning	1265	Data truncated for column 'bug5274_f1' at row 1
-Warning	1265	Data truncated for column 'bug5274_f1' at row 1
-Warning	1265	Data truncated for column 'bug5274_f1' at row 1
-Warning	1265	Data truncated for column 'bug5274_f1' at row 1
-Warning	1265	Data truncated for column 'bug5274_f1' at row 1
-Warning	1265	Data truncated for column 'bug5274_f1' at row 1
-Warning	1265	Data truncated for column 'bug5274_f1' at row 1
-Warning	1265	Data truncated for column 'bug5274_f1' at row 1
-Warning	1265	Data truncated for column 'bug5274_f1' at row 1
-Warning	1265	Data truncated for column 'bug5274_f1' at row 1
-Warning	1265	Data truncated for column 'bug5274_f1' at row 1
-Warning	1265	Data truncated for column 'bug5274_f1' at row 1
-Warning	1265	Data truncated for column 'bug5274_f1' at row 1
 DROP FUNCTION bug5274_f1|
 DROP FUNCTION bug5274_f2|
 drop procedure if exists proc_21513|
@@ -6325,19 +6295,16 @@ f1(2)
 0
 Warnings:
 Warning	1329	No data - zero rows fetched, selected, or processed
-Warning	1329	No data - zero rows fetched, selected, or processed
 PREPARE s1 FROM 'SELECT f1(2)';
 EXECUTE s1;
 f1(2)
 0
 Warnings:
 Warning	1329	No data - zero rows fetched, selected, or processed
-Warning	1329	No data - zero rows fetched, selected, or processed
 EXECUTE s1;
 f1(2)
 0
 Warnings:
-Warning	1329	No data - zero rows fetched, selected, or processed
 Warning	1329	No data - zero rows fetched, selected, or processed
 DROP PROCEDURE p1;
 DROP PROCEDURE p2;
diff -Nrup a/mysql-test/r/strict.result b/mysql-test/r/strict.result
--- a/mysql-test/r/strict.result	2007-08-31 10:02:49 -07:00
+++ b/mysql-test/r/strict.result	2007-10-05 09:01:27 -07:00
@@ -316,7 +316,6 @@ NULL
 NULL
 Warnings:
 Error	1365	Division by 0
-Error	1365	Division by 0
 INSERT INTO t1 (col1) VALUES(-129);
 ERROR 22003: Out of range value for column 'col1' at row 1
 INSERT INTO t1 (col1) VALUES(128);
@@ -354,7 +353,6 @@ set @@sql_mode='ERROR_FOR_DIVISION_BY_ZE
 INSERT INTO t1 values (1/0,1/0);
 Warnings:
 Error	1365	Division by 0
-Error	1365	Division by 0
 set @@sql_mode='ansi,traditional';
 SELECT MOD(col1,0) FROM t1 WHERE col1 > 0 LIMIT 2;
 MOD(col1,0)
@@ -362,7 +360,6 @@ NULL
 NULL
 Warnings:
 Error	1365	Division by 0
-Error	1365	Division by 0
 INSERT INTO t1 (col1) VALUES ('');
 ERROR HY000: Incorrect integer value: '' for column 'col1' at row 1
 INSERT INTO t1 (col1) VALUES ('a59b');
@@ -375,7 +372,6 @@ Warning	1265	Data truncated for column '
 INSERT IGNORE INTO t1 values (1/0,1/0);
 Warnings:
 Error	1365	Division by 0
-Error	1365	Division by 0
 set @@sql_mode='ansi';
 INSERT INTO t1 values (1/0,1/0);
 set @@sql_mode='ansi,traditional';
@@ -458,7 +454,6 @@ Warning	1265	Data truncated for column '
 INSERT IGNORE INTO t1 values (1/0,1/0);
 Warnings:
 Error	1365	Division by 0
-Error	1365	Division by 0
 INSERT IGNORE INTO t1 VALUES(-32769,-1),(32768,65536);
 Warnings:
 Warning	1264	Out of range value for column 'col1' at row 1
@@ -542,7 +537,6 @@ Warning	1265	Data truncated for column '
 INSERT IGNORE INTO t1 values (1/0,1/0);
 Warnings:
 Error	1365	Division by 0
-Error	1365	Division by 0
 INSERT IGNORE INTO t1 VALUES(-8388609,-1),(8388608,16777216);
 Warnings:
 Warning	1264	Out of range value for column 'col1' at row 1
@@ -626,7 +620,6 @@ Warning	1265	Data truncated for column '
 INSERT IGNORE INTO t1 values (1/0,1/0);
 Warnings:
 Error	1365	Division by 0
-Error	1365	Division by 0
 INSERT IGNORE INTO t1 values (-2147483649, -1),(2147643648,4294967296);
 Warnings:
 Warning	1264	Out of range value for column 'col1' at row 1
@@ -708,7 +701,6 @@ Warning	1265	Data truncated for column '
 INSERT IGNORE INTO t1 values (1/0,1/0);
 Warnings:
 Error	1365	Division by 0
-Error	1365	Division by 0
 INSERT IGNORE INTO t1 VALUES(-9223372036854775809,-1),(9223372036854775808,18446744073709551616);
 Warnings:
 Warning	1264	Out of range value for column 'col1' at row 1
@@ -918,7 +910,6 @@ INSERT IGNORE INTO t1 VALUES ('+2.0E+309
 Warnings:
 Warning	1264	Out of range value for column 'col1' at row 1
 Warning	1264	Out of range value for column 'col2' at row 1
-Warning	1264	Out of range value for column 'col2' at row 1
 SELECT * FROM t1;
 col1	col2
 -2.2e-307	0
@@ -1105,8 +1096,6 @@ select count(*) from t1 where STR_TO_DAT
 count(*)
 7
 Warnings:
-Error	1411	Incorrect datetime value: '2004.12.12 10:22:61' for function str_to_date
-Error	1411	Incorrect datetime value: '2004.12.12 10:22:61' for function str_to_date
 Error	1411	Incorrect datetime value: '2004.12.12 10:22:61' for function str_to_date
 drop table t1;
 create table t1 (col1 char(3), col2 integer);
diff -Nrup a/mysql-test/r/subselect.result b/mysql-test/r/subselect.result
--- a/mysql-test/r/subselect.result	2007-08-26 00:55:00 -07:00
+++ b/mysql-test/r/subselect.result	2007-10-05 09:01:27 -07:00
@@ -49,7 +49,6 @@ id	select_type	table	type	possible_keys	
 2	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
 Warnings:
 Note	1276	Field or reference 'b.a' of SELECT #3 was resolved in SELECT #1
-Note	1276	Field or reference 'b.a' of SELECT #3 was resolved in SELECT #1
 Note	1003	select 1 AS `1` from (select 1 AS `a`) `b` having ((select '1' AS `a`) = 1)
 SELECT 1 FROM (SELECT 1 as a) as b HAVING (SELECT a)=1;
 1
diff -Nrup a/mysql-test/r/subselect_no_opts.result b/mysql-test/r/subselect_no_opts.result
--- a/mysql-test/r/subselect_no_opts.result	2007-08-26 00:55:00 -07:00
+++ b/mysql-test/r/subselect_no_opts.result	2007-10-05 09:01:27 -07:00
@@ -53,7 +53,6 @@ id	select_type	table	type	possible_keys	
 2	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
 Warnings:
 Note	1276	Field or reference 'b.a' of SELECT #3 was resolved in SELECT #1
-Note	1276	Field or reference 'b.a' of SELECT #3 was resolved in SELECT #1
 Note	1003	select 1 AS `1` from (select 1 AS `a`) `b` having ((select '1' AS `a`) = 1)
 SELECT 1 FROM (SELECT 1 as a) as b HAVING (SELECT a)=1;
 1
diff -Nrup a/mysql-test/r/subselect_no_semijoin.result b/mysql-test/r/subselect_no_semijoin.result
--- a/mysql-test/r/subselect_no_semijoin.result	2007-08-26 00:55:01 -07:00
+++ b/mysql-test/r/subselect_no_semijoin.result	2007-10-05 09:01:27 -07:00
@@ -53,7 +53,6 @@ id	select_type	table	type	possible_keys	
 2	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
 Warnings:
 Note	1276	Field or reference 'b.a' of SELECT #3 was resolved in SELECT #1
-Note	1276	Field or reference 'b.a' of SELECT #3 was resolved in SELECT #1
 Note	1003	select 1 AS `1` from (select 1 AS `a`) `b` having ((select '1' AS `a`) = 1)
 SELECT 1 FROM (SELECT 1 as a) as b HAVING (SELECT a)=1;
 1
diff -Nrup a/mysql-test/r/trigger.result b/mysql-test/r/trigger.result
--- a/mysql-test/r/trigger.result	2007-07-19 08:40:42 -07:00
+++ b/mysql-test/r/trigger.result	2007-10-05 09:01:27 -07:00
@@ -1088,7 +1088,6 @@ SET @x=4;
 UPDATE t1 SET i1 = @x;
 Warnings:
 Error	1365	Division by 0
-Error	1365	Division by 0
 SELECT @x;
 @x
 NULL
diff -Nrup a/mysql-test/r/type_date.result b/mysql-test/r/type_date.result
--- a/mysql-test/r/type_date.result	2007-05-24 08:33:54 -07:00
+++ b/mysql-test/r/type_date.result	2007-10-05 09:01:27 -07:00
@@ -130,9 +130,6 @@ year(@d)	month(@d)	day(@d)	cast(@d as da
 NULL	NULL	NULL	NULL
 Warnings:
 Warning	1292	Incorrect datetime value: '1311'
-Warning	1292	Incorrect datetime value: '1311'
-Warning	1292	Incorrect datetime value: '1311'
-Warning	1292	Incorrect datetime value: '1311'
 create table t1 (d  date , dt datetime , ts timestamp);
 insert into t1 values (9912101,9912101,9912101);
 Warnings:
diff -Nrup a/mysql-test/r/type_decimal.result b/mysql-test/r/type_decimal.result
--- a/mysql-test/r/type_decimal.result	2007-06-14 04:35:16 -07:00
+++ b/mysql-test/r/type_decimal.result	2007-10-05 09:01:27 -07:00
@@ -787,8 +787,6 @@ group_concat(t)
 t
 Warnings:
 Warning	1292	Incorrect datetime value: '0000-00-00'
-Warning	1292	Incorrect datetime value: '0000-00-00'
-Warning	1292	Incorrect datetime value: '0000-00-00'
 drop table t1;
 CREATE TABLE t1 (
 qty decimal(16,6) default NULL, 
diff -Nrup a/mysql-test/r/type_newdecimal.result b/mysql-test/r/type_newdecimal.result
--- a/mysql-test/r/type_newdecimal.result	2007-07-07 20:02:55 -07:00
+++ b/mysql-test/r/type_newdecimal.result	2007-10-05 09:01:27 -07:00
@@ -160,11 +160,9 @@ create table t1 (a tinyint);
 insert into t1 values (18446744073709551615.0);
 Warnings:
 Warning	1264	Out of range value for column 'a' at row 1
-Warning	1264	Out of range value for column 'a' at row 1
 insert into t1 values (9223372036854775808.0);
 Warnings:
 Warning	1264	Out of range value for column 'a' at row 1
-Warning	1264	Out of range value for column 'a' at row 1
 select * from t1;
 a
 127
@@ -206,8 +204,6 @@ NULL
 NULL
 Warnings:
 Error	1365	Division by 0
-Error	1365	Division by 0
-Error	1365	Division by 0
 select col2/0 from wl1612;
 col2/0
 NULL
@@ -215,8 +211,6 @@ NULL
 NULL
 Warnings:
 Error	1365	Division by 0
-Error	1365	Division by 0
-Error	1365	Division by 0
 select col3/0 from wl1612;
 col3/0
 NULL
@@ -224,8 +218,6 @@ NULL
 NULL
 Warnings:
 Error	1365	Division by 0
-Error	1365	Division by 0
-Error	1365	Division by 0
 insert into wl1612 values(5,5000.0005,5000.0005);
 insert into wl1612 values(6,5000.0005,5000.0005);
 select sum(col2),sum(col3) from wl1612;
@@ -820,10 +812,6 @@ NULL
 NULL
 Warnings:
 Error	1365	Division by 0
-Error	1365	Division by 0
-Error	1365	Division by 0
-Error	1365	Division by 0
-Error	1365	Division by 0
 INSERT INTO Sow6_2f VALUES ('a59b');
 ERROR HY000: Incorrect decimal value: 'a59b' for column 'col1' at row 1
 drop table Sow6_2f;
@@ -1387,8 +1375,6 @@ insert into t1 values(
 99999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999);
 Warnings:
 Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1292	Truncated incorrect DECIMAL value: ''
-Error	1292	Truncated incorrect DECIMAL value: ''
 Warning	1264	Out of range value for column 'c1' at row 1
 insert into t1 values(1e100);
 Warnings:
@@ -1461,8 +1447,6 @@ cast(a as DECIMAL(3,2))
 9.99
 Warnings:
 Error	1264	Out of range value for column 'cast(a as DECIMAL(3,2))' at row 1
-Error	1264	Out of range value for column 'cast(a as DECIMAL(3,2))' at row 1
-Error	1264	Out of range value for column 'cast(a as DECIMAL(3,2))' at row 1
 select cast(a as DECIMAL(3,2)), count(*)
 from (select 11.1233 as a
 UNION select 11.1234
@@ -1471,9 +1455,6 @@ UNION select 12.1234
 cast(a as DECIMAL(3,2))	count(*)
 9.99	3
 Warnings:
-Error	1264	Out of range value for column 'cast(a as DECIMAL(3,2))' at row 1
-Error	1264	Out of range value for column 'cast(a as DECIMAL(3,2))' at row 1
-Error	1264	Out of range value for column 'cast(a as DECIMAL(3,2))' at row 1
 Error	1264	Out of range value for column 'cast(a as DECIMAL(3,2))' at row 1
 create table t1 (s varchar(100));
 insert into t1 values (0.00000000010000000000000000364321973154977415791655470655996396089904010295867919921875);
diff -Nrup a/mysql-test/r/view.result b/mysql-test/r/view.result
--- a/mysql-test/r/view.result	2007-08-25 22:51:28 -07:00
+++ b/mysql-test/r/view.result	2007-10-05 09:01:27 -07:00
@@ -1112,7 +1112,6 @@ ERROR HY000: CHECK OPTION failed 'test.v
 insert ignore into v1 values (2),(3),(0);
 Warnings:
 Error	1369	CHECK OPTION failed 'test.v1'
-Error	1369	CHECK OPTION failed 'test.v1'
 select * from t1;
 a
 1
@@ -1126,7 +1125,6 @@ insert into t2 values (2),(3),(0);
 insert ignore into v1 SELECT a from t2;
 Warnings:
 Error	1369	CHECK OPTION failed 'test.v1'
-Error	1369	CHECK OPTION failed 'test.v1'
 select * from t1 order by a desc;
 a
 1
@@ -1330,7 +1328,6 @@ Warnings:
 Warning	1366	Incorrect integer value: 'error      ' for column 'a' at row 3
 Error	1369	CHECK OPTION failed 'test.v1'
 Warning	1366	Incorrect integer value: 'wrong end  ' for column 'a' at row 4
-Error	1369	CHECK OPTION failed 'test.v1'
 select * from t1 order by a,b;
 a	b
 1	row 1
diff -Nrup a/mysql-test/r/xml.result b/mysql-test/r/xml.result
--- a/mysql-test/r/xml.result	2007-09-14 06:38:25 -07:00
+++ b/mysql-test/r/xml.result	2007-10-05 09:01:27 -07:00
@@ -949,19 +949,16 @@ ExtractValue('<a><b>b1</b><b>b2</b></a>'
 b1
 Warnings:
 Warning	1292	Truncated incorrect INTEGER value: '1 and string"]'
-Warning	1292	Truncated incorrect INTEGER value: '1 and string"]'
 SELECT ExtractValue('<a><b>b1</b><b>b2</b></a>','/a/b["string and 1"]');
 ExtractValue('<a><b>b1</b><b>b2</b></a>','/a/b["string and 1"]')
 
 Warnings:
 Warning	1292	Truncated incorrect INTEGER value: 'string and 1"]'
-Warning	1292	Truncated incorrect INTEGER value: 'string and 1"]'
 SELECT ExtractValue('<a><b>b1</b><b>b2</b></a>','/a/b["string"]');
 ExtractValue('<a><b>b1</b><b>b2</b></a>','/a/b["string"]')
 
 Warnings:
 Warning	1292	Truncated incorrect INTEGER value: 'string"]'
-Warning	1292	Truncated incorrect INTEGER value: 'string"]'
 String-to-number conversion from a user variable
 SET @i='1';
 SELECT ExtractValue('<a><b>b1</b><b>b2</b></a>','/a/b[$@i]');
@@ -992,18 +989,15 @@ ExtractValue(xml,'/a/b[$i]')
 b1
 Warnings:
 Warning	1292	Truncated incorrect INTEGER value: '1 and string    '
-Warning	1292	Truncated incorrect INTEGER value: '1 and string    '
 CALL spxml('<a><b>b1</b><b>b2</b></a>', 'string and 1');
 ExtractValue(xml,'/a/b[$i]')
 
 Warnings:
 Warning	1292	Truncated incorrect INTEGER value: 'string and 1    '
-Warning	1292	Truncated incorrect INTEGER value: 'string and 1    '
 CALL spxml('<a><b>b1</b><b>b2</b></a>', 'string');
 ExtractValue(xml,'/a/b[$i]')
 
 Warnings:
-Warning	1292	Truncated incorrect INTEGER value: 'string          '
 Warning	1292	Truncated incorrect INTEGER value: 'string          '
 DROP PROCEDURE spxml;
 select UpdateXML('<a>a</a>',repeat('a b ',1000),'');
diff -Nrup a/mysql-test/suite/ndb/r/ndb_alter_table_online.result b/mysql-test/suite/ndb/r/ndb_alter_table_online.result
--- a/mysql-test/suite/ndb/r/ndb_alter_table_online.result	2007-09-19 05:23:56 -07:00
+++ b/mysql-test/suite/ndb/r/ndb_alter_table_online.result	2007-10-05 09:01:27 -07:00
@@ -70,8 +70,6 @@ update t1 set b = 0 where a = 6;
 ALTER TABLE t1 ADD c CHAR(19), ADD d VARCHAR(255), ADD e char(255);
 Warnings:
 Warning	1477	Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
-Warning	1477	Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
-Warning	1477	Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
 update t1 set b = 0 where a = 2;
 update t1 set b = 0 where a = 4;
 update t1 set b = 0 where a = 5;
@@ -102,8 +100,6 @@ insert into t1 values (6,6);
 update t1 set b = 0 where a = 6;
 ALTER TABLE t1 ADD c CHAR(19), ADD d VARCHAR(255), ADD e char(255);
 Warnings:
-Warning	1477	Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
-Warning	1477	Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
 Warning	1477	Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
 update t1 set b = 0 where a = 2;
 update t1 set b = 0 where a = 4;
diff -Nrup a/mysql-test/suite/ndb/r/ndb_dd_alter.result b/mysql-test/suite/ndb/r/ndb_dd_alter.result
--- a/mysql-test/suite/ndb/r/ndb_dd_alter.result	2007-09-19 05:23:56 -07:00
+++ b/mysql-test/suite/ndb/r/ndb_dd_alter.result	2007-10-05 09:01:28 -07:00
@@ -318,7 +318,6 @@ NULL	test	t1	p0	NULL	1	NULL	KEY	NULL		NU
 ALTER TABLE test.t1 ADD a2 FLOAT, ADD a3 DOUBLE;
 Warnings:
 Warning	1477	Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
-Warning	1477	Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
 SELECT * FROM information_schema.partitions WHERE table_name= 't1' AND partition_name = 'p0';
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PARTITION_NAME	SUBPARTITION_NAME	PARTITION_ORDINAL_POSITION	SUBPARTITION_ORDINAL_POSITION	PARTITION_METHOD	SUBPARTITION_METHOD	PARTITION_EXPRESSION	SUBPARTITION_EXPRESSION	PARTITION_DESCRIPTION	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	CREATE_TIME	UPDATE_TIME	CHECK_TIME	CHECKSUM	PARTITION_COMMENT	NODEGROUP	TABLESPACE_NAME
 NULL	test	t1	p0	NULL	1	NULL	KEY	NULL		NULL	NULL	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL		default	ts
@@ -346,10 +345,6 @@ a1	a2	a3
 20	21.2345	20000020
 ALTER TABLE test.t1  ADD a4 BIT, ADD a5 TINYINT, ADD a6 BIGINT, ADD a7 DATE, ADD a8 TIME;
 Warnings:
-Warning	1477	Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
-Warning	1477	Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
-Warning	1477	Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
-Warning	1477	Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
 Warning	1477	Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
 SELECT a1,a2,a3,hex(a4), a5,a6,a7,a8 FROM test.t1 ORDER BY a1;
 a1	a2	a3	hex(a4)	a5	a6	a7	a8
diff -Nrup a/mysql-test/t/create.test b/mysql-test/t/create.test
--- a/mysql-test/t/create.test	2007-07-25 17:23:29 -07:00
+++ b/mysql-test/t/create.test	2007-10-05 09:01:28 -07:00
@@ -1300,4 +1300,12 @@ return 0;
 drop view имя_вью_кодировке_утф8_длиной_больше_чем_42;
 drop table имя_таблицы_в_кодировке_утф8_длиной_больше_чем_48;
 set names default;
+
+#
+# Bug#31149 "Specified key was too long" is printed three times
+#
+CREATE TABLE t1 (a VARCHAR(30000)) ENGINE=MyISAM;
+CREATE INDEX i1 ON t1 (a);
+DROP TABLE t1;
+
 --echo End of 5.1 tests
diff -Nrup a/sql/sql_error.cc b/sql/sql_error.cc
--- a/sql/sql_error.cc	2007-07-26 17:26:40 -07:00
+++ b/sql/sql_error.cc	2007-10-05 09:01:28 -07:00
@@ -147,8 +147,25 @@ MYSQL_ERROR *push_warning(THD *thd, MYSQ
   }
   query_cache_abort(&thd->net);
 
+  /* Check if this warning is a duplicate and suppress if redundant */
+  if (thd->warn_list.elements)
+  {
+    List_iterator_fast<MYSQL_ERROR> it(thd->warn_list);
+    while ((err= it++))
+    {
+      if (err->code != code ||
+          strcmp(err->msg, msg))
+        continue;
 
-  if (thd->warn_list.elements < thd->variables.max_error_count)
+      /* This is a duplicate */
+      if (level > err->level)
+        err->level= level;
+      err->warn_count++;
+      break;
+    }
+  }
+
+  if (!err && thd->warn_list.elements < thd->variables.max_error_count)
   {
     /* We have to use warn_root, as mem_root is freed after each query */
     if ((err= new (&thd->warn_root) MYSQL_ERROR(thd, code, level, msg)))
diff -Nrup a/sql/sql_error.h b/sql/sql_error.h
--- a/sql/sql_error.h	2007-06-07 01:39:32 -07:00
+++ b/sql/sql_error.h	2007-10-05 09:01:28 -07:00
@@ -22,10 +22,11 @@ public:
   uint code;
   enum_warning_level level;
   char *msg;
+  uint warn_count;
   
   MYSQL_ERROR(THD *thd, uint code_arg, enum_warning_level level_arg,
 	      const char *msg_arg)
-    :code(code_arg), level(level_arg)
+    :code(code_arg), level(level_arg), warn_count(1)
   {
     if (msg_arg)
       set_msg(thd, msg_arg);
Thread
bk commit into 5.2 tree (acurtis:1.2595) BUG#31149antony5 Oct
  • Re: bk commit into 5.2 tree (acurtis:1.2595) BUG#31149Sergei Golubchik6 Oct