List:Commits« Previous MessageNext Message »
From:Tor Didriksen Date:November 2 2010 10:50am
Subject:bzr push into mysql-next-mr-bugfixing branch (tor.didriksen:3351 to 3352)
View as plain text  
 3352 Tor Didriksen	2010-11-02 [merge]
      Automerge trunk-bugfixing => next-mr-bugfixing

    modified:
      mysql-test/collections/default.experimental
      mysql-test/r/ctype_uca.result
      mysql-test/r/ctype_utf16_uca.result
      mysql-test/r/ctype_utf32_uca.result
      mysql-test/t/ctype_uca.test
      mysql-test/t/ctype_utf16_uca.test
      mysql-test/t/ctype_utf32_uca.test
      mysys/charset-def.c
      strings/ctype-uca.c
 3351 Georgi Kodinov	2010-10-28
      Bug #44355: Need system variable for --bind-address option
      
      Added a system variable for the bind_address command line
      option.

    added:
      mysql-test/suite/sys_vars/r/bind_address_basic.result
      mysql-test/suite/sys_vars/t/bind_address_basic.test
    modified:
      sql/mysqld.cc
      sql/mysqld.h
      sql/sys_vars.cc
=== modified file 'mysql-test/collections/default.experimental'
--- a/mysql-test/collections/default.experimental	2010-11-01 09:52:05 +0000
+++ b/mysql-test/collections/default.experimental	2010-11-02 10:49:29 +0000
@@ -17,6 +17,7 @@ main.log_tables                         
 main.lowercase_table2 @darwin            # Bug#55509 2010-07-26 alik main.lowercase_table2 fails on Mac OSX (again)
 main.mysqlslap @windows                  # Bug#54024 2010-08-10 alik mysqlslap fails sporadically starting from Dahlia
 main.outfile_loaddata @solaris           # Bug#46895 2010-01-20 alik Test "outfile_loaddata" fails (reproducible)
+main.server_uuid                         # Bug#57482 2010-11-02 alik server_uuid fails on PB2
 main.signal_demo3 @solaris               # Bug#47791 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
 main.sp @solaris                         # Bug#47791 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
 main.type_float @freebsd                 # Bug#38965 2010-05-04 alik test cases gis-rtree, type_float, type_newdecimal fail in embedded server

=== modified file 'mysql-test/r/ctype_uca.result'
--- a/mysql-test/r/ctype_uca.result	2010-07-08 10:57:38 +0000
+++ b/mysql-test/r/ctype_uca.result	2010-11-02 07:31:30 +0000
@@ -2476,111 +2476,6 @@ Z,z,Ź,ź,Ż,ż,Ž,ž
 ǁ
 ǂ
 ǃ
