Pantek Library
Hosting Provided By
CybrHost
High Speed Hosting
Mailing Lists: lists.mysql.com > commits > 07 > 060710.html (Request Expert lists.mysql.com Support)

bk commit into 5.2 tree (istruewing:1.2520)

From: <ingo(at)mysql.com>
Date: Sat Jun 30 2007 - 17:25:24 EDT


Below is the list of changes that have just been committed into a local 5.2 repository of istruewing. When istruewing 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.2520, 2007-06-30 23:25:11+02:00, istruewing@synthia.local +13 -0   Post-merge fixes

  mysql-test/r/comment_column.result@1.2, 2007-06-30 23:25:04+02:00, istruewing@synthia.local +2 -2     Post-merge fixes
    Changed error numbers

  mysql-test/r/comment_index.result@1.2, 2007-06-30 23:25:04+02:00, istruewing@synthia.local +4 -4     Post-merge fixes
    Changed error numbers

  mysql-test/r/comment_table.result@1.2, 2007-06-30 23:25:04+02:00, istruewing@synthia.local +1 -1     Post-merge fixes
    Changed error numbers

  mysql-test/r/locktrans_innodb.result@1.6, 2007-06-30 23:25:04+02:00, istruewing@synthia.local +12 -12     Post-merge fixes
    Changed error numbers

  mysql-test/r/locktrans_myisam.result@1.5, 2007-06-30 23:25:04+02:00, istruewing@synthia.local +19 -19     Post-merge fixes
    Changed error numbers

  mysql-test/r/rpl_000015.result@1.49, 2007-06-30 23:25:05+02:00, istruewing@synthia.local +2 -2     Post-merge fixes

Do you need help?X

  mysql-test/r/rpl_locktrans_innodb.result@1.5, 2007-06-30 23:25:05+02:00, istruewing@synthia.local +16 -12     Post-merge fixes
    Changed error numbers

  mysql-test/r/rpl_locktrans_myisam.result@1.5, 2007-06-30 23:25:05+02:00, istruewing@synthia.local +23 -19     Post-merge fixes
    Changed error numbers

  mysql-test/r/rpl_stm_reset_slave.result@1.22, 2007-06-30 23:25:05+02:00, istruewing@synthia.local +2 -1     Post-merge fixes

  mysql-test/t/comment_column.test@1.2, 2007-06-30 23:25:05+02:00, istruewing@synthia.local +2 -2     Post-merge fixes
    Changed error numbers

  mysql-test/t/comment_index.test@1.2, 2007-06-30 23:25:05+02:00, istruewing@synthia.local +2 -2     Post-merge fixes
    Changed error number

  mysql-test/t/comment_table.test@1.2, 2007-06-30 23:25:05+02:00, istruewing@synthia.local +1 -1     Post-merge fixes
    Changed error number

  mysys/charset.c@1.154, 2007-06-30 23:25:05+02:00, istruewing@synthia.local +2 -2     Post-merge fixes
    Changed variable name

diff -Nrup a/mysql-test/r/comment_column.result b/mysql-test/r/comment_column.result 

--- a/mysql-test/r/comment_column.result	2007-06-18 13:19:26 +02:00

+++ b/mysql-test/r/comment_column.result	2007-06-30 23:25:04 +02:00

@@ -238,7 +238,7 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COMMENT='ABCDEFGHIJabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghij!  abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd'  ALTER TABLE t1 ADD COLUMN c11 INTEGER COMMENT 'ABCDEfghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghija!  bcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdABCDEfghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcde!  fghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcde fghijabcdefghijabcdefghijabcdefghijabcdefghijabcdABCDEfghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghij!  abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd';  Warnings: 
-Warning	1573	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
@@ -349,7 +349,7 @@ drop table t1;
 create table t1 (c1 VARCHAR(10) NOT NULL COMMENT 'Abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefgh!  ijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd', c2 INTEGER COMMENT 'aBcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghi!  jabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghi jabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdaBcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd!  efghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd',c3 INTEGER COMMENT '012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789', c4 INTEGER, c5 INTEGER, c6 INTEGER, c7 INTEGER, INDEX i1 (c1) COMMENT 'i1 comment',INDEX i2(c2)  ) COMMENT='ABCDEFGHIJabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefg!  hijabcdefghijabcdefghijabcdefghijabcdefghijabcd';  Warnings: 
-Warning	1573	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)

Can we help you?X

 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-06-18 13:19:26 +02:00

+++ b/mysql-test/r/comment_index.result	2007-06-30 23:25:04 +02:00

@@ -267,8 +267,8 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COMMENT='ABCDEFGHIJabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghij!  abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd'  CREATE INDEX i11 ON t1(c11) COMMENT 'abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghija!  bcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcde!  fghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcde fghijabcdefghijabcdefghijabcdefghijabcd';  Warnings: 
-Warning	1573	String 'abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghij' is too long for INDEX COMMENT (should be no longer than 1024)
-Warning	1573	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!

