packages: mysql/memory_dynamic_rows.patch, mysql/mysql.spec - rel 2; patche...

arekm arekm at pld-linux.org
Fri Apr 27 15:00:54 CEST 2012


Author: arekm                        Date: Fri Apr 27 13:00:54 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2; patches updated

---- Files affected:
packages/mysql:
   memory_dynamic_rows.patch (1.5 -> 1.6) , mysql.spec (1.570 -> 1.571) 

---- Diffs:

================================================================
Index: packages/mysql/memory_dynamic_rows.patch
diff -u packages/mysql/memory_dynamic_rows.patch:1.5 packages/mysql/memory_dynamic_rows.patch:1.6
--- packages/mysql/memory_dynamic_rows.patch:1.5	Wed Jan 11 19:10:26 2012
+++ packages/mysql/memory_dynamic_rows.patch	Fri Apr 27 15:00:48 2012
@@ -2812,7 +2812,7 @@
  } /* heap_update */
 --- /dev/null
 +++ b/mysql-test/r/percona_heap_blob.result
-@@ -0,0 +1,952 @@
+@@ -0,0 +1,956 @@
 +SET @old_default_storage_engine=@@default_storage_engine;
 +SET default_storage_engine=MEMORY;
 +drop table if exists t1,t2,t3,t4,t5,t6,t7;
@@ -2884,7 +2884,7 @@
 +a
 +Where
 +drop table t1;
-+create table t1 (t text,c char(10),b blob, d varbinary(10));
++create table t1 (t text,c char(10),b blob, d varbinary(10)) collate latin1_general_cs;
 +insert into t1 values (NULL,NULL,NULL,NULL);
 +insert into t1 values ("","","","");
 +insert into t1 values ("hello","hello","hello","hello");
@@ -2897,26 +2897,24 @@
 +lock tables t1 READ;
 +show full fields from t1;
 +Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment
-+t	text	latin1_swedish_ci	YES		NULL		#	
-+c	char(10)	latin1_swedish_ci	YES		NULL		#	
++t	text	latin1_general_cs	YES		NULL		#	
++c	char(10)	latin1_general_cs	YES		NULL		#	
 +b	blob	NULL	YES		NULL		#	
 +d	varbinary(10)	NULL	YES		NULL		#	
 +lock tables t1 WRITE;
 +show full fields from t1;
 +Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment
-+t	text	latin1_swedish_ci	YES		NULL		#	
-+c	char(10)	latin1_swedish_ci	YES		NULL		#	
++t	text	latin1_general_cs	YES		NULL		#	
++c	char(10)	latin1_general_cs	YES		NULL		#	
 +b	blob	NULL	YES		NULL		#	
 +d	varbinary(10)	NULL	YES		NULL		#	
 +unlock tables;
 +select t from t1 where t like "hello";
 +t
 +hello
-+HELLO
 +select c from t1 where c like "hello";
 +c
 +hello
-+HELLO
 +select b from t1 where b like "hello";
 +b
 +hello
@@ -2926,18 +2924,15 @@
 +select c from t1 having c like "hello";
 +c
 +hello
-+HELLO
 +select d from t1 having d like "hello";
 +d
 +hello
 +select t from t1 where t like "%HELLO%";
 +t
-+hello
 +HELLO
 +HELLO MY
 +select c from t1 where c like "%HELLO%";
 +c
-+hello
 +HELLO
 +HELLO MY
 +select b from t1 where b like "%HELLO%";
@@ -2950,7 +2945,6 @@
 +HELLO MY
 +select c from t1 having c like "%HELLO%";
 +c
-+hello
 +HELLO
 +HELLO MY
 +select d from t1 having d like "%HELLO%";
@@ -2968,9 +2962,9 @@
 +
 +1
 +a
-+hello
 +HELLO
 +HELLO MY
++hello
 +select c from t1 order by c;
 +c
 +NULL
@@ -2978,9 +2972,9 @@
 +
 +
 +a
-+hello
 +HELLO
 +HELLO MY
++hello
 +select b from t1 order by b;
 +b
 +NULL
@@ -3006,6 +3000,7 @@
 +NULL
 +
 +hello
++HELLO
 +HELLO MY
 +a
 +1
@@ -3023,8 +3018,9 @@
 +
 +1
 +a
-+hello
++HELLO
 +HELLO MY
++hello
 +select distinct b from t1 order by b;
 +b
 +NULL
@@ -3039,8 +3035,9 @@
 +
 +1
 +a
-+hello
++HELLO
 +HELLO MY
++hello
 +select b from t1 group by b;
 +b
 +NULL
@@ -3055,6 +3052,7 @@
 +NULL
 +
 +hello
++HELLO
 +HELLO MY
 +a
 +1
@@ -3072,8 +3070,9 @@
 +
 +1
 +a
-+hello
++HELLO
 +HELLO MY
++hello
 +select distinct b from t1 order by b;
 +b
 +NULL
@@ -3087,6 +3086,7 @@
 +NULL
 +
 +hello
++HELLO
 +HELLO MY
 +a
 +select distinct d from t1;
@@ -3103,8 +3103,9 @@
 +NULL
 +
 +a
-+hello
++HELLO
 +HELLO MY
++hello
 +select distinct d from t1 order by d;
 +d
 +NULL
@@ -3119,8 +3120,9 @@
 +NULL
 +
 +a
-+hello
++HELLO
 +HELLO MY
++hello
 +select d from t1 group by d;
 +d
 +NULL
@@ -3146,8 +3148,9 @@
 +	1
 +1	1
 +a	1
-+hello	2
++HELLO	1
 +HELLO MY	1
++hello	1
 +select b,count(*) from t1 group by b;
 +b	count(*)
 +NULL	3
@@ -3161,8 +3164,9 @@
 +NULL	2
 +	2
 +a	1
-+hello	2
++HELLO	1
 +HELLO MY	1
++hello	1
 +select d,count(*) from t1 group by d;
 +d	count(*)
 +NULL	2
@@ -4369,7 +4373,7 @@
 +#
 +# test of blob, text, char and varbinary
 +#
-+create table t1 (t text,c char(10),b blob, d varbinary(10));
++create table t1 (t text,c char(10),b blob, d varbinary(10)) collate latin1_general_cs;
 +insert into t1 values (NULL,NULL,NULL,NULL);
 +insert into t1 values ("","","","");
 +insert into t1 values ("hello","hello","hello","hello");

================================================================
Index: packages/mysql/mysql.spec
diff -u packages/mysql/mysql.spec:1.570 packages/mysql/mysql.spec:1.571
--- packages/mysql/mysql.spec:1.570	Sat Apr 14 10:51:52 2012
+++ packages/mysql/mysql.spec	Fri Apr 27 15:00:48 2012
@@ -37,7 +37,7 @@
 Summary(zh_CN.UTF-8):	MySQL数据库服务器
 Name:		mysql
 Version:	5.5.21
-Release:	1
+Release:	2
 License:	GPL + MySQL FLOSS Exception
 Group:		Applications/Databases
 # Source0Download: http://dev.mysql.com/downloads/mysql/5.5.html#downloads
@@ -1271,6 +1271,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.571  2012/04/27 13:00:48  arekm
+- rel 2; patches updated
+
 Revision 1.570  2012/04/14 08:51:52  arekm
 - up to 5.5.21
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/mysql/memory_dynamic_rows.patch?r1=1.5&r2=1.6
    http://cvs.pld-linux.org/packages/mysql/mysql.spec?r1=1.570&r2=1.571



More information about the pld-cvs-commit mailing list