-select group_concat(c1 order by c1) from t1 group by c1 collate utf8_vietnamese_520_ci;
-group_concat(c1 order by c1)
-÷
-×
-A,a,À,Á,Ã,Ä,Å,à,á,ã,ä,å,Ā,ā,Ą,ą,Ǎ,ǎ,Ǟ,ǟ,Ǡ,ǡ,Ǻ,ǻ,Ạ,ạ,Ả,ả
-AA,Aa,aA,aa
-AE,Ae,aE,ae,Æ,æ,Ǣ,ǣ,Ǽ,ǽ
-Ă,ă,Ắ,ắ,Ằ,ằ,Ẳ,ẳ,Ẵ,ẵ,Ặ,ặ
-Â,â,Ấ,ấ,Ầ,ầ,Ẩ,ẩ,Ẫ,ẫ,Ậ,ậ
-B,b
-ƀ
-Ɓ
-Ƃ,ƃ
-C,c,Ç,ç,Ć,ć,Ĉ,ĉ,Ċ,ċ,Č,č
-CH,Ch,cH,ch
-Ƈ,ƈ
-D,d,Ð,ð,Ď,ď
-DZ,Dz,dZ,dz,DŽ,Dž,dž,DZ,Dz,dz
-Đ,đ
-Ɖ
-Ɗ
-Ƌ,ƌ
-E,e,È,É,Ë,è,é,ë,Ē,ē,Ĕ,ĕ,
-G,g,Ĝ,ĝ,Ğ,ğ,Ġ,ġ,Ģ,ģ,Ǧ,ǧ,Ǵ,ǵ
-Ǥ,ǥ
-Ɠ
-Ɣ
-Ƣ,ƣ
-H,h,Ĥ,ĥ,Ħ,ħ
-ƕ,Ƕ
-I,i,Ì,Í,Î,Ï,ì,í,î,ï,Ĩ,ĩ,Ī,ī,Ĭ,ĭ,Į,į,İ,Ǐ,ǐ,Ỉ,ỉ,Ị,ị
-IJ,Ij,iJ,ij,IJ,ij
-ı
-Ɨ
-Ɩ
-J,j,Ĵ,ĵ,ǰ
-K,k,Ķ,ķ,Ǩ,ǩ
-Ƙ,ƙ
-L,l,Ĺ,ĺ,Ļ,ļ,Ľ,ľ,Ŀ,ŀ,Ł,ł
-LJ,Lj,lJ,lj,LJ,Lj,lj
-LL,Ll,lL,ll
-ƚ
-ƛ
-M,m
-N,n,Ñ,ñ,Ń,ń,Ņ,ņ,ố,Ồ,ồ,Ổ,ổ,Ỗ,ỗ,Ộ,ộ
-Ơ,ơ,Ớ,ớ,Ờ,,r,Ŕ,ŕ,Ŗ,ŗ,Ř,ř
-RR,Rr,rR,rr
-Ʀ
-S,s,Ś,ś,Ŝ,ŝ,Ş,ş,Š,š,ſ
-SS,Ss,sS,ss,ß
-Ʃ
-ƪ
-T,t,Ţ,ţ,Ť,ť
-ƾ
-Ŧ,ŧ
-ƫ
-Ƭ,ƭ
-Ʈ
-U,u,Ù,Ú,Û,Ü,ù,ú,û,ü,Ũ,ũ,Ū,ū,Ŭ,ŭ,Ů,ů,Ű,ű,Ų,ų,Ǔ,ǔ,Ǖ,ǖ,Ǘ,ǘ,Ǚ,ǚ,Ǜ,ǜ,Ụ,ụ,Ủ,ủ
-Ư,ư,Ứ,ứ,Ừ,ừ,Ử,ử,Ữ,Ŷ,ŷ,Ÿ
-Ƴ,ƴ
-Z,z,Ź,ź,Ż,ż,Ž,ž
-ƍ
-Ƶ,ƶ
-Ʒ,Ǯ,ǯ
-Ƹ,ƹ
-ƺ
-Þ,þ
-ƿ,Ƿ
-ƻ
-Ƨ,ƨ
-Ƽ,ƽ
-Ƅ,ƅ
-ʼn
-ǀ
-ǁ
-ǂ
-ǃ
 ALTER TABLE t1 CONVERT TO CHARACTER SET ucs2 COLLATE ucs2_bin;
 SELECT GROUP_CONCAT(c1 ORDER BY c1) FROM t1 GROUP BY c1 COLLATE ucs2_unicode_ci;
 GROUP_CONCAT(c1 ORDER BY c1)
@@ -4870,111 +4765,6 @@ Z,z,Ź,ź,Ż,ż,Ž,ž
 ǁ
 ǂ
 ǃ