Can't find what you're looking for?X

 ijabcdefghijabcdefghijabcdefghijabcd	1024
@@ -320,8 +320,8 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COMMENT='ABCDEFGHIJabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghij!  abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd'  ALTER TABLE t1 ADD INDEX (c13) COMMENT 'abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefgh!  ijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijab!  cdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijab cdefghijabcdefghijabcdefghijabcdefghijabcd';  Warnings: 
-Warning	1573	String 'abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghij' is too long for INDEX COMMENT (should be no longer than 1024)
-Warning	1573	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!

Don't know where to look next?X

 ijabcdefghijabcdefghijabcdefghijabcd	1024
diff -Nrup a/mysql-test/r/comment_table.result b/mysql-test/r/comment_table.result
--- a/mysql-test/r/comment_table.result	2007-06-18 13:19:26 +02:00

+++ b/mysql-test/r/comment_table.result	2007-06-30 23:25:04 +02:00
@@ -103,7 +103,7 @@ SET SQL_MODE='';
 create table t1 (c1 VARCHAR(10) NOT NULL COMMENT 'c1 comment', c2 INTEGER,c3 INTEGER COMMENT '012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789', c4 INTEGER, c5 INTEGER, c6 INTEGER, c7 INTEGER, INDEX i1 (c1) COMMENT 'i1 comment',INDEX i2(c2)  ) COMMENT='abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefg!  hijabcdefghijabcdefghijabcdefghijabcdefghijabcdabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghija!  bcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghija bcdefghijabcde';
 Warnings: 
-Warning	1573	String 'abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghij' is too long for TABLE COMMENT (should be no longer than 2048)

+Warning	1470	String 'abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghij' is too long for TABLE COMMENT (should be no longer than 2048)

 SELECT table_comment,char_length(table_comment) FROM information_schema.tables WHERE table_name='t1';
 table_comment	char_length(table_comment)
 abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefgh!  ijabcdefghijabcdefghijabcdefghijabcdabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijab!  cdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijab cd 2048
diff -Nrup a/mysql-test/r/locktrans_innodb.result b/mysql-test/r/locktrans_innodb.result 
--- a/mysql-test/r/locktrans_innodb.result	2007-06-20 23:35:55 +02:00

+++ b/mysql-test/r/locktrans_innodb.result	2007-06-30 23:25:04 +02:00
@@ -93,12 +93,12 @@ ERROR 42000: You have an error in your S  # Implicit lock method conversion due to mix in statement.  LOCK TABLE t1 READ, t2 IN EXCLUSIVE MODE;  Warnings: 
-Warning	1589	Converted to non-transactional lock on 't2'

+Warning	1596	Converted to non-transactional lock on 't2'
 UNLOCK TABLES;
 # Lock t1 share (converted to read), t2 write.  LOCK TABLE t1 IN SHARE MODE, t2 WRITE;
 Warnings: 
-Warning	1589	Converted to non-transactional lock on 't1'

+Warning	1596	Converted to non-transactional lock on 't1'
 # Show t1 is read locked, t2 write locked.  INSERT INTO t1 SELECT * FROM t2;
 ERROR HY000: Table 't1' was locked with a READ lock and can't be updated @@ -109,8 +109,8 @@ INSERT INTO t2 SELECT * FROM t1;  # Lock t1 exclusive (converted to write), t2 share (converted to read).  LOCK TABLE t1 IN EXCLUSIVE MODE, t2 IN SHARE MODE;  Warnings: 
-Warning	1589	Converted to non-transactional lock on 't1'
-Warning	1589	Converted to non-transactional lock on 't2'

+Warning	1596	Converted to non-transactional lock on 't1'
+Warning	1596	Converted to non-transactional lock on 't2'

 # Show t1 is write locked, t2 read locked.
 INSERT INTO t1 SELECT * FROM t2;

 INSERT INTO t2 SELECT * FROM t1;
@@ -134,8 +134,8 @@ ERROR HY000: Cannot convert to non-trans  ## Error is reported on first table only. Show both errors:  SHOW WARNINGS; 
 Level	Code	Message
-Error	1590	Cannot convert to non-transactional lock in strict mode on 't1'
-Error	1590	Cannot convert to non-transactional lock in strict mode on 't2'

Confused? Frustrated?X


+Error	1597	Cannot convert to non-transactional lock in strict mode on 't1'
+Error	1597	Cannot convert to non-transactional lock in strict mode on 't2'
 UNLOCK TABLES;
 SET @@SQL_MODE= @wl3561_save_sql_mode;
 #
