Hosting Provided By

bk commit into 5.0 tree (anozdrin:1.2506) BUG#10491

From: Alexander Nozdrin <alik(at)mysql.com>
Date: Fri Jun 29 2007 - 09:37:22 EDT

Below is the list of changes that have just been committed into a local 5.0 repository of alik. When alik 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.2506, 2007-06-29 17:37:17+04:00, anozdrin@ibm. +6 -0 Follow up to the patch for the BUG#10491.

mysql-test/r/ps_1general.result@1.57, 2007-06-29 17:37:15+04:00, anozdrin@ibm. +2 -2 Update result file.

mysql-test/r/ps_2myisam.result@1.50, 2007-06-29 17:37:15+04:00, anozdrin@ibm. +1 -1 Update result file.

mysql-test/r/ps_3innodb.result@1.53, 2007-06-29 17:37:15+04:00, anozdrin@ibm. +1 -1 Update result file.

mysql-test/r/ps_4heap.result@1.49, 2007-06-29 17:37:15+04:00, anozdrin@ibm. +1 -1 Update result file.

mysql-test/r/ps_5merge.result@1.50, 2007-06-29 17:37:15+04:00, anozdrin@ibm. +2 -2 Update result file.

tests/mysql_client_test.c@1.234, 2007-06-29 17:37:15+04:00, anozdrin@ibm. +3 -1 Fix test -- after field changing character set to utf8 in the server, length should be calculated differently.

Do you need help?

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

--- a/mysql-test/r/ps_1general.result	2007-06-22 13:55:46 +04:00
+++ b/mysql-test/r/ps_1general.result	2007-06-29 17:37:15 +04:00

@@ -468,7 +468,7 @@ def					table	253	64	2	Y	0	31	8

 def					type	253	10	3	Y	0	31	8
 def					possible_keys	253	4096	0	Y	0	31	8
 def					key	253	64	0	Y	0	31	8
-def					key_len	253	4096	0	Y	128	31	63
+def					key_len	253	1365	0	Y	0	31	8
 def					ref	253	1024	0	Y	0	31	8
 def					rows	8	10	1	Y	32928	0	63
 def					Extra	253	255	14	N	1	31	8

@@ -484,7 +484,7 @@ def					table	253	64	2	Y	0	31	8

 def					type	253	10	5	Y	0	31	8
 def					possible_keys	253	4096	7	Y	0	31	8
 def					key	253	64	7	Y	0	31	8
-def					key_len	253	4096	1	Y	128	31	63
+def					key_len	253	1365	1	Y	0	31	8
 def					ref	253	1024	0	Y	0	31	8
 def					rows	8	10	1	Y	32928	0	63
 def					Extra	253	255	27	N	1	31	8
diff -Nrup a/mysql-test/r/ps_2myisam.result b/mysql-test/r/ps_2myisam.result
--- a/mysql-test/r/ps_2myisam.result	2007-05-30 16:04:02 +04:00
+++ b/mysql-test/r/ps_2myisam.result	2007-06-29 17:37:15 +04:00

@@ -1158,7 +1158,7 @@ def					table	253	64	2	Y	0	31	8

 def					type	253	10	3	Y	0	31	8
 def					possible_keys	253	4096	0	Y	0	31	8
 def					key	253	64	0	Y	0	31	8
-def					key_len	253	4096	0	Y	128	31	63
+def					key_len	253	1365	0	Y	0	31	8
 def					ref	253	1024	0	Y	0	31	8
 def					rows	8	10	1	Y	32928	0	63
 def					Extra	253	255	0	N	1	31	8
diff -Nrup a/mysql-test/r/ps_3innodb.result b/mysql-test/r/ps_3innodb.result
--- a/mysql-test/r/ps_3innodb.result	2007-05-30 16:04:02 +04:00
+++ b/mysql-test/r/ps_3innodb.result	2007-06-29 17:37:15 +04:00

@@ -1158,7 +1158,7 @@ def					table	253	64	2	Y	0	31	8

 def					type	253	10	3	Y	0	31	8
 def					possible_keys	253	4096	0	Y	0	31	8
 def					key	253	64	0	Y	0	31	8