-SELECT GROUP_CONCAT(c1 ORDER BY c1) FROM t1 GROUP BY c1 COLLATE ucs2_vietnamese_520_ci;
-GROUP_CONCAT(c1 ORDER BY c1)
-÷
-×
-A,a,À,Á,Ã,Ä,Å,à,á,ã,ä,å,Ā,ā,Ą,ą,Ǎ,ǎ,Ǟ,ǟ,Ǡ,ǡ,Ǻ,ǻ,Ạ,ạ,Ả,ả
-AA,Aa,aA,aa
-AE,Ae,aE,ae,Æ,æ,Ǣ,ǣ,Ǽ,ǽ
-Ă,Ầ,ầ,Ẩ,ẩ,Ẫ,ẫ,Ậ,ậ
-B,b
-ƀ
-Ɓ
-Ƃ,ƃ
-C,c,Ç,ç,Ć,ć,Ĉ,ĉ,Ċ,ċ,Č,č
-CH,Ch,cH,ch
-Ƈ,ƈ
-D,d,Ð,ð,Ď,ď
-DZ,Dz,dZ,dz,DŽ,Dž,dž,DZ,Dz,dz
-Đ,đ
-Ɖ
-Ɗ
-Ƌ,ƌ
-E,e,È,É,Ë,è,é,ë,Ē,ē,Ĕ,ĕ,Ė,ė,Ę,ę,Ě,Ễ,ễ,Ệ,ệ
-Ǝ,ǝ
-Ə
-Ɛ
-F,f
-Ƒ,ƒ
-G,g,Ĝ,ĝ,Ğ,ğ,Ġ,ġ,Ģ,ģ,Ǧ,ǧ,Ǵ,ǵ
-Ǥ,ǥ
-Ɠ
-Ɣ
-Ƣ,ƣ
-H,h,Ĥ,ĥ,Ħ,ħ
-ƕ,Ƕ
-I,i,Ì,Í,Î,Ï,ì,í,î,ï,Ĩ,ĩ,Ī,ī,Ĭ,ĭ,Į,į,İ,Ǐ,ǐ,Ỉ,ỉ,Ị,ị
-IJ,Ij,iJ,ij,IJ,ij
-ı
-Ɨ
-Ɩ
-J,j,Ĵ,ĵ,ǰ
-K,k,Ķ,ķ,Ǩ,ǩ
-Ƙ,ƙ
-L,l,Ĺ,ĺ,Ļ,ļ,Ľ,ľ,Ŀ,ŀ,Ł,ł
-LJ,Lj,lJ,lj,LJ,Lj,lj
-LL,Ll,lL,ll
-ƚ
-ƛ
-M,m
-N,n,Ñ,ñ,Ń,ń,Ņ,ņ,Ň,ň,Ǹ,ǹ
-NJ,Nj,nJ,nj,NJ,Nj,nj
-Ɲ
-ƞ
-Ŋ,ŋ
-O,o,Ò,Ó,Õ,Ö,Ø,ò,ọ,Ỏ,ỏ
-OE,Oe,oE,oe,Œ,œ
-Ô,ô,Ố,ố,Ồ,ồ,Ổ,ổ,Ỗ,ỗ,Ộ,ộ
-Ơ,ơ,Ớ,ớ,Ờ,ờ,Ở,ở,Ỡ,Ř,ř
-RR,Rr,rR,rr
-Ʀ
-S,s,Ś,ś,Ŝ,ŝ,Ş,ş,Š,š,ſ
-SS,Ss,sS,ss,ß
-Ʃ
-ƪ
-T,t,Ţ,ţ,Ť,ť
-ƾ
-Ŧ,ŧ
-ƫ
-Ƭ,ƭ
-Ʈ
-U,u,Ù,Ú,Û,Ü,ù,ú,û,ü,Ũ,ũ,Ū,ū,Ŭ,ŭ,Ů,ů,Ű,ű,Ų,ų,Ǔ,ǔ,Ǖ,ǖ,Ǘ,ǘ,Ǚ,ǚ,Ǜ,ǜ,Ụ,ụ,Ủ,ủ
-Ư,ư,Ứ,ứ,Ừ,ừ,Ử,ử,Ữ,ữ,Ự,ự
-Ɯ
-Ʊ
-V,v
-Ʋ
-W,w,Ŵ,ŵ
-X,x
-Y,y,Ý,ý,ÿ,Ŷ,ŷ,Ÿ
-Ƴ,ƴ
-Z,z,Ź,ź,Ż,ż,Ž,ž
-ƍ
-Ƶ,ƶ
-Ʒ,Ǯ,ǯ
-Ƹ,ƹ
-ƺ
-Þ,þ
-ƿ,Ƿ
-ƻ
-Ƨ,ƨ
-Ƽ,ƽ
-Ƅ,ƅ
-ʼn
-ǀ
-ǁ
-ǂ
-ǃ
 drop table t1;
 SET NAMES utf8;
 CREATE TABLE t1 (c varchar(255) NOT NULL COLLATE utf8_general_ci, INDEX (c));

=== modified file 'mysql-test/r/ctype_utf16_uca.result'
--- a/mysql-test/r/ctype_utf16_uca.result	2010-07-08 10:57:38 +0000
+++ b/mysql-test/r/ctype_utf16_uca.result	2010-11-02 07:31:30 +0000
@@ -2485,111 +2485,6 @@ ZzŹźŻżŽž
 ǁ
 ǂ
 ǃ