@@ -155,7 +155,7 @@ CREATE TABLE t4 (c4 INT) ENGINE= MyISAM;  # Request a transactional lock, which is converted to non-transactional.  LOCK TABLE t4 IN SHARE MODE;
 Warnings: 
-Warning	1589	Converted to non-transactional lock on 't4'

+Warning	1596	Converted to non-transactional lock on 't4'
 # Try a conflict with the existing non-transactional lock.  INSERT INTO t4 VALUES(444);
 ERROR HY000: Table 't4' was locked with a READ lock and can't be updated @@ -172,8 +172,8 @@ CREATE VIEW v1 AS SELECT * FROM t3, t4 W  # Request a share lock on the view, which is converted to read locks.  LOCK TABLE v1 IN SHARE MODE;
 Warnings: 
-Warning	1589	Converted to non-transactional lock on 't3'
-Warning	1589	Converted to non-transactional lock on 't4'

+Warning	1596	Converted to non-transactional lock on 't3'
+Warning	1596	Converted to non-transactional lock on 't4'

 # Show that read locks on the base tables prohibit writing ...
 INSERT INTO t3 SELECT * FROM t4;

 ERROR HY000: Table 't3' was locked with a READ lock and can't be updated @@ -189,7 +189,7 @@ COUNT(*)
 ## Report conversion on view due to existing non-transactional locks.  LOCK TABLE v1 IN EXCLUSIVE MODE;
 Warnings: 
-Warning	1589	Converted to non-transactional lock on 'v1'

+Warning	1596	Converted to non-transactional lock on 'v1'

 INSERT INTO t3 VALUES(333);

 INSERT INTO t4 VALUES(444);
 INSERT INTO t1 VALUES(111);
@@ -198,8 +198,8 @@ UNLOCK TABLES;
 ## Now report conversion on base table again.  LOCK TABLE v1 IN EXCLUSIVE MODE;
 Warnings: 
-Warning	1589	Converted to non-transactional lock on 't3'
-Warning	1589	Converted to non-transactional lock on 't4'

+Warning	1596	Converted to non-transactional lock on 't3'
+Warning	1596	Converted to non-transactional lock on 't4'

 INSERT INTO t3 VALUES(333);
 INSERT INTO t4 VALUES(444);

 INSERT INTO t1 VALUES(111);
diff -Nrup a/mysql-test/r/locktrans_myisam.result b/mysql-test/r/locktrans_myisam.result 
--- a/mysql-test/r/locktrans_myisam.result	2007-06-20 23:35:55 +02:00

+++ b/mysql-test/r/locktrans_myisam.result	2007-06-30 23:25:04 +02:00
@@ -21,8 +21,8 @@ UNLOCK TABLES;
 # Valid syntax for transactional locks.  LOCK TABLE t1 IN SHARE MODE, t2 IN EXCLUSIVE MODE;  Warnings: 
-Warning	1589	Converted to non-transactional lock on 't1'
-Warning	1589	Converted to non-transactional lock on 't2'

+Warning	1596	Converted to non-transactional lock on 't1'
+Warning	1596	Converted to non-transactional lock on 't2'

 UNLOCK TABLES;
 #

 # Valid syntax for aliases with and without 'AS'. @@ -30,19 +30,19 @@ LOCK TABLE t1 AS a1 READ, t2 a2 WRITE;  UNLOCK TABLES;
 LOCK TABLE t1 AS a1 IN SHARE MODE, t2 a2 IN EXCLUSIVE MODE;  Warnings: 
-Warning	1589	Converted to non-transactional lock on 'a1'
-Warning	1589	Converted to non-transactional lock on 'a2'

+Warning	1596	Converted to non-transactional lock on 'a1'
+Warning	1596	Converted to non-transactional lock on 'a2'

 UNLOCK TABLES;
 #

 # Transactional locks taken on a view.
 CREATE VIEW v1 AS SELECT * FROM t1, t2 WHERE t1.c1 = t2.c2;  LOCK TABLE v1 IN SHARE MODE;
 Warnings: 
-Warning	1589	Converted to non-transactional lock on 't1'
-Warning	1589	Converted to non-transactional lock on 't2'

+Warning	1596	Converted to non-transactional lock on 't1'
+Warning	1596	Converted to non-transactional lock on 't2'

 LOCK TABLE v1 IN EXCLUSIVE MODE;
 Warnings:
-Warning	1589	Converted to non-transactional lock on 'v1'

+Warning	1596	Converted to non-transactional lock on 'v1'
 DROP VIEW v1;
 #
 # Locking INFORMATION_SCHEMA fails on missing privileges. @@ -93,12 +93,12 @@ ERROR 42000: You have an error in your S  # Implicit lock method conversion due to mix in statement.  LOCK TABLE t1 READ, t2 IN EXCLUSIVE MODE;  Warnings: 