-def					key_len	253	4096	0	Y	128	31	63
+def					key_len	253	1365	0	Y	0	31	8
 def					ref	253	1024	0	Y	0	31	8
 def					rows	8	10	1	Y	32928	0	63
 def					Extra	253	255	0	N	1	31	8
diff -Nrup a/mysql-test/r/ps_4heap.result b/mysql-test/r/ps_4heap.result
--- a/mysql-test/r/ps_4heap.result	2007-05-30 16:04:02 +04:00
Do you need more help? 
In addition to our free technical library, Pantek provides professional IT services to companies who utilize Open Source software:Learn more about Pantek's Technical Support offerings
Place an order for 24/7/365 Technical Support here
Learn more about Pantek, who we are, and what we do
Chat with a Live Operator
Related lists.mysql.com Links
announce
benchmarks
bugs
certification
cluster
commits
dotnet
gui-tools
internals
java
maxdb
myodbc
mysql
mysqldoc
packagers
perl
plusplus
replication
win32
Request more information about Pantek
+++ b/mysql-test/r/ps_4heap.result	2007-06-29 17:37:15 +04:00

@@ -1159,7 +1159,7 @@ def					table	253	64	2	Y	0	31	8

 def					type	253	10	3	Y	0	31	8
 def					possible_keys	253	4096	0	Y	0	31	8
 def					key	253	64	0	Y	0	31	8
-def					key_len	253	4096	0	Y	128	31	63
+def					key_len	253	1365	0	Y	0	31	8
 def					ref	253	1024	0	Y	0	31	8
 def					rows	8	10	1	Y	32928	0	63
 def					Extra	253	255	0	N	1	31	8
diff -Nrup a/mysql-test/r/ps_5merge.result b/mysql-test/r/ps_5merge.result
--- a/mysql-test/r/ps_5merge.result	2007-05-30 16:04:02 +04:00
+++ b/mysql-test/r/ps_5merge.result	2007-06-29 17:37:15 +04:00

@@ -1201,7 +1201,7 @@ def					table	253	64	2	Y	0	31	8

 def					type	253	10	3	Y	0	31	8
 def					possible_keys	253	4096	0	Y	0	31	8
 def					key	253	64	0	Y	0	31	8
-def					key_len	253	4096	0	Y	128	31	63
+def					key_len	253	1365	0	Y	0	31	8
 def					ref	253	1024	0	Y	0	31	8
 def					rows	8	10	1	Y	32928	0	63
 def					Extra	253	255	0	N	1	31	8

@@ -4222,7 +4222,7 @@ def					table	253	64	2	Y	0	31	8

 def					type	253	10	3	Y	0	31	8
 def					possible_keys	253	4096	0	Y	0	31	8
 def					key	253	64	0	Y	0	31	8
-def					key_len	253	4096	0	Y	128	31	63
+def					key_len	253	1365	0	Y	0	31	8
 def					ref	253	1024	0	Y	0	31	8
 def					rows	8	10	1	Y	32928	0	63
 def					Extra	253	255	0	N	1	31	8
diff -Nrup a/tests/mysql_client_test.c b/tests/mysql_client_test.c
--- a/tests/mysql_client_test.c	2007-06-15 19:48:20 +04:00
+++ b/tests/mysql_client_test.c	2007-06-29 17:37:15 +04:00

@@ -7564,7 +7564,9 @@ static void test_explain_bug()

else
{

     verify_prepare_field(result, 6, "key_len", "", MYSQL_TYPE_VAR_STRING, "", 
-                         "", "", NAME_LEN*MAX_KEY, 0);
+                         "", "",
+                         NAME_LEN*MAX_KEY / my_charset_utf8_general_ci.mbmaxlen,
+                         0);

}

verify_prepare_field(result, 7, "ref", "", MYSQL_TYPE_VAR_STRING,

-- 
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 Fri Jun 29 09:38:38 2007

This message: [ Message body ]
Next message: Alexander Nozdrin: "bk commit into 5.1 tree (anozdrin:1.2518)"
Previous message: cbell(at)mysql.com: "bk commit into 5.2 tree (cbell:1.2544)"

Contemporary messages sorted: [ By Date ] [ By Thread ] [ By Subject ] [ By Author ] [ By messages with attachments ]

This archive was generated by hypermail 2.1.8 : Fri Jun 29 2007 - 09:40:02 EDT