-select group_concat(c1 order by binary c1 separator '') from t1 group by c1 collate utf16_vietnamese_520_ci;
-group_concat(c1 order by binary c1 separator '')
-÷
-×
-AaÀÁÃÄÅàáãäåĀāĄąǍǎǞǟǠǡǺǻẠạẢả
-AAAaaAaa
-AEAeaEaeÆæǢǣǼǽ
-ĂăẮ-Ƈƈ
-DdÐðĎď
-DZDzdZdzDŽDždžDZDzdz
-Đđ
-Ɖ
-Ɗ
-Ƌƌ
-EeÈÉËèéëĒēĔĕĖėĘęĚěẸẹẺẻẼẽ
-ÊêẾếỀềỂểỄễỆệ
-Ǝǝ
-Ə
-Ɛ
-Ff
-Ƒƒ
-GgĜĝĞğĠġĢģǦǧǴǵ
-Ǥǥ
-Ɠ
-Ɣ
-Ƣƣ
-HhĤ-Ƙƙ
-LlĹĺĻļĽľĿŀŁł
-LJLjlJljLJLjlj
-LLLllLll
-ƚ
-ƛ
-Mm
-NnÑñŃńŅņŇňǸǹ
-NJNjnJnjNJNjnj
-Ɲ
-ǿỌọỎỏ
-OEOeoEoeŒœ
-ÔôỐốỒồỔổỖƤƥ
-Qq
-ĸ
-RrŔŕŖŗŘř
-RRRrrRrr
-Ʀ
-SsŚśŜŝŞƭ
-Ʈ
-UuÙÚÛÜùúûüŨũŪūŬŭŮůŰűŲųǓǔǕzŹźŻżŽž
-ƍ
-Ƶƶ
-ƷǮǯ
-Ƹƹ
-ƺ
-Þþ
-ƿǷ
-ƻ
-Ƨƨ
-Ƽƽ
-Ƅƅ
-ʼn
-ǀ
-ǁ
-ǂ
-ǃ
 drop table t1;
 SET NAMES utf8;
 CREATE TABLE t1 (c varchar(200) CHARACTER SET utf16 COLLATE utf16_general_ci NOT NULL, INDEX (c));

=== modified file 'mysql-test/r/ctype_utf32_uca.result'
--- a/mysql-test/r/ctype_utf32_uca.result	2010-07-08 10:57:38 +0000
+++ b/mysql-test/r/ctype_utf32_uca.result	2010-11-02 07:31:30 +0000
@@ -2485,111 +2485,6 @@ ZzŹźŻżŽž
 ǁ
 ǂ
 ǃ
-select group_concat(c1 order by binary c1 separator '') from t1 group by c1 collate utf32_vietnamese_520_ci;
-group_concat(c1 order by binary c1 separator '')
-÷
-×
-AaÀÁÃÄÅàáãäåĀāĄąǍǎǞǟǠǡǺǻẠạẢả
-AAAaaAaa
-AEAeaEaeÆæǢǣǼǽ
-ĂăẮắẰằẲẳẴẵẶặ
-ÂâẤấẦầẨẩẪẫẬậ
-Bb
-ƀ
-Ɓ
-Ƃƃ
-CcÇçĆćĈĉĊċČč
-CHChcHch
-Ƈƈ
-DdÐðĎď
-DZDzdZdzDŽDždžDZDzdz
-Đđ
-Ɖ
-Ɗ
-Ƌƌ
-EeÈÉËèéëĒēĔĕĖėĘęĚěẸẹẺẻẼƑƒ
-GgĜĝĞğĠġĢģǦǧǴǵ
-Ǥǥ
-Ɠ
-Ɣ
-Ƣƣ
-Hh
-ƚ
-ƛ
-Mm
-NnÑñŃńŅņŇňǸǹ
-NJNjnJnjNJNjnj
-Ɲ
-ƞ
-Ŋŋ
-OoÒÓÕÖØòóõöøŌōŎŏŐőǑǒǪǫǬǭǾǿỌọỎỏ
-OEOeoEoeŒœ
-ÔôỐốỒồỔổỖỗỘộ
-ƠơỚớỜờỞởỠỡỢợ
-Ɔ
-Ɵ
-Pp
-Ƥƥ
-Qq
-ĸ
-RrŔŕŖŗŘř
-RRRrrRrr
-Ʀ
-SsŚśŜŝƬƭ
-Ʈ
-UuÙÚÛÜùúûüŨũŪūŬŭŮůŰűŲųǓǔỰự
-Ɯ
-Ʊ
-Vv
-Ʋ
-WwŴŵ
-Xx
-YyÝýÿŶŷŸ
-Ƴƴ
-ZzŹźŻżŽž
-ƍ
-Ƶƶ
-ƷǮǯ
-Ƹƹ
-ƺ
-Þþ
-ƿǷ
-ƻ
-Ƨƨ
-Ƽƽ
-Ƅƅ
-ʼn
-ǀ
-ǁ
-ǂ
-ǃ
 drop table t1;
 SET NAMES utf8;
 CREATE TABLE t1 (c varchar(200) CHARACTER SET utf32 COLLATE utf32_general_ci NOT NULL, INDEX (c));