-Warning	1589	Converted to non-transactional lock on 't2'

+Warning	1596	Converted to non-transactional lock on 't2'
 UNLOCK TABLES;
 # Lock t1 share (converted to read), t2 write.  LOCK TABLE t1 IN SHARE MODE, t2 WRITE;
 Warnings: 
-Warning	1589	Converted to non-transactional lock on 't1'

+Warning	1596	Converted to non-transactional lock on 't1'
 # Show t1 is read locked, t2 write locked.  INSERT INTO t1 SELECT * FROM t2;
 ERROR HY000: Table 't1' was locked with a READ lock and can't be updated @@ -109,8 +109,8 @@ INSERT INTO t2 SELECT * FROM t1;  # Lock t1 exclusive (converted to write), t2 share (converted to read).  LOCK TABLE t1 IN EXCLUSIVE MODE, t2 IN SHARE MODE;  Warnings: 
-Warning	1589	Converted to non-transactional lock on 't1'
-Warning	1589	Converted to non-transactional lock on 't2'

+Warning	1596	Converted to non-transactional lock on 't1'
+Warning	1596	Converted to non-transactional lock on 't2'

 # Show t1 is write locked, t2 read locked.
 INSERT INTO t1 SELECT * FROM t2;

 INSERT INTO t2 SELECT * FROM t1;
@@ -134,8 +134,8 @@ ERROR HY000: Cannot convert to non-trans  ## Error is reported on first table only. Show both errors:  SHOW WARNINGS; 
 Level	Code	Message
-Error	1590	Cannot convert to non-transactional lock in strict mode on 't1'
-Error	1590	Cannot convert to non-transactional lock in strict mode on 't2'

+Error	1597	Cannot convert to non-transactional lock in strict mode on 't1'
+Error	1597	Cannot convert to non-transactional lock in strict mode on 't2'
 UNLOCK TABLES;
 SET @@SQL_MODE= @wl3561_save_sql_mode;
 #
@@ -155,7 +155,7 @@ CREATE TABLE t4 (c4 INT) ENGINE= MyISAM;  # Request a transactional lock, which is converted to non-transactional.  LOCK TABLE t4 IN SHARE MODE;
 Warnings: 
-Warning	1589	Converted to non-transactional lock on 't4'

+Warning	1596	Converted to non-transactional lock on 't4'
 # Try a conflict with the existing non-transactional lock.  INSERT INTO t4 VALUES(444);
 ERROR HY000: Table 't4' was locked with a READ lock and can't be updated @@ -172,8 +172,8 @@ CREATE VIEW v1 AS SELECT * FROM t3, t4 W  # Request a share lock on the view, which is converted to read locks.  LOCK TABLE v1 IN SHARE MODE;
 Warnings: 
-Warning	1589	Converted to non-transactional lock on 't3'
-Warning	1589	Converted to non-transactional lock on 't4'

Call Pantek today for Open Source Technical Support at 1-877-546-8934 - 24/7/365X


+Warning	1596	Converted to non-transactional lock on 't3'
+Warning	1596	Converted to non-transactional lock on 't4'

 # Show that read locks on the base tables prohibit writing ...
 INSERT INTO t3 SELECT * FROM t4;

 ERROR HY000: Table 't3' was locked with a READ lock and can't be updated @@ -189,7 +189,7 @@ COUNT(*)
 ## Report conversion on view due to existing non-transactional locks.  LOCK TABLE v1 IN EXCLUSIVE MODE;
 Warnings: 
-Warning	1589	Converted to non-transactional lock on 'v1'

+Warning	1596	Converted to non-transactional lock on 'v1'

 INSERT INTO t3 VALUES(333);

 INSERT INTO t4 VALUES(444);
 INSERT INTO t1 VALUES(111);
@@ -198,8 +198,8 @@ UNLOCK TABLES;
 ## Now report conversion on base table again.  LOCK TABLE v1 IN EXCLUSIVE MODE;
 Warnings: 
-Warning	1589	Converted to non-transactional lock on 't3'
-Warning	1589	Converted to non-transactional lock on 't4'

+Warning	1596	Converted to non-transactional lock on 't3'
+Warning	1596	Converted to non-transactional lock on 't4'

 INSERT INTO t3 VALUES(333);
 INSERT INTO t4 VALUES(444);

 INSERT INTO t1 VALUES(111);
diff -Nrup a/mysql-test/r/rpl_000015.result b/mysql-test/r/rpl_000015.result 
--- a/mysql-test/r/rpl_000015.result	2007-06-30 20:13:26 +02:00

+++ b/mysql-test/r/rpl_000015.result	2007-06-30 23:25:05 +02:00
@@ -8,9 +8,9 @@ change master to master_host='127.0.0.1'  SHOW SLAVE STATUS; 
 Slave_IO_State	#
 Master_Host	127.0.0.1
-Master_User	test

+Master_User	

 Master_Port	3306
-Connect_Retry	7

+Connect_Retry	60

 Master_Log_File	
 Read_Master_Log_Pos	4
 Relay_Log_File	#
diff -Nrup a/mysql-test/r/rpl_locktrans_innodb.result b/mysql-test/r/rpl_locktrans_innodb.result
--- a/mysql-test/r/rpl_locktrans_innodb.result	2007-06-20 23:35:55 +02:00

+++ b/mysql-test/r/rpl_locktrans_innodb.result	2007-06-30 23:25:05 +02:00
@@ -99,12 +99,12 @@ ERROR 42000: You have an error in your S  # Implicit lock method conversion due to mix in statement.  LOCK TABLE t1 READ, t2 IN EXCLUSIVE MODE;  Warnings: 
-Warning	1589	Converted to non-transactional lock on 't2'

+Warning	1596	Converted to non-transactional lock on 't2'
 UNLOCK TABLES;
 # Lock t1 share (converted to read), t2 write.  LOCK TABLE t1 IN SHARE MODE, t2 WRITE;
 Warnings: 
-Warning	1589	Converted to non-transactional lock on 't1'

+Warning	1596	Converted to non-transactional lock on 't1'
 # Show t1 is read locked, t2 write locked.  INSERT INTO t1 SELECT * FROM t2;
 ERROR HY000: Table 't1' was locked with a READ lock and can't be updated @@ -115,8 +115,8 @@ INSERT INTO t2 SELECT * FROM t1;  # Lock t1 exclusive (converted to write), t2 share (converted to read).  LOCK TABLE t1 IN EXCLUSIVE MODE, t2 IN SHARE MODE;  Warnings: 
-Warning	1589	Converted to non-transactional lock on 't1'
-Warning	1589	Converted to non-transactional lock on 't2'

+Warning	1596	Converted to non-transactional lock on 't1'
+Warning	1596	Converted to non-transactional lock on 't2'

 # Show t1 is write locked, t2 read locked.
 INSERT INTO t1 SELECT * FROM t2;

 INSERT INTO t2 SELECT * FROM t1;
@@ -140,8 +140,8 @@ ERROR HY000: Cannot convert to non-trans  ## Error is reported on first table only. Show both errors:  SHOW WARNINGS; 
 Level	Code	Message
-Error	1590	Cannot convert to non-transactional lock in strict mode on 't1'
-Error	1590	Cannot convert to non-transactional lock in strict mode on 't2'

+Error	1597	Cannot convert to non-transactional lock in strict mode on 't1'
+Error	1597	Cannot convert to non-transactional lock in strict mode on 't2'
 UNLOCK TABLES;
 SET @@SQL_MODE= @wl3561_save_sql_mode;
 #
@@ -161,7 +161,7 @@ CREATE TABLE t4 (c4 INT) ENGINE= MyISAM;  # Request a transactional lock, which is converted to non-transactional.  LOCK TABLE t4 IN SHARE MODE;
 Warnings: 
-Warning	1589	Converted to non-transactional lock on 't4'

+Warning	1596	Converted to non-transactional lock on 't4'
 # Try a conflict with the existing non-transactional lock.  INSERT INTO t4 VALUES(444);
 ERROR HY000: Table 't4' was locked with a READ lock and can't be updated @@ -178,8 +178,8 @@ CREATE VIEW v1 AS SELECT * FROM t3, t4 W  # Request a share lock on the view, which is converted to read locks.  LOCK TABLE v1 IN SHARE MODE;
 Warnings: 
-Warning	1589	Converted to non-transactional lock on 't3'
-Warning	1589	Converted to non-transactional lock on 't4'

+Warning	1596	Converted to non-transactional lock on 't3'
+Warning	1596	Converted to non-transactional lock on 't4'

 # Show that read locks on the base tables prohibit writing ...
 INSERT INTO t3 SELECT * FROM t4;

 ERROR HY000: Table 't3' was locked with a READ lock and can't be updated @@ -195,7 +195,7 @@ COUNT(*)
 ## Report conversion on view due to existing non-transactional locks.  LOCK TABLE v1 IN EXCLUSIVE MODE;
 Warnings: 
-Warning	1589	Converted to non-transactional lock on 'v1'

+Warning	1596	Converted to non-transactional lock on 'v1'

 INSERT INTO t3 VALUES(333);

 INSERT INTO t4 VALUES(444);
 INSERT INTO t1 VALUES(111);
@@ -204,8 +204,8 @@ UNLOCK TABLES;
 ## Now report conversion on base table again.  LOCK TABLE v1 IN EXCLUSIVE MODE;
 Warnings: 
-Warning	1589	Converted to non-transactional lock on 't3'
-Warning	1589	Converted to non-transactional lock on 't4'