=== modified file 'mysql-test/t/ctype_uca.test'
--- a/mysql-test/t/ctype_uca.test	2010-07-08 10:57:38 +0000
+++ b/mysql-test/t/ctype_uca.test	2010-11-02 07:31:30 +0000
@@ -68,7 +68,6 @@ select group_concat(c1 order by c1) from
 select group_concat(c1 order by c1) from t1 group by c1 collate utf8_german2_ci;
 select group_concat(c1 order by c1) from t1 group by c1 collate utf8_unicode_520_ci;
 select group_concat(c1 order by c1) from t1 group by c1 collate utf8_vietnamese_ci;
-select group_concat(c1 order by c1) from t1 group by c1 collate utf8_vietnamese_520_ci;
 
 ALTER TABLE t1 CONVERT TO CHARACTER SET ucs2 COLLATE ucs2_bin;
 SELECT GROUP_CONCAT(c1 ORDER BY c1) FROM t1 GROUP BY c1 COLLATE ucs2_unicode_ci;
@@ -92,7 +91,6 @@ SELECT GROUP_CONCAT(c1 ORDER BY c1) FROM
 SELECT GROUP_CONCAT(c1 ORDER BY c1) FROM t1 GROUP BY c1 COLLATE ucs2_german2_ci;
 SELECT GROUP_CONCAT(c1 ORDER BY c1) FROM t1 GROUP BY c1 COLLATE ucs2_unicode_520_ci;
 SELECT GROUP_CONCAT(c1 ORDER BY c1) FROM t1 GROUP BY c1 COLLATE ucs2_vietnamese_ci;
-SELECT GROUP_CONCAT(c1 ORDER BY c1) FROM t1 GROUP BY c1 COLLATE ucs2_vietnamese_520_ci;
 
 drop table t1;
 