+Warning	1596	Converted to non-transactional lock on 't3'
+Warning	1596	Converted to non-transactional lock on 't4'

 INSERT INTO t3 VALUES(333);

Do you need help?X

 INSERT INTO t4 VALUES(444);

 INSERT INTO t1 VALUES(111);
@@ -963,3 +963,7 @@ Master_SSL_Cipher
 Master_SSL_Key 
 Seconds_Behind_Master	#
 Master_SSL_Verify_Server_Cert	No

+Last_IO_Errno	0
+Last_IO_Error	
+Last_SQL_Errno	0
+Last_SQL_Error

diff -Nrup a/mysql-test/r/rpl_locktrans_myisam.result b/mysql-test/r/rpl_locktrans_myisam.result 
--- a/mysql-test/r/rpl_locktrans_myisam.result	2007-06-20 23:35:55 +02:00

+++ b/mysql-test/r/rpl_locktrans_myisam.result	2007-06-30 23:25:05 +02:00
@@ -27,8 +27,8 @@ UNLOCK TABLES;
 # Valid syntax for transactional locks.  LOCK TABLE t1 IN SHARE MODE, t2 IN EXCLUSIVE MODE;  Warnings: 
-Warning	1589	Converted to non-transactional lock on 't1'
-Warning	1589	Converted to non-transactional lock on 't2'

+Warning	1596	Converted to non-transactional lock on 't1'
+Warning	1596	Converted to non-transactional lock on 't2'

 UNLOCK TABLES;
 #

 # Valid syntax for aliases with and without 'AS'. @@ -36,19 +36,19 @@ LOCK TABLE t1 AS a1 READ, t2 a2 WRITE;  UNLOCK TABLES;
 LOCK TABLE t1 AS a1 IN SHARE MODE, t2 a2 IN EXCLUSIVE MODE;  Warnings: 
-Warning	1589	Converted to non-transactional lock on 'a1'
-Warning	1589	Converted to non-transactional lock on 'a2'

+Warning	1596	Converted to non-transactional lock on 'a1'
+Warning	1596	Converted to non-transactional lock on 'a2'

 UNLOCK TABLES;
 #

 # Transactional locks taken on a view.
 CREATE VIEW v1 AS SELECT * FROM t1, t2 WHERE t1.c1 = t2.c2;  LOCK TABLE v1 IN SHARE MODE;
 Warnings: 
-Warning	1589	Converted to non-transactional lock on 't1'
-Warning	1589	Converted to non-transactional lock on 't2'

+Warning	1596	Converted to non-transactional lock on 't1'
+Warning	1596	Converted to non-transactional lock on 't2'

 LOCK TABLE v1 IN EXCLUSIVE MODE;
 Warnings:
-Warning	1589	Converted to non-transactional lock on 'v1'

+Warning	1596	Converted to non-transactional lock on 'v1'
 DROP VIEW v1;
 #
 # Locking INFORMATION_SCHEMA fails on missing privileges. @@ -99,12 +99,12 @@ ERROR 42000: You have an error in your S  # Implicit lock method conversion due to mix in statement.  LOCK TABLE t1 READ, t2 IN EXCLUSIVE MODE;  Warnings: 
-Warning	1589	Converted to non-transactional lock on 't2'

+Warning	1596	Converted to non-transactional lock on 't2'
 UNLOCK TABLES;
 # Lock t1 share (converted to read), t2 write.  LOCK TABLE t1 IN SHARE MODE, t2 WRITE;
 Warnings: 
-Warning	1589	Converted to non-transactional lock on 't1'

+Warning	1596	Converted to non-transactional lock on 't1'
 # Show t1 is read locked, t2 write locked.  INSERT INTO t1 SELECT * FROM t2;
 ERROR HY000: Table 't1' was locked with a READ lock and can't be updated @@ -115,8 +115,8 @@ INSERT INTO t2 SELECT * FROM t1;  # Lock t1 exclusive (converted to write), t2 share (converted to read).  LOCK TABLE t1 IN EXCLUSIVE MODE, t2 IN SHARE MODE;  Warnings: 
-Warning	1589	Converted to non-transactional lock on 't1'
-Warning	1589	Converted to non-transactional lock on 't2'

+Warning	1596	Converted to non-transactional lock on 't1'
+Warning	1596	Converted to non-transactional lock on 't2'

 # Show t1 is write locked, t2 read locked.
 INSERT INTO t1 SELECT * FROM t2;

 INSERT INTO t2 SELECT * FROM t1;
@@ -140,8 +140,8 @@ ERROR HY000: Cannot convert to non-trans  ## Error is reported on first table only. Show both errors:  SHOW WARNINGS; 
 Level	Code	Message
-Error	1590	Cannot convert to non-transactional lock in strict mode on 't1'
-Error	1590	Cannot convert to non-transactional lock in strict mode on 't2'

+Error	1597	Cannot convert to non-transactional lock in strict mode on 't1'
+Error	1597	Cannot convert to non-transactional lock in strict mode on 't2'
 UNLOCK TABLES;
 SET @@SQL_MODE= @wl3561_save_sql_mode;
 #
@@ -161,7 +161,7 @@ CREATE TABLE t4 (c4 INT) ENGINE= MyISAM;  # Request a transactional lock, which is converted to non-transactional.  LOCK TABLE t4 IN SHARE MODE;
 Warnings: 
-Warning	1589	Converted to non-transactional lock on 't4'

+Warning	1596	Converted to non-transactional lock on 't4'
 # Try a conflict with the existing non-transactional lock.  INSERT INTO t4 VALUES(444);
 ERROR HY000: Table 't4' was locked with a READ lock and can't be updated @@ -178,8 +178,8 @@ CREATE VIEW v1 AS SELECT * FROM t3, t4 W  # Request a share lock on the view, which is converted to read locks.  LOCK TABLE v1 IN SHARE MODE;
 Warnings: 
-Warning	1589	Converted to non-transactional lock on 't3'
-Warning	1589	Converted to non-transactional lock on 't4'

+Warning	1596	Converted to non-transactional lock on 't3'
+Warning	1596	Converted to non-transactional lock on 't4'

 # Show that read locks on the base tables prohibit writing ...
 INSERT INTO t3 SELECT * FROM t4;

 ERROR HY000: Table 't3' was locked with a READ lock and can't be updated @@ -195,7 +195,7 @@ COUNT(*)
 ## Report conversion on view due to existing non-transactional locks.  LOCK TABLE v1 IN EXCLUSIVE MODE;
 Warnings: 
-Warning	1589	Converted to non-transactional lock on 'v1'

+Warning	1596	Converted to non-transactional lock on 'v1'

 INSERT INTO t3 VALUES(333);

 INSERT INTO t4 VALUES(444);
 INSERT INTO t1 VALUES(111);
@@ -204,8 +204,8 @@ UNLOCK TABLES;
 ## Now report conversion on base table again.  LOCK TABLE v1 IN EXCLUSIVE MODE;
 Warnings: 
-Warning	1589	Converted to non-transactional lock on 't3'
-Warning	1589	Converted to non-transactional lock on 't4'

+Warning	1596	Converted to non-transactional lock on 't3'
+Warning	1596	Converted to non-transactional lock on 't4'

 INSERT INTO t3 VALUES(333);
 INSERT INTO t4 VALUES(444);

 INSERT INTO t1 VALUES(111);
@@ -435,3 +435,7 @@ Master_SSL_Cipher
 Master_SSL_Key 
 Seconds_Behind_Master	#
 Master_SSL_Verify_Server_Cert	No

+Last_IO_Errno	0
+Last_IO_Error	
+Last_SQL_Errno	0
+Last_SQL_Error

diff -Nrup a/mysql-test/r/rpl_stm_reset_slave.result b/mysql-test/r/rpl_stm_reset_slave.result 
--- a/mysql-test/r/rpl_stm_reset_slave.result	2007-06-30 20:13:26 +02:00

Do you need more help?X


+++ b/mysql-test/r/rpl_stm_reset_slave.result	2007-06-30 23:25:05 +02:00
@@ -88,7 +88,7 @@ reset slave;
 SHOW SLAVE STATUS; 
 Slave_IO_State	#
 Master_Host	127.0.0.1
-Master_User	root

+Master_User	test

 Master_Port	MASTER_PORT
 Connect_Retry	1
 Master_Log_File	
@@ -124,6 +124,7 @@ Last_IO_Errno	#
 Last_IO_Error	#
 Last_SQL_Errno	0

 Last_SQL_Error
+change master to master_user='root';

 start slave;
 SHOW SLAVE STATUS;
 Slave_IO_State #
diff -Nrup a/mysql-test/t/comment_column.test b/mysql-test/t/comment_column.test 
--- a/mysql-test/t/comment_column.test	2007-06-18 13:19:26 +02:00

+++ b/mysql-test/t/comment_column.test	2007-06-30 23:25:05 +02:00
@@ -72,7 +72,7 @@ SHOW CREATE TABLE t1;  
Do you need more help?X

 # comment overflow(error)
 set sql_mode='TRADITIONAL';
---error 1573
+--error ER_WRONG_STRING_LENGTH

 ALTER TABLE t1 ADD COLUMN c12 INTEGER COMMENT 'ABCDEfghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghija!  bcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdABCDEfghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcde!  fghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcde fghijabcdefghijabcdefghijabcdefghijabcdefghijabcdABCDEfghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghij!  abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd';  SELECT table_comment,char_length(table_comment) FROM information_schema.tables WHERE table_name='t1';  SELECT column_comment,char_length(column_comment) FROM information_schema.columns WHERE table_name='t1'; @@ -105,7 +105,7 @@ SHOW CREATE TABLE t1;  # comment overflow(error)
 DROP TABLE t1;
 set sql_mode='TRADITIONAL';