=== modified file 'mysql-test/t/ctype_utf16_uca.test'
--- a/mysql-test/t/ctype_utf16_uca.test	2010-07-08 10:57:38 +0000
+++ b/mysql-test/t/ctype_utf16_uca.test	2010-11-02 07:31:30 +0000
@@ -55,7 +55,6 @@ select group_concat(c1 order by binary c
 select group_concat(c1 order by binary c1 separator '') from t1 group by c1 collate utf16_german2_ci;
 select group_concat(c1 order by binary c1 separator '') from t1 group by c1 collate utf16_unicode_520_ci;
 select group_concat(c1 order by binary c1 separator '') from t1 group by c1 collate utf16_vietnamese_ci;
-select group_concat(c1 order by binary c1 separator '') from t1 group by c1 collate utf16_vietnamese_520_ci;
 
 drop table t1;
 

=== modified file 'mysql-test/t/ctype_utf32_uca.test'
--- a/mysql-test/t/ctype_utf32_uca.test	2010-07-08 10:57:38 +0000
+++ b/mysql-test/t/ctype_utf32_uca.test	2010-11-02 07:31:30 +0000
@@ -56,7 +56,6 @@ select group_concat(c1 order by binary c
 select group_concat(c1 order by binary c1 separator '') from t1 group by c1 collate utf32_german2_ci;
 select group_concat(c1 order by binary c1 separator '') from t1 group by c1 collate utf32_unicode_520_ci;
 select group_concat(c1 order by binary c1 separator '') from t1 group by c1 collate utf32_vietnamese_ci;
-select group_concat(c1 order by binary c1 separator '') from t1 group by c1 collate utf32_vietnamese_520_ci;
 
 drop table t1;
 

=== modified file 'mysys/charset-def.c'
--- a/mysys/charset-def.c	2010-07-08 10:57:38 +0000
+++ b/mysys/charset-def.c	2010-11-02 07:31:30 +0000
@@ -46,7 +46,6 @@ extern CHARSET_INFO my_charset_ucs2_hung
 extern CHARSET_INFO my_charset_ucs2_sinhala_uca_ci;
 extern CHARSET_INFO my_charset_ucs2_unicode_520_ci;
 extern CHARSET_INFO my_charset_ucs2_vietnamese_ci;
-extern CHARSET_INFO my_charset_ucs2_vietnamese_520_ci;
 #endif /* HAVE_CHARSET_ucs2 */
 
 
@@ -73,7 +72,6 @@ extern CHARSET_INFO my_charset_utf32_hun
 extern CHARSET_INFO my_charset_utf32_sinhala_uca_ci;
 extern CHARSET_INFO my_charset_utf32_unicode_520_ci;
 extern CHARSET_INFO my_charset_utf32_vietnamese_ci;
-extern CHARSET_INFO my_charset_utf32_vietnamese_520_ci;
 #endif /* HAVE_CHARSET_utf32 */
 
 
@@ -100,7 +98,6 @@ extern CHARSET_INFO my_charset_utf16_hun
 extern CHARSET_INFO my_charset_utf16_sinhala_uca_ci;
 extern CHARSET_INFO my_charset_utf16_unicode_520_ci;
 extern CHARSET_INFO my_charset_utf16_vietnamese_ci;
-extern CHARSET_INFO my_charset_utf16_vietnamese_520_ci;
 #endif  /* HAVE_CHARSET_utf16 */
 
 
@@ -127,7 +124,6 @@ extern CHARSET_INFO my_charset_utf8_hung
 extern CHARSET_INFO my_charset_utf8_sinhala_uca_ci;
 extern CHARSET_INFO my_charset_utf8_unicode_520_ci;
 extern CHARSET_INFO my_charset_utf8_vietnamese_ci;
-extern CHARSET_INFO my_charset_utf8_vietnamese_520_ci;
 #ifdef HAVE_UTF8_GENERAL_CS
 extern CHARSET_INFO my_charset_utf8_general_cs;
 #endif
@@ -156,7 +152,6 @@ extern CHARSET_INFO my_charset_utf8mb4_h
 extern CHARSET_INFO my_charset_utf8mb4_sinhala_uca_ci;
 extern CHARSET_INFO my_charset_utf8mb4_unicode_520_ci;
 extern CHARSET_INFO my_charset_utf8mb4_vietnamese_ci;
-extern CHARSET_INFO my_charset_utf8mb4_vietnamese_520_ci;
 #endif /* HAVE_CHARSET_utf8mb4 */
 
 #endif /* HAVE_UCA_COLLATIONS */
@@ -247,7 +242,6 @@ my_bool init_compiled_charsets(myf flags
   add_compiled_collation(&my_charset_ucs2_sinhala_uca_ci);
   add_compiled_collation(&my_charset_ucs2_unicode_520_ci);
   add_compiled_collation(&my_charset_ucs2_vietnamese_ci);
-  add_compiled_collation(&my_charset_ucs2_vietnamese_520_ci);
 #endif
 #endif
 
@@ -286,7 +280,6 @@ my_bool init_compiled_charsets(myf flags
   add_compiled_collation(&my_charset_utf8_sinhala_uca_ci);
   add_compiled_collation(&my_charset_utf8_unicode_520_ci);
   add_compiled_collation(&my_charset_utf8_vietnamese_ci);
-  add_compiled_collation(&my_charset_utf8_vietnamese_520_ci);
 #endif
 #endif /* HAVE_CHARSET_utf8 */
 
@@ -318,7 +311,6 @@ my_bool init_compiled_charsets(myf flags
   add_compiled_collation(&my_charset_utf8mb4_sinhala_uca_ci);
   add_compiled_collation(&my_charset_utf8mb4_unicode_520_ci);
   add_compiled_collation(&my_charset_utf8mb4_vietnamese_ci);
-  add_compiled_collation(&my_charset_utf8mb4_vietnamese_520_ci);
 #endif /* HAVE_UCA_COLLATIONS  */
 #endif /* HAVE_CHARSET_utf8mb4 */
 
@@ -350,7 +342,6 @@ my_bool init_compiled_charsets(myf flags
   add_compiled_collation(&my_charset_utf16_sinhala_uca_ci);
   add_compiled_collation(&my_charset_utf16_unicode_520_ci);
   add_compiled_collation(&my_charset_utf16_vietnamese_ci);
-  add_compiled_collation(&my_charset_utf16_vietnamese_520_ci);
 #endif /* HAVE_UCA_COLLATIOINS */
 #endif /* HAVE_CHARSET_utf16 */
 
@@ -382,7 +373,6 @@ my_bool init_compiled_charsets(myf flags
   add_compiled_collation(&my_charset_utf32_sinhala_uca_ci);
   add_compiled_collation(&my_charset_utf32_unicode_520_ci);
   add_compiled_collation(&my_charset_utf32_vietnamese_ci);
-  add_compiled_collation(&my_charset_utf32_vietnamese_520_ci);
 #endif /* HAVE_UCA_COLLATIONS */
 #endif /* HAVE_CHARSET_utf32 */
 

=== modified file 'strings/ctype-uca.c'
--- a/strings/ctype-uca.c	2010-07-08 10:57:38 +0000
+++ b/strings/ctype-uca.c	2010-11-02 07:31:30 +0000
@@ -21889,40 +21889,6 @@ CHARSET_INFO my_charset_ucs2_vietnamese_
 };
 
 
-CHARSET_INFO my_charset_ucs2_vietnamese_520_ci=
-{
-    152,0,0,             /* number       */
-    MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE|MY_CS_NONASCII,
-    "ucs2",              /* csname       */
-    "ucs2_vietnamese_520_ci",/* name     */
-    "",                  /* comment      */
-    vietnamese,          /* tailoring    */
-    NULL,                /* ctype        */
-    NULL,                /* to_lower     */
-    NULL,                /* to_upper     */
-    NULL,                /* sort_order   */
-    &my_uca_v520,        /* uca          */
-    NULL,                /* tab_to_uni   */
-    NULL,                /* tab_from_uni */
-    &my_unicase_unicode520, /* caseinfo  */
-    NULL,                /* state_map    */
-    NULL,                /* ident_map    */
-    8,                   /* strxfrm_multiply */
-    1,                   /* caseup_multiply  */
-    1,                   /* casedn_multiply  */
-    2,                   /* mbminlen     */
-    2,                   /* mbmaxlen     */
-    9,                   /* min_sort_char */
-    0x10FFFF,            /* max_sort_char */
-    ' ',                 /* pad char      */
-    0,                   /* escape_with_backslash_is_dangerous */
-    1,                   /* levels_for_compare */
-    1,                   /* levels_for_order   */
-    &my_charset_ucs2_handler,
-    &my_collation_ucs2_uca_handler
-};
-
-
 #endif
 
 
@@ -22737,40 +22703,6 @@ CHARSET_INFO my_charset_utf8_vietnamese_
 };
 
 
-CHARSET_INFO my_charset_utf8_vietnamese_520_ci=
-{
-    216,0,0,             /* number       */
-    MY_CS_UTF8MB3_UCA_FLAGS,/* flags     */
-    MY_UTF8MB3,          /* cs name      */
-    MY_UTF8MB3 "_vietnamese_520_ci",/* name  */
-    "",                  /* comment      */
-    vietnamese,          /* tailoring    */
-    ctype_utf8,          /* ctype        */
-    NULL,                /* to_lower     */
-    NULL,                /* to_upper     */
-    NULL,                /* sort_order   */
-    &my_uca_v520,        /* uca          */
-    NULL,                /* tab_to_uni   */
-    NULL,                /* tab_from_uni */
-    &my_unicase_unicode520, /* caseinfo  */
-    NULL,                /* state_map    */
-    NULL,                /* ident_map    */
-    8,                   /* strxfrm_multiply */
-    1,                   /* caseup_multiply  */
-    1,                   /* casedn_multiply  */
-    1,                   /* mbminlen     */
-    3,                   /* mbmaxlen     */
-    9,                   /* min_sort_char */
-    0x10FFFF,            /* max_sort_char */
-    ' ',                 /* pad char      */
-    0,                   /* escape_with_backslash_is_dangerous */
-    1,                   /* levels_for_compare */
-    1,                   /* levels_for_order   */
-    &my_charset_utf8_handler,
-    &my_collation_any_uca_handler
-};
-
-
 #endif /* HAVE_CHARSET_utf8 */
 
 
@@ -23543,40 +23475,6 @@ CHARSET_INFO my_charset_utf8mb4_vietname
 };
 
 
-CHARSET_INFO my_charset_utf8mb4_vietnamese_520_ci=
-{
-    248,0,0,            /* number       */
-    MY_CS_UTF8MB4_UCA_FLAGS,/* state    */
-    MY_UTF8MB4,         /* csname       */
-    MY_UTF8MB4 "_vietnamese_520_ci",/* name */
-    "",                 /* comment      */
-    vietnamese,         /* tailoring    */
-    ctype_utf8,         /* ctype        */
-    NULL,               /* to_lower     */
-    NULL,               /* to_upper     */
-    NULL,               /* sort_order   */
-    &my_uca_v520,       /* uca          */
-    NULL,               /* tab_to_uni   */
-    NULL,               /* tab_from_uni */
-    &my_unicase_unicode520,/* caseinfo  */
-    NULL,               /* state_map    */
-    NULL,               /* ident_map    */
-    8,                  /* strxfrm_multiply */
-    1,                  /* caseup_multiply  */
-    1,                  /* casedn_multiply  */
-    1,                  /* mbminlen      */
-    4,                  /* mbmaxlen      */
-    9,                  /* min_sort_char */
-    0x10FFFF,           /* max_sort_char */
-    ' ',                /* pad char      */
-    0,                  /* escape_with_backslash_is_dangerous */
-    1,                  /* levels_for_compare */
-    1,                  /* levels_for_order   */
-    &my_charset_utf8mb4_handler,
-    &my_collation_any_uca_handler
-};
-
-
 #endif /* HAVE_CHARSET_utf8mb4 */
 
 
@@ -24364,40 +24262,6 @@ CHARSET_INFO my_charset_utf32_vietnamese
 };
 
 
-CHARSET_INFO my_charset_utf32_vietnamese_520_ci=
-{
-    184,0,0,            /* number       */
-    MY_CS_UTF32_UCA_FLAGS,/* state      */
-    "utf32",            /* csname       */
-    "utf32_vietnamese_520_ci",/* name   */
-    "",                 /* comment      */
-    vietnamese,         /* tailoring    */
-    NULL,               /* ctype        */
-    NULL,               /* to_lower     */
-    NULL,               /* to_upper     */
-    NULL,               /* sort_order   */
-    &my_uca_v520,       /* uca          */
-    NULL,               /* tab_to_uni   */
-    NULL,               /* tab_from_uni */
-    &my_unicase_unicode520,/* caseinfo  */
-    NULL,               /* state_map    */
-    NULL,               /* ident_map    */
-    8,                  /* strxfrm_multiply */
-    1,                  /* caseup_multiply  */
-    1,                  /* casedn_multiply  */
-    4,                  /* mbminlen     */
-    4,                  /* mbmaxlen     */
-    9,                  /* min_sort_char */
-    0x10FFFF,           /* max_sort_char */
-    ' ',                /* pad char      */
-    0,                  /* escape_with_backslash_is_dangerous */
-    1,                  /* levels_for_compare */
-    1,                  /* levels_for_order   */
-    &my_charset_utf32_handler,
-    &my_collation_utf32_uca_handler
-};
-
-
 #endif /* HAVE_CHARSET_utf32 */
 
 
@@ -25187,40 +25051,6 @@ CHARSET_INFO my_charset_utf16_vietnamese
 };
 
 
-CHARSET_INFO my_charset_utf16_vietnamese_520_ci=
-{
-    125,0,0,           /* number       */
-    MY_CS_UTF16_UCA_FLAGS,/* state     */
-    "utf16",           /* cs name      */
-    "utf16_vietnamese_520_ci",/* name  */
-    "",                /* comment      */
-    vietnamese,        /* tailoring    */
-    NULL,              /* ctype        */
-    NULL,              /* to_lower     */
-    NULL,              /* to_upper     */
-    NULL,              /* sort_order   */
-    &my_uca_v520,      /* uca          */
-    NULL,              /* tab_to_uni   */
-    NULL,              /* tab_from_uni */
-    &my_unicase_unicode520,/* caseinfo */
-    NULL,              /* state_map    */
-    NULL,              /* ident_map    */
-    8,                 /* strxfrm_multiply */
-    1,                 /* caseup_multiply  */
-    1,                 /* casedn_multiply  */
-    2,                 /* mbminlen     */
-    4,                 /* mbmaxlen     */
-    9,                 /* min_sort_char */
-    0x10FFFF,          /* max_sort_char */
-    ' ',               /* pad char      */
-    0,                 /* escape_with_backslash_is_dangerous */
-    1,                 /* levels_for_compare */
-    1,                 /* levels_for_order   */
-    &my_charset_utf16_handler,
-    &my_collation_utf16_uca_handler
-};
-
-
 #endif /* HAVE_CHARSET_utf16 */
 
 

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-next-mr-bugfixing branch (tor.didriksen:3351 to 3352) Tor Didriksen2 Nov