---error 1573
+--error ER_WRONG_STRING_LENGTH

 create table t1 (c1 VARCHAR(10) NOT NULL COMMENT 'Abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefgh!  ijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd', c2 INTEGER COMMENT 'aBcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghi!  jabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghi jabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdaBcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd!  efghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd',c3 INTEGER COMMENT '012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789', c4 INTEGER, c5 INTEGER, c6 INTEGER, c7 INTEGER, INDEX i1 (c1) COMMENT 'i1 comment',INDEX i2(c2)  ) COMMENT='ABCDEFGHIJabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefg!  hijabcdefghijabcdefghijabcdefghijabcdefghijabcd';  SELECT table_comment,char_length(table_comment) FROM information_schema.tables WHERE table_name='t1'; diff -Nrup a/mysql-test/t/comment_index.test b/mysql-test/t/comment_index.test 

--- a/mysql-test/t/comment_index.test	2007-06-18 13:19:26 +02:00

+++ b/mysql-test/t/comment_index.test	2007-06-30 23:25:05 +02:00
@@ -77,7 +77,7 @@ SHOW CREATE TABLE t1;  

 # comment overflow(error)
 set sql_mode='TRADITIONAL';
---error 1573
+--error ER_WRONG_STRING_LENGTH

 ALTER TABLE t1 ADD INDEX i12 (c12) COMMENT 'abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd!  efghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefgh!  ijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefgh ijabcdefghijabcdefghijabcdefghijabcdefghijabcd';  SELECT table_comment,char_length(table_comment) FROM information_schema.tables WHERE table_name='t1';  SELECT column_comment,char_length(column_comment) FROM information_schema.columns WHERE table_name='t1'; @@ -88,7 +88,7 @@ SHOW CREATE TABLE t1;    

 set sql_mode='TRADITIONAL';
---error 1573
+--error ER_WRONG_STRING_LENGTH

 CREATE INDEX i12 ON t1(c12) COMMENT 'abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghija!  bcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcde!  fghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcde fghijabcdefghijabcdefghijabcdefghijabcd';  SELECT table_comment,char_length(table_comment) FROM information_schema.tables WHERE table_name='t1';  SELECT column_comment,char_length(column_comment) FROM information_schema.columns WHERE table_name='t1'; diff -Nrup a/mysql-test/t/comment_table.test b/mysql-test/t/comment_table.test 

--- a/mysql-test/t/comment_table.test	2007-06-18 13:19:26 +02:00

+++ b/mysql-test/t/comment_table.test	2007-06-30 23:25:05 +02:00
@@ -48,7 +48,7 @@ SELECT column_comment,char_length(column  drop table t1;
 SET SQL_MODE='TRADITIONAL';   ---error 1573
+--error ER_WRONG_STRING_LENGTH

 create table t1 (c1 VARCHAR(10) NOT NULL COMMENT 'c1 comment', c2 INTEGER,c3 INTEGER COMMENT '012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789', c4 INTEGER, c5 INTEGER, c6 INTEGER, c7 INTEGER, INDEX i1 (c1) COMMENT 'i1 comment',INDEX i2(c2)  ) COMMENT='abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefg!  hijabcdefghijabcdefghijabcdefghijabcdefghijabcdabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghija!  bcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghija bcdefghijabcde';
 SELECT table_comment,char_length(table_comment) FROM information_schema.tables WHERE table_name='t1'; diff -Nrup a/mysys/charset.c b/mysys/charset.c 
--- a/mysys/charset.c	2007-06-30 19:43:49 +02:00

+++ b/mysys/charset.c	2007-06-30 23:25:05 +02:00

@@ -242,8 +242,8 @@ static int add_collation(CHARSET_INFO *c
       if (cs_copy_data(all_charsets[cs->number],cs))
         return MY_XML_ERROR;
 
-      new->levels_for_compare= 1;
-      new->levels_for_order= 1;

+      newcs->levels_for_compare= 1;
+      newcs->levels_for_order= 1;

       
       if (!strcmp(cs->csname,"ucs2") )
       {

-- 
MySQL Code Commits Mailing List
For list archives: 
http://lists.mysql.com/commits
To unsubscribe:    
http://lists.mysql.com/commits?unsub=lists@pantek.com
Received on Sun Jul 1 13:40:29 2007

This archive was generated by hypermail 2.1.8 : Sun Jul 01 2007 - 13:50:03 EDT

Contact Us  Legal Notices  Order Services Online 
Pantek Home  Privacy Policy  IT news  Site Map  Pantek Library