| List: | Internals | « Previous MessageNext Message » | |
| From: | bar | Date: | October 13 2005 4:16pm |
| Subject: | bk commit into 5.0 tree (bar:1.2034) | ||
| View as plain text | |||
Below is the list of changes that have just been committed into a local 5.0 repository of bar. When bar 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.2034 05/10/13 19:16:19 bar@stripped +47 -0 type_binary.result, type_binary.test: new file mysql_fix_privilege_tables.sql, mysql_create_system_tables.sh: Adding true BINARY/VARBINARY: fixing "password" type, not to be 0x00-padding. Many files: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. Adding true BINARY/VARBINARY: new pad_char structure member. ctype-bin.c: Adding true BINARY/VARBINARY: new pad_char structure member. New strnxfrm, with two trailing length bytes. field.cc: Adding true BINARY/VARBINARY. mysql-test/r/type_binary.result 1.1 05/10/13 19:15:46 bar@stripped +113 -0 mysql-test/r/type_binary.result 1.0 05/10/13 19:15:46 bar@stripped +0 -0 BitKeeper file /usr/home/bar/mysql-5.0.b9278/mysql-test/r/type_binary.result mysql-test/t/type_binary.test 1.1 05/10/13 19:15:41 bar@stripped +67 -0 mysql-test/t/type_binary.test 1.0 05/10/13 19:15:41 bar@stripped +0 -0 BitKeeper file /usr/home/bar/mysql-5.0.b9278/mysql-test/t/type_binary.test scripts/mysql_fix_privilege_tables.sql 1.32 05/10/13 19:13:28 bar@stripped +1 -1 Adding true BINARY/VARBINARY: fixing "password" type, not to be 0x00-padding. scripts/mysql_create_system_tables.sh 1.28 05/10/13 19:13:02 bar@stripped +1 -1 Adding true BINARY/VARBINARY: fixing "password" type, not to be 0x00-padding. mysql-test/r/type_blob.result 1.48 05/10/13 19:12:39 bar@stripped +3 -3 Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/r/system_mysql_db.result 1.29 05/10/13 19:12:37 bar@stripped +1 -1 Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/r/sp.result 1.160 05/10/13 19:12:35 bar@stripped +1 -1 Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/r/ndb_types.result 1.4 05/10/13 19:12:30 bar@stripped +1 -1 Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/r/ndb_condition_pushdown.result 1.16 05/10/13 19:12:28 bar@stripped +1 -1 Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/r/func_in.result 1.23 05/10/13 19:12:24 bar@stripped +1 -1 Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/r/federated.result 1.18 05/10/13 19:12:22 bar@stripped +2 -2 Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/r/ctype_many.result 1.12 05/10/13 19:12:20 bar@stripped +581 -575 Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/r/ctype_cp1251.result 1.7 05/10/13 19:12:18 bar@stripped +1 -1 Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/r/cast.result 1.34 05/10/13 19:12:16 bar@stripped +1 -1 Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/r/binary.result 1.20 05/10/13 19:12:15 bar@stripped +1 -1 Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/r/alter_table.result 1.53 05/10/13 19:12:12 bar@stripped +1 -1 Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/t/type_blob.test 1.30 05/10/13 19:11:54 bar@stripped +2 -2 Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/t/sp.test 1.156 05/10/13 19:11:52 bar@stripped +1 -1 Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/t/ndb_types.test 1.6 05/10/13 19:11:45 bar@stripped +1 -1 Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/t/ndb_condition_pushdown.test 1.15 05/10/13 19:11:43 bar@stripped +1 -1 Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/t/func_in.test 1.18 05/10/13 19:11:39 bar@stripped +1 -1 Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/t/federated.test 1.15 05/10/13 19:11:36 bar@stripped +2 -2 Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/t/ctype_many.test 1.22 05/10/13 19:11:34 bar@stripped +2 -2 Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/t/ctype_cp1251.test 1.8 05/10/13 19:11:32 bar@stripped +1 -1 Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/t/cast.test 1.26 05/10/13 19:11:30 bar@stripped +1 -1 Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/t/binary.test 1.15 05/10/13 19:11:28 bar@stripped +1 -1 Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/t/alter_table.test 1.40 05/10/13 19:11:04 bar@stripped +1 -1 Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. include/m_ctype.h 1.114 05/10/13 19:10:31 bar@stripped +1 -0 Adding true BINARY/VARBINARY: new pad_char structure member. strings/ctype-win1250ch.c 1.53 05/10/13 19:10:16 bar@stripped +1 -0 Adding true BINARY/VARBINARY: new pad_char structure member. strings/ctype-utf8.c 1.97 05/10/13 19:10:14 bar@stripped +3 -0 Adding true BINARY/VARBINARY: new pad_char structure member. strings/ctype-ujis.c 1.69 05/10/13 19:10:13 bar@stripped +2 -0 Adding true BINARY/VARBINARY: new pad_char structure member. strings/ctype-ucs2.c 1.56 05/10/13 19:10:11 bar@stripped +2 -0 Adding true BINARY/VARBINARY: new pad_char structure member. strings/ctype-uca.c 1.39 05/10/13 19:10:09 bar@stripped +37 -0 Adding true BINARY/VARBINARY: new pad_char structure member. strings/ctype-tis620.c 1.90 05/10/13 19:10:08 bar@stripped +2 -0 Adding true BINARY/VARBINARY: new pad_char structure member. strings/ctype-sjis.c 1.88 05/10/13 19:10:06 bar@stripped +2 -0 Adding true BINARY/VARBINARY: new pad_char structure member. strings/ctype-simple.c 1.74 05/10/13 19:10:05 bar@stripped +1 -0 Adding true BINARY/VARBINARY: new pad_char structure member. strings/ctype-latin1.c 1.47 05/10/13 19:10:03 bar@stripped +3 -0 Adding true BINARY/VARBINARY: new pad_char structure member. strings/ctype-gbk.c 1.78 05/10/13 19:10:01 bar@stripped +2 -0 Adding true BINARY/VARBINARY: new pad_char structure member. strings/ctype-gb2312.c 1.61 05/10/13 19:10:00 bar@stripped +2 -0 Adding true BINARY/VARBINARY: new pad_char structure member. strings/ctype-extra.c 1.20 05/10/13 19:09:59 bar@stripped +1 -0 Adding true BINARY/VARBINARY: new pad_char structure member. strings/ctype-eucjpms.c 1.12 05/10/13 19:09:57 bar@stripped +2 -0 Adding true BINARY/VARBINARY: new pad_char structure member. strings/ctype-euc_kr.c 1.64 05/10/13 19:09:55 bar@stripped +2 -0 Adding true BINARY/VARBINARY: new pad_char structure member. strings/ctype-czech.c 1.61 05/10/13 19:09:53 bar@stripped +1 -0 Adding true BINARY/VARBINARY: new pad_char structure member. strings/ctype-cp932.c 1.10 05/10/13 19:09:49 bar@stripped +2 -0 Adding true BINARY/VARBINARY: new pad_char structure member. strings/ctype-bin.c 1.65 05/10/13 19:09:11 bar@stripped +28 -4 Adding true BINARY/VARBINARY: new pad_char structure member. New strnxfrm, with two trailing length bytes. strings/ctype-big5.c 1.87 05/10/13 19:08:40 bar@stripped +2 -0 Adding true BINARY/VARBINARY: new pad_char structure member. sql/field.cc 1.284 05/10/13 19:08:04 bar@stripped +2 -1 Adding true BINARY/VARBINARY. # This is a BitKeeper patch. What follows are the unified diffs for the # set of deltas contained in the patch. The rest of the patch, the part # that BitKeeper cares about, is below these diffs. # User: bar # Host: bar.intranet.mysql.r18.ru # Root: /usr/home/bar/mysql-5.0.b9278 --- 1.113/include/m_ctype.h 2005-08-19 23:55:19 +05:00 +++ 1.114/include/m_ctype.h 2005-10-13 19:10:31 +05:00 @@ -231,6 +231,7 @@ uint mbmaxlen; uint16 min_sort_char; uint16 max_sort_char; /* For LIKE optimization */ + uchar pad_char; my_bool escape_with_backslash_is_dangerous; MY_CHARSET_HANDLER *cset; --- 1.283/sql/field.cc 2005-09-23 23:28:48 +05:00 +++ 1.284/sql/field.cc 2005-10-13 19:08:04 +05:00 @@ -5881,7 +5881,8 @@ memcpy(ptr,from,copy_length); if (copy_length < field_length) // Append spaces if shorter field_charset->cset->fill(field_charset,ptr+copy_length, - field_length-copy_length,' '); + field_length-copy_length, + field_charset->pad_char); if ((copy_length < length) && table->in_use->count_cuted_fields) { // Check if we loosed some info --- 1.86/strings/ctype-big5.c 2005-10-06 17:36:55 +05:00 +++ 1.87/strings/ctype-big5.c 2005-10-13 19:08:40 +05:00 @@ -6398,6 +6398,7 @@ 2, /* mbmaxlen */ 0, /* min_sort_char */ 255, /* max_sort_char */ + ' ', /* pad char */ 0, /* escape_with_backslash_is_dangerous */ &my_charset_big5_handler, &my_collation_big5_chinese_ci_handler @@ -6430,6 +6431,7 @@ 2, /* mbmaxlen */ 0, /* min_sort_char */ 255, /* max_sort_char */ + ' ', /* pad char */ 0, /* escape_with_backslash_is_dangerous */ &my_charset_big5_handler, &my_collation_mb_bin_handler --- 1.60/strings/ctype-czech.c 2005-08-19 23:55:21 +05:00 +++ 1.61/strings/ctype-czech.c 2005-10-13 19:09:53 +05:00 @@ -628,6 +628,7 @@ 1, /* mbmaxlen */ 0, /* min_sort_char */ 0, /* max_sort_char */ + ' ', /* pad char */ 0, /* escape_with_backslash_is_dangerous */ &my_charset_8bit_handler, &my_collation_latin2_czech_ci_handler --- 1.63/strings/ctype-euc_kr.c 2005-08-19 23:55:21 +05:00 +++ 1.64/strings/ctype-euc_kr.c 2005-10-13 19:09:55 +05:00 @@ -8706,6 +8706,7 @@ 2, /* mbmaxlen */ 0, /* min_sort_char */ 255, /* max_sort_char */ + ' ', /* pad char */ 0, /* escape_with_backslash_is_dangerous */ &my_charset_handler, &my_collation_ci_handler @@ -8738,6 +8739,7 @@ 2, /* mbmaxlen */ 0, /* min_sort_char */ 255, /* max_sort_char */ + ' ', /* pad char */ 0, /* escape_with_backslash_is_dangerous */ &my_charset_handler, &my_collation_mb_bin_handler --- 1.60/strings/ctype-gb2312.c 2005-08-19 23:55:21 +05:00 +++ 1.61/strings/ctype-gb2312.c 2005-10-13 19:10:00 +05:00 @@ -5757,6 +5757,7 @@ 2, /* mbmaxlen */ 0, /* min_sort_char */ 255, /* max_sort_char */ + ' ', /* pad char */ 0, /* escape_with_backslash_is_dangerous */ &my_charset_handler, &my_collation_ci_handler @@ -5788,6 +5789,7 @@ 2, /* mbmaxlen */ 0, /* min_sort_char */ 255, /* max_sort_char */ + ' ', /* pad char */ 0, /* escape_with_backslash_is_dangerous */ &my_charset_handler, &my_collation_mb_bin_handler --- 1.77/strings/ctype-gbk.c 2005-10-06 17:36:55 +05:00 +++ 1.78/strings/ctype-gbk.c 2005-10-13 19:10:01 +05:00 @@ -10045,6 +10045,7 @@ 2, /* mbmaxlen */ 0, /* min_sort_char */ 255, /* max_sort_char */ + ' ', /* pad char */ 0, /* escape_with_backslash_is_dangerous */ &my_charset_handler, &my_collation_ci_handler @@ -10076,6 +10077,7 @@ 2, /* mbmaxlen */ 0, /* min_sort_char */ 255, /* max_sort_char */ + ' ', /* pad char */ 0, /* escape_with_backslash_is_dangerous */ &my_charset_handler, &my_collation_mb_bin_handler --- 1.87/strings/ctype-sjis.c 2005-10-06 17:36:55 +05:00 +++ 1.88/strings/ctype-sjis.c 2005-10-13 19:10:06 +05:00 @@ -4693,6 +4693,7 @@ 2, /* mbmaxlen */ 0, /* min_sort_char */ 255, /* max_sort_char */ + ' ', /* pad char */ 0, /* escape_with_backslash_is_dangerous */ &my_charset_handler, &my_collation_ci_handler @@ -4724,6 +4725,7 @@ 2, /* mbmaxlen */ 0, /* min_sort_char */ 255, /* max_sort_char */ + ' ', /* pad char */ 0, /* escape_with_backslash_is_dangerous */ &my_charset_handler, &my_collation_mb_bin_handler --- 1.89/strings/ctype-tis620.c 2005-10-06 17:40:13 +05:00 +++ 1.90/strings/ctype-tis620.c 2005-10-13 19:10:08 +05:00 @@ -922,6 +922,7 @@ 1, /* mbmaxlen */ 0, /* min_sort_char */ 255, /* max_sort_char */ + ' ', /* pad char */ 0, /* escape_with_backslash_is_dangerous */ &my_charset_handler, &my_collation_ci_handler @@ -953,6 +954,7 @@ 1, /* mbmaxlen */ 0, /* min_sort_char */ 255, /* max_sort_char */ + ' ', /* pad char */ 0, /* escape_with_backslash_is_dangerous */ &my_charset_handler, &my_collation_8bit_bin_handler --- 1.68/strings/ctype-ujis.c 2005-08-19 23:55:22 +05:00 +++ 1.69/strings/ctype-ujis.c 2005-10-13 19:10:13 +05:00 @@ -8576,6 +8576,7 @@ 3, /* mbmaxlen */ 0, /* min_sort_char */ 255, /* max_sort_char */ + ' ', /* pad char */ 0, /* escape_with_backslash_is_dangerous */ &my_charset_handler, &my_collation_ci_handler @@ -8608,6 +8609,7 @@ 3, /* mbmaxlen */ 0, /* min_sort_char */ 255, /* max_sort_char */ + ' ', /* pad char */ 0, /* escape_with_backslash_is_dangerous */ &my_charset_handler, &my_collation_mb_bin_handler --- 1.38/strings/ctype-uca.c 2005-09-12 19:35:08 +05:00 +++ 1.39/strings/ctype-uca.c 2005-10-13 19:10:09 +05:00 @@ -7954,6 +7954,7 @@ static my_bool my_coll_init_uca(CHARSET_INFO *cs, void *(*alloc)(uint)) { + cs->pad_char= ' '; return create_tailoring(cs, alloc); } @@ -8071,6 +8072,7 @@ 2, /* mbmaxlen */ 9, /* min_sort_char */ 0xFFFF, /* max_sort_char */ + ' ', /* pad char */ 0, /* escape_with_backslash_is_dangerous */ &my_charset_ucs2_handler, &my_collation_ucs2_uca_handler @@ -8102,6 +8104,7 @@ 2, /* mbmaxlen */ 9, /* min_sort_char */ 0xFFFF, /* max_sort_char */ + ' ', /* pad char */ 0, /* escape_with_backslash_is_dangerous */ &my_charset_ucs2_handler, &my_collation_ucs2_uca_handler @@ -8133,6 +8136,7 @@ 2, /* mbmaxlen */ 9, /* min_sort_char */ 0xFFFF, /* max_sort_char */ + ' ', /* pad char */ 0, /* escape_with_backslash_is_dangerous */ &my_charset_ucs2_handler, &my_collation_ucs2_uca_handler @@ -8164,6 +8168,7 @@ 2, /* mbmaxlen */ 9, /* min_sort_char */ 0xFFFF, /* max_sort_char */ + ' ', /* pad char */ 0, /* escape_with_backslash_is_dangerous */ &my_charset_ucs2_handler, &my_collation_ucs2_uca_handler @@ -8195,6 +8200,7 @@ 2, /* mbmaxlen */ 9, /* min_sort_char */ 0xFFFF, /* max_sort_char */ + ' ', /* pad char */ 0, /* escape_with_backslash_is_dangerous */ &my_charset_ucs2_handler, &my_collation_ucs2_uca_handler @@ -8226,6 +8232,7 @@ 2, /* mbmaxlen */ 9, /* min_sort_char */ 0xFFFF, /* max_sort_char */ + ' ', /* pad char */ 0, /* escape_with_backslash_is_dangerous */ &my_charset_ucs2_handler, &my_collation_ucs2_uca_handler @@ -8257,6 +8264,7 @@ 2, /* mbmaxlen */ 9, /* min_sort_char */ 0xFFFF, /* max_sort_char */ + ' ', /* pad char */ 0, /* escape_with_backslash_is_dangerous */ &my_charset_ucs2_handler, &my_collation_ucs2_uca_handler @@ -8288,6 +8296,7 @@ 2, /* mbmaxlen */ 9, /* min_sort_char */ 0xFFFF, /* max_sort_char */ + ' ', /* pad char */ 0, /* escape_with_backslash_is_dangerous */ &my_charset_ucs2_handler, &my_collation_ucs2_uca_handler @@ -8319,6 +8328,7 @@ 2, /* mbmaxlen */ 9, /* min_sort_char */ 0xFFFF, /* max_sort_char */ + ' ', /* pad char */ 0, /* escape_with_backslash_is_dangerous */ &my_charset_ucs2_handler, &my_collation_ucs2_uca_handler @@ -8350,6 +8360,7 @@ 2, /* mbmaxlen */ 9, /* min_sort_char */ 0xFFFF, /* max_sort_char */ + ' ', /* pad char */ 0, /* escape_with_backslash_is_dangerous */ &my_charset_ucs2_handler, &my_collation_ucs2_uca_handler @@ -8381,6 +8392,7 @@ 2, /* mbmaxlen */ 9, /* min_sort_char */ 0xFFFF, /* max_sort_char */ + ' ', /* pad char */ 0, /* escape_with_backslash_is_dangerous */ &my_charset_ucs2_handler, &my_collation_ucs2_uca_handler @@ -8413,6 +8425,7 @@ 2, /* mbmaxlen */ 9, /* min_sort_char */ 0xFFFF, /* max_sort_char */ + ' ', /* pad char */ 0, /* escape_with_backslash_is_dangerous */ &my_charset_ucs2_handler, &my_collation_ucs2_uca_handler @@ -8444,6 +8457,7 @@ 2, /* mbmaxlen */ 9, /* min_sort_char */ 0xFFFF, /* max_sort_char */ + ' ', /* pad char */ 0, /* escape_with_backslash_is_dangerous */ &my_charset_ucs2_handler, &my_collation_ucs2_uca_handler @@ -8475,6 +8489,7 @@ 2, /* mbmaxlen */ 9, /* min_sort_char */ 0xFFFF, /* max_sort_char */ + ' ', /* pad char */ 0, /* escape_with_backslash_is_dangerous */ &my_charset_ucs2_handler, &my_collation_ucs2_uca_handler @@ -8506,6 +8521,7 @@ 2, /* mbmaxlen */ 9, /* min_sort_char */ 0xFFFF, /* max_sort_char */ + ' ', /* pad char */ 0, /* escape_with_backslash_is_dangerous */ &my_charset_ucs2_handler, &my_collation_ucs2_uca_handler @@ -8538,6 +8554,7 @@ 2, /* mbmaxlen */ 9, /* min_sort_char */ 0xFFFF, /* max_sort_char */ + ' ', /* pad char */ 0, /* escape_with_backslash_is_dangerous */ &my_charset_ucs2_handler, &my_collation_ucs2_uca_handler @@ -8570,6 +8587,7 @@ 2, /* mbmaxlen */ 9, /* min_sort_char */ 0xFFFF, /* max_sort_char */ + ' ', /* pad char */ 0, /* escape_with_backslash_is_dangerous */ &my_charset_ucs2_handler, &my_collation_ucs2_uca_handler @@ -8602,6 +8620,7 @@ 2, /* mbmaxlen */ 9, /* min_sort_char */ 0xFFFF, /* max_sort_char */ + ' ', /* pad char */ 0, /* escape_with_backslash_is_dangerous */ &my_charset_ucs2_handler, &my_collation_ucs2_uca_handler @@ -8681,6 +8700,7 @@ 3, /* mbmaxlen */ 9, /* min_sort_char */ 0xFFFF, /* max_sort_char */ + ' ', /* pad char */ 0, /* escape_with_backslash_is_dangerous */ &my_charset_utf8_handler, &my_collation_any_uca_handler @@ -8713,6 +8733,7 @@ 3, /* mbmaxlen */ 9, /* min_sort_char */ 0xFFFF, /* max_sort_char */ + ' ', /* pad char */ 0, /* escape_with_backslash_is_dangerous */ &my_charset_utf8_handler, &my_collation_any_uca_handler @@ -8744,6 +8765,7 @@ 3, /* mbmaxlen */ 9, /* min_sort_char */ 0xFFFF, /* max_sort_char */ + ' ', /* pad char */ 0, /* escape_with_backslash_is_dangerous */ &my_charset_utf8_handler, &my_collation_any_uca_handler @@ -8775,6 +8797,7 @@ 3, /* mbmaxlen */ 9, /* min_sort_char */ 0xFFFF, /* max_sort_char */ + ' ', /* pad char */ 0, /* escape_with_backslash_is_dangerous */ &my_charset_utf8_handler, &my_collation_any_uca_handler @@ -8806,6 +8829,7 @@ 3, /* mbmaxlen */ 9, /* min_sort_char */ 0xFFFF, /* max_sort_char */ + ' ', /* pad char */ 0, /* escape_with_backslash_is_dangerous */ &my_charset_utf8_handler, &my_collation_any_uca_handler @@ -8837,6 +8861,7 @@ 3, /* mbmaxlen */ 9, /* min_sort_char */ 0xFFFF, /* max_sort_char */ + ' ', /* pad char */ 0, /* escape_with_backslash_is_dangerous */ &my_charset_utf8_handler, &my_collation_any_uca_handler @@ -8868,6 +8893,7 @@ 3, /* mbmaxlen */ 9, /* min_sort_char */ 0xFFFF, /* max_sort_char */ + ' ', /* pad char */ 0, /* escape_with_backslash_is_dangerous */ &my_charset_utf8_handler, &my_collation_any_uca_handler @@ -8899,6 +8925,7 @@ 3, /* mbmaxlen */ 9, /* min_sort_char */ 0xFFFF, /* max_sort_char */ + ' ', /* pad char */ 0, /* escape_with_backslash_is_dangerous */ &my_charset_utf8_handler, &my_collation_any_uca_handler @@ -8930,6 +8957,7 @@ 3, /* mbmaxlen */ 9, /* min_sort_char */ 0xFFFF, /* max_sort_char */ + ' ', /* pad char */ 0, /* escape_with_backslash_is_dangerous */ &my_charset_utf8_handler, &my_collation_any_uca_handler @@ -8961,6 +8989,7 @@ 3, /* mbmaxlen */ 9, /* min_sort_char */ 0xFFFF, /* max_sort_char */ + ' ', /* pad char */ 0, /* escape_with_backslash_is_dangerous */ &my_charset_utf8_handler, &my_collation_any_uca_handler @@ -8992,6 +9021,7 @@ 3, /* mbmaxlen */ 9, /* min_sort_char */ 0xFFFF, /* max_sort_char */ + ' ', /* pad char */ 0, /* escape_with_backslash_is_dangerous */ &my_charset_utf8_handler, &my_collation_any_uca_handler @@ -9024,6 +9054,7 @@ 3, /* mbmaxlen */ 9, /* min_sort_char */ 0xFFFF, /* max_sort_char */ + ' ', /* pad char */ 0, /* escape_with_backslash_is_dangerous */ &my_charset_utf8_handler, &my_collation_any_uca_handler @@ -9055,6 +9086,7 @@ 3, /* mbmaxlen */ 9, /* min_sort_char */ 0xFFFF, /* max_sort_char */ + ' ', /* pad char */ 0, /* escape_with_backslash_is_dangerous */ &my_charset_utf8_handler, &my_collation_any_uca_handler @@ -9086,6 +9118,7 @@ 3, /* mbmaxlen */ 9, /* min_sort_char */ 0xFFFF, /* max_sort_char */ + ' ', /* pad char */ 0, /* escape_with_backslash_is_dangerous */ &my_charset_utf8_handler, &my_collation_any_uca_handler @@ -9117,6 +9150,7 @@ 3, /* mbmaxlen */ 9, /* min_sort_char */ 0xFFFF, /* max_sort_char */ + ' ', /* pad char */ 0, /* escape_with_backslash_is_dangerous */ &my_charset_utf8_handler, &my_collation_any_uca_handler @@ -9148,6 +9182,7 @@ 3, /* mbmaxlen */ 9, /* min_sort_char */ 0xFFFF, /* max_sort_char */ + ' ', /* pad char */ 0, /* escape_with_backslash_is_dangerous */ &my_charset_utf8_handler, &my_collation_any_uca_handler @@ -9179,6 +9214,7 @@ 3, /* mbmaxlen */ 9, /* min_sort_char */ 0xFFFF, /* max_sort_char */ + ' ', /* pad char */ 0, /* escape_with_backslash_is_dangerous */ &my_charset_utf8_handler, &my_collation_any_uca_handler @@ -9210,6 +9246,7 @@ 3, /* mbmaxlen */ 9, /* min_sort_char */ 0xFFFF, /* max_sort_char */ + ' ', /* pad char */ 0, /* escape_with_backslash_is_dangerous */ &my_charset_utf8_handler, &my_collation_any_uca_handler --- 1.11/mysql-test/r/ctype_many.result 2005-01-14 23:28:58 +04:00 +++ 1.12/mysql-test/r/ctype_many.result 2005-10-13 19:12:20 +05:00 @@ -340,7 +340,7 @@ CYR CAPIT E CYR CAPIT YU CYR CAPIT YA -ALTER TABLE t1 ADD bin_f CHAR(32) BYTE NOT NULL default ''; +ALTER TABLE t1 ADD bin_f CHAR(1) BYTE NOT NULL default ''; UPDATE t1 SET bin_f=koi8_ru_f; SELECT COUNT(DISTINCT bin_f),COUNT(DISTINCT koi8_ru_f),COUNT(DISTINCT utf8_f) FROM t1; COUNT(DISTINCT bin_f) COUNT(DISTINCT koi8_ru_f) COUNT(DISTINCT utf8_f) @@ -1331,146 +1331,146 @@ UPDATE t1 SET armscii8_f=CONVERT(ucs2_f USING armscii8) WHERE comment LIKE _latin2'ARM%'; UPDATE t1 SET utf8_f=CONVERT(ucs2_f USING utf8) WHERE utf8_f=_utf8''; UPDATE t1 SET ucs2_f=CONVERT(utf8_f USING ucs2) WHERE ucs2_f=_ucs2''; -SELECT * FROM t1; -comment koi8_ru_f utf8_f bin_f ucs2_f armscii8_f greek_f -LAT SMALL A a a a a -LAT SMALL B b b b b -LAT SMALL C c c c c -LAT SMALL D d d d d -LAT SMALL E e e e e -LAT SMALL F f f f f -LAT SMALL G g g g g -LAT SMALL H h h h h -LAT SMALL I i i i i -LAT SMALL J j j j j -LAT SMALL K k k k k -LAT SMALL L l l l l -LAT SMALL M m m m m -LAT SMALL N n n n n -LAT SMALL O o o o o -LAT SMALL P p p p p -LAT SMALL Q q q q q -LAT SMALL R r r r r -LAT SMALL S s s s s -LAT SMALL T t t t t -LAT SMALL U u u u u -LAT SMALL V v v v v -LAT SMALL W w w w w -LAT SMALL X x x x x -LAT SMALL Y y y y y -LAT SMALL Z z z z z -LAT CAPIT A A A A A -LAT CAPIT B B B B B -LAT CAPIT C C C C C -LAT CAPIT D D D D D -LAT CAPIT E E E E E -LAT CAPIT F F F F F -LAT CAPIT G G G G G -LAT CAPIT H H H H H -LAT CAPIT I I I I I -LAT CAPIT J J J J J -LAT CAPIT K K K K K -LAT CAPIT L L L L L -LAT CAPIT M M M M M -LAT CAPIT N N N N N -LAT CAPIT O O O O O -LAT CAPIT P P P P P -LAT CAPIT Q Q Q Q Q -LAT CAPIT R R R R R -LAT CAPIT S S S S S -LAT CAPIT T T T T T -LAT CAPIT U U U U U -LAT CAPIT V V V V V -LAT CAPIT W W W W W -LAT CAPIT X X X X X -LAT CAPIT Y Y Y Y Y -LAT CAPIT Z Z Z Z Z -CYR SMALL A а а а -CYR SMALL BE б б б -CYR SMALL VE в в в -CYR SMALL GE г г г -CYR SMALL DE д д д -CYR SMALL IE е е е -CYR SMALL IO ё ё £ ё -CYR SMALL ZHE ж ж ж -CYR SMALL ZE з з з -CYR SMALL I и и и -CYR SMALL KA к к к -CYR SMALL EL л л л -CYR SMALL EM м м м -CYR SMALL EN н н н -CYR SMALL O о о о -CYR SMALL PE п п п -CYR SMALL ER р р р -CYR SMALL ES с с с -CYR SMALL TE т т т -CYR SMALL U у у у -CYR SMALL EF ф ф ф -CYR SMALL HA х х х -CYR SMALL TSE ц ц ц -CYR SMALL CHE ч ч ч -CYR SMALL SHA ш ш ш -CYR SMALL SCHA щ щ щ -CYR SMALL HARD SIGN ъ ъ ъ -CYR SMALL YERU ы ы ы -CYR SMALL SOFT SIGN ь ь ь -CYR SMALL E э э э -CYR SMALL YU ю ю ю -CYR SMALL YA я я я -CYR CAPIT A А А А -CYR CAPIT BE Б Б Б -CYR CAPIT VE В В В -CYR CAPIT GE Г Г Г -CYR CAPIT DE Д Д Д -CYR CAPIT IE Е Е Е -CYR CAPIT IO Ё Ё ³ Ё -CYR CAPIT ZHE Ж Ж Ж -CYR CAPIT ZE З З З -CYR CAPIT I И И И -CYR CAPIT KA К К К -CYR CAPIT EL Л Л Л -CYR CAPIT EM М М М -CYR CAPIT EN Н Н Н -CYR CAPIT O О О О -CYR CAPIT PE П П П -CYR CAPIT ER Р Р Р -CYR CAPIT ES С С С -CYR CAPIT TE Т Т Т -CYR CAPIT U У У У -CYR CAPIT EF Ф Ф Ф -CYR CAPIT HA Х Х Х -CYR CAPIT TSE Ц Ц Ц -CYR CAPIT CHE Ч Ч þ Ч -CYR CAPIT SHA Ш Ш Ш -CYR CAPIT SCHA Щ Щ Щ -CYR CAPIT HARD SIGN Ъ Ъ ÿ Ъ -CYR CAPIT YERU Ы Ы Ы -CYR CAPIT SOFT SIGN Ь Ь Ь -CYR CAPIT E Э Э Э -CYR CAPIT YU Ю Ю Ю -CYR CAPIT YA Я Я Я -GREEK CAPIT ALPHA Α Α Α -GREEK CAPIT BETA Β Β Β -GREEK CAPIT GAMMA Γ Γ Γ -GREEK CAPIT DELTA Δ Δ Δ -GREEK CAPIT EPSILON Ε Ε Ε -GREEK SMALL ALPHA α α α -GREEK SMALL BETA β β β -GREEK SMALL GAMMA γ γ γ -GREEK SMALL DELTA δ δ δ -GREEK SMALL EPSILON ε ε ε -ARMENIAN CAPIT AYB Ա Ա Ա -ARMENIAN CAPIT BEN Բ Բ Բ -ARMENIAN CAPIT GIM Գ Գ Գ -ARMENIAN CAPIT DA Դ Դ Դ -ARMENIAN CAPIT ECH Ե Ե Ե -ARMENIAN CAPIT ZA Զ Զ Զ -ARMENIAN SMALL YAB ա ա ա -ARMENIAN SMALL BEN բ բ բ -ARMENIAN SMALL GIM գ գ գ -ARMENIAN SMALL DA դ դ դ -ARMENIAN SMALL ECH ե ե ե -ARMENIAN SMALL ZA զ զ զ +SELECT comment, koi8_ru_f, utf8_f, hex(bin_f), ucs2_f, armscii8_f, greek_f FROM t1; +comment koi8_ru_f utf8_f hex(bin_f) ucs2_f armscii8_f greek_f +LAT SMALL A a a 61 a +LAT SMALL B b b 62 b +LAT SMALL C c c 63 c +LAT SMALL D d d 64 d +LAT SMALL E e e 65 e +LAT SMALL F f f 66 f +LAT SMALL G g g 67 g +LAT SMALL H h h 68 h +LAT SMALL I i i 69 i +LAT SMALL J j j 6A j +LAT SMALL K k k 6B k +LAT SMALL L l l 6C l +LAT SMALL M m m 6D m +LAT SMALL N n n 6E n +LAT SMALL O o o 6F o +LAT SMALL P p p 70 p +LAT SMALL Q q q 71 q +LAT SMALL R r r 72 r +LAT SMALL S s s 73 s +LAT SMALL T t t 74 t +LAT SMALL U u u 75 u +LAT SMALL V v v 76 v +LAT SMALL W w w 77 w +LAT SMALL X x x 78 x +LAT SMALL Y y y 79 y +LAT SMALL Z z z 7A z +LAT CAPIT A A A 41 A +LAT CAPIT B B B 42 B +LAT CAPIT C C C 43 C +LAT CAPIT D D D 44 D +LAT CAPIT E E E 45 E +LAT CAPIT F F F 46 F +LAT CAPIT G G G 47 G +LAT CAPIT H H H 48 H +LAT CAPIT I I I 49 I +LAT CAPIT J J J 4A J +LAT CAPIT K K K 4B K +LAT CAPIT L L L 4C L +LAT CAPIT M M M 4D M +LAT CAPIT N N N 4E N +LAT CAPIT O O O 4F O +LAT CAPIT P P P 50 P +LAT CAPIT Q Q Q 51 Q +LAT CAPIT R R R 52 R +LAT CAPIT S S S 53 S +LAT CAPIT T T T 54 T +LAT CAPIT U U U 55 U +LAT CAPIT V V V 56 V +LAT CAPIT W W W 57 W +LAT CAPIT X X X 58 X +LAT CAPIT Y Y Y 59 Y +LAT CAPIT Z Z Z 5A Z +CYR SMALL A а а C1 а +CYR SMALL BE б б C2 б +CYR SMALL VE в в D7 в +CYR SMALL GE г г C7 г +CYR SMALL DE д д C4 д +CYR SMALL IE е е C5 е +CYR SMALL IO ё ё A3 ё +CYR SMALL ZHE ж ж D6 ж +CYR SMALL ZE з з DA з +CYR SMALL I и и C9 и +CYR SMALL KA к к CB к +CYR SMALL EL л л CC л +CYR SMALL EM м м CD м +CYR SMALL EN н н CE н +CYR SMALL O о о CF о +CYR SMALL PE п п D0 п +CYR SMALL ER р р D2 р +CYR SMALL ES с с D3 с +CYR SMALL TE т т D4 т +CYR SMALL U у у D5 у +CYR SMALL EF ф ф C6 ф +CYR SMALL HA х х C8 х +CYR SMALL TSE ц ц C3 ц +CYR SMALL CHE ч ч DE ч +CYR SMALL SHA ш ш DB ш +CYR SMALL SCHA щ щ DD щ +CYR SMALL HARD SIGN ъ ъ DF ъ +CYR SMALL YERU ы ы D9 ы +CYR SMALL SOFT SIGN ь ь D8 ь +CYR SMALL E э э DC э +CYR SMALL YU ю ю C0 ю +CYR SMALL YA я я D1 я +CYR CAPIT A А А E1 А +CYR CAPIT BE Б Б E2 Б +CYR CAPIT VE В В F7 В +CYR CAPIT GE Г Г E7 Г +CYR CAPIT DE Д Д E4 Д +CYR CAPIT IE Е Е E5 Е +CYR CAPIT IO Ё Ё B3 Ё +CYR CAPIT ZHE Ж Ж F6 Ж +CYR CAPIT ZE З З FA З +CYR CAPIT I И И E9 И +CYR CAPIT KA К К EB К +CYR CAPIT EL Л Л EC Л +CYR CAPIT EM М М ED М +CYR CAPIT EN Н Н EE Н +CYR CAPIT O О О EF О +CYR CAPIT PE П П F0 П +CYR CAPIT ER Р Р F2 Р +CYR CAPIT ES С С F3 С +CYR CAPIT TE Т Т F4 Т +CYR CAPIT U У У F5 У +CYR CAPIT EF Ф Ф E6 Ф +CYR CAPIT HA Х Х E8 Х +CYR CAPIT TSE Ц Ц E3 Ц +CYR CAPIT CHE Ч Ч FE Ч +CYR CAPIT SHA Ш Ш FB Ш +CYR CAPIT SCHA Щ Щ FD Щ +CYR CAPIT HARD SIGN Ъ Ъ FF Ъ +CYR CAPIT YERU Ы Ы F9 Ы +CYR CAPIT SOFT SIGN Ь Ь F8 Ь +CYR CAPIT E Э Э FC Э +CYR CAPIT YU Ю Ю E0 Ю +CYR CAPIT YA Я Я F1 Я +GREEK CAPIT ALPHA Α 00 Α Α +GREEK CAPIT BETA Β 00 Β Β +GREEK CAPIT GAMMA Γ 00 Γ Γ +GREEK CAPIT DELTA Δ 00 Δ Δ +GREEK CAPIT EPSILON Ε 00 Ε Ε +GREEK SMALL ALPHA α 00 α α +GREEK SMALL BETA β 00 β β +GREEK SMALL GAMMA γ 00 γ γ +GREEK SMALL DELTA δ 00 δ δ +GREEK SMALL EPSILON ε 00 ε ε +ARMENIAN CAPIT AYB Ա 00 Ա Ա +ARMENIAN CAPIT BEN Բ 00 Բ Բ +ARMENIAN CAPIT GIM Գ 00 Գ Գ +ARMENIAN CAPIT DA Դ 00 Դ Դ +ARMENIAN CAPIT ECH Ե 00 Ե Ե +ARMENIAN CAPIT ZA Զ 00 Զ Զ +ARMENIAN SMALL YAB ա 00 ա ա +ARMENIAN SMALL BEN բ 00 բ բ +ARMENIAN SMALL GIM գ 00 գ գ +ARMENIAN SMALL DA դ 00 դ դ +ARMENIAN SMALL ECH ե 00 ե ե +ARMENIAN SMALL ZA զ 00 զ զ SET CHARACTER SET 'binary'; SELECT * FROM t1; comment koi8_ru_f utf8_f bin_f ucs2_f armscii8_f greek_f @@ -1590,28 +1590,28 @@ CYR CAPIT E Э - CYR CAPIT YU Ю . CYR CAPIT YA Я / -GREEK CAPIT ALPHA Α -GREEK CAPIT BETA Β -GREEK CAPIT GAMMA Γ -GREEK CAPIT DELTA Δ -GREEK CAPIT EPSILON Ε -GREEK SMALL ALPHA α ± -GREEK SMALL BETA β ² -GREEK SMALL GAMMA γ ³ -GREEK SMALL DELTA δ ´ -GREEK SMALL EPSILON ε µ -ARMENIAN CAPIT AYB Ա 1 ² -ARMENIAN CAPIT BEN Բ 2 ´ -ARMENIAN CAPIT GIM Գ 3 ¶ -ARMENIAN CAPIT DA Դ 4 ¸ -ARMENIAN CAPIT ECH Ե 5 º -ARMENIAN CAPIT ZA Զ 6 ¼ -ARMENIAN SMALL YAB ա a ³ -ARMENIAN SMALL BEN բ b µ -ARMENIAN SMALL GIM գ c · -ARMENIAN SMALL DA դ d ¹ -ARMENIAN SMALL ECH ե e » -ARMENIAN SMALL ZA զ f ½ +GREEK CAPIT ALPHA Α +GREEK CAPIT BETA Β +GREEK CAPIT GAMMA Γ +GREEK CAPIT DELTA Δ +GREEK CAPIT EPSILON Ε +GREEK SMALL ALPHA α +GREEK SMALL BETA β +GREEK SMALL GAMMA γ +GREEK SMALL DELTA δ +GREEK SMALL EPSILON ε +ARMENIAN CAPIT AYB Ա +ARMENIAN CAPIT BEN Բ +ARMENIAN CAPIT GIM Գ +ARMENIAN CAPIT DA Դ +ARMENIAN CAPIT ECH Ե +ARMENIAN CAPIT ZA Զ +ARMENIAN SMALL YAB ա +ARMENIAN SMALL BEN բ +ARMENIAN SMALL GIM գ +ARMENIAN SMALL DA դ +ARMENIAN SMALL ECH ե +ARMENIAN SMALL ZA զ SELECT min(comment),count(*) FROM t1 GROUP BY ucs2_f; min(comment) count(*) LAT CAPIT A 2 --- 1.64/strings/ctype-bin.c 2005-08-19 23:55:21 +05:00 +++ 1.65/strings/ctype-bin.c 2005-10-13 19:09:11 +05:00 @@ -86,6 +86,14 @@ } +uint my_lengthsp_binary(CHARSET_INFO *cs __attribute__((unused)), + const char *ptr __attribute__((unused)), + uint length) +{ + return length; +} + + /* Compare two strings. Result is sign(first_argument - second_argument) @@ -365,14 +373,29 @@ } +uint my_strnxfrmlen_bin(CHARSET_INFO *cs __attribute__((unused)), uint len) +{ + return len + 2; +} + + static int my_strnxfrm_bin(CHARSET_INFO *cs __attribute__((unused)), uchar * dest, uint dstlen, const uchar *src, uint srclen) { if (dest != src) memcpy(dest, src, min(dstlen,srclen)); - if (dstlen > srclen) + + if (dstlen >= srclen + 2) + { + if (dstlen > srclen + 2) + bfill(dest + srclen, dstlen - srclen - 2, 0); + dest[dstlen-2]= srclen >> 8; + dest[dstlen-1]= srclen & 0xFF; + } + else if (dstlen > srclen) bfill(dest + srclen, dstlen - srclen, 0); + return dstlen; } @@ -473,7 +496,7 @@ my_strnncoll_binary, my_strnncollsp_binary, my_strnxfrm_bin, - my_strnxfrmlen_simple, + my_strnxfrmlen_bin, my_like_range_simple, my_wildcmp_bin, my_strcasecmp_bin, @@ -491,7 +514,7 @@ my_numchars_8bit, my_charpos_8bit, my_well_formed_len_8bit, - my_lengthsp_8bit, + my_lengthsp_binary, my_numcells_8bit, my_mb_wc_bin, my_wc_mb_bin, @@ -516,7 +539,7 @@ CHARSET_INFO my_charset_bin = { 63,0,0, /* number */ - MY_CS_COMPILED|MY_CS_BINSORT|MY_CS_PRIMARY,/* state */ + MY_CS_COMPILED|MY_CS_BINSORT|MY_CS_PRIMARY|MY_CS_STRNXFRM,/* state */ "binary", /* cs name */ "binary", /* name */ "", /* comment */ @@ -539,6 +562,7 @@ 1, /* mbmaxlen */ 0, /* min_sort_char */ 255, /* max_sort_char */ + 0, /* pad char */ 0, /* escape_with_backslash_is_dangerous */ &my_charset_handler, &my_collation_binary_handler --- 1.19/strings/ctype-extra.c 2005-08-19 23:55:21 +05:00 +++ 1.20/strings/ctype-extra.c 2005-10-13 19:09:59 +05:00 @@ -43,6 +43,7 @@ 0, /* mbmaxlen */ 0, /* min_sort_ord */ 0, /* max_sort_ord */ + ' ', /* pad char */ 0, /* escape_with_backslash_is_dangerous */ NULL, /* cset handler */ NULL /* coll handler */ --- 1.46/strings/ctype-latin1.c 2005-08-19 23:55:21 +05:00 +++ 1.47/strings/ctype-latin1.c 2005-10-13 19:10:03 +05:00 @@ -441,6 +441,7 @@ 1, /* mbmaxlen */ 0, /* min_sort_char */ 255, /* max_sort_char */ + ' ', /* pad char */ 0, /* escape_with_backslash_is_dangerous */ &my_charset_handler, &my_collation_8bit_simple_ci_handler @@ -740,6 +741,7 @@ 1, /* mbmaxlen */ 0, /* min_sort_char */ 247, /* max_sort_char */ + ' ', /* pad char */ 0, /* escape_with_backslash_is_dangerous */ &my_charset_handler, &my_collation_german2_ci_handler @@ -772,6 +774,7 @@ 1, /* mbmaxlen */ 0, /* min_sort_char */ 255, /* max_sort_char */ + ' ', /* pad char */ 0, /* escape_with_backslash_is_dangerous */ &my_charset_handler, &my_collation_8bit_bin_handler --- 1.55/strings/ctype-ucs2.c 2005-10-06 17:36:56 +05:00 +++ 1.56/strings/ctype-ucs2.c 2005-10-13 19:10:11 +05:00 @@ -1623,6 +1623,7 @@ 2, /* mbmaxlen */ 0, /* min_sort_char */ 0xFFFF, /* max_sort_char */ + ' ', /* pad char */ 0, /* escape_with_backslash_is_dangerous */ &my_charset_ucs2_handler, &my_collation_ucs2_general_ci_handler @@ -1654,6 +1655,7 @@ 2, /* mbmaxlen */ 0, /* min_sort_char */ 0xFFFF, /* max_sort_char */ + ' ', /* pad char */ 0, /* escape_with_backslash_is_dangerous */ &my_charset_ucs2_handler, &my_collation_ucs2_bin_handler --- 1.21/mysql-test/t/ctype_many.test 2005-07-28 18:12:32 +05:00 +++ 1.22/mysql-test/t/ctype_many.test 2005-10-13 19:11:34 +05:00 @@ -148,7 +148,7 @@ SELECT * FROM t1; -ALTER TABLE t1 ADD bin_f CHAR(32) BYTE NOT NULL default ''; +ALTER TABLE t1 ADD bin_f CHAR(1) BYTE NOT NULL default ''; UPDATE t1 SET bin_f=koi8_ru_f; SELECT COUNT(DISTINCT bin_f),COUNT(DISTINCT koi8_ru_f),COUNT(DISTINCT utf8_f) FROM t1; @@ -204,7 +204,7 @@ UPDATE t1 SET armscii8_f=CONVERT(ucs2_f USING armscii8) WHERE comment LIKE _latin2'ARM%'; UPDATE t1 SET utf8_f=CONVERT(ucs2_f USING utf8) WHERE utf8_f=_utf8''; UPDATE t1 SET ucs2_f=CONVERT(utf8_f USING ucs2) WHERE ucs2_f=_ucs2''; -SELECT * FROM t1; +SELECT comment, koi8_ru_f, utf8_f, hex(bin_f), ucs2_f, armscii8_f, greek_f FROM t1; SET CHARACTER SET 'binary'; SELECT * FROM t1; SELECT min(comment),count(*) FROM t1 GROUP BY ucs2_f; --- 1.73/strings/ctype-simple.c 2005-10-06 17:36:55 +05:00 +++ 1.74/strings/ctype-simple.c 2005-10-13 19:10:05 +05:00 @@ -1316,6 +1316,7 @@ { cs->caseup_multiply= 1; cs->casedn_multiply= 1; + cs->pad_char= ' '; return create_fromuni(cs, alloc); } --- 1.96/strings/ctype-utf8.c 2005-08-19 23:55:22 +05:00 +++ 1.97/strings/ctype-utf8.c 2005-10-13 19:10:14 +05:00 @@ -2579,6 +2579,7 @@ 3, /* mbmaxlen */ 0, /* min_sort_char */ 0xFFFF, /* max_sort_char */ + ' ', /* pad char */ 0, /* escape_with_backslash_is_dangerous */ &my_charset_utf8_handler, &my_collation_ci_handler @@ -2611,6 +2612,7 @@ 3, /* mbmaxlen */ 0, /* min_sort_char */ 255, /* max_sort_char */ + ' ', /* pad char */ 0, /* escape_with_backslash_is_dangerous */ &my_charset_utf8_handler, &my_collation_mb_bin_handler @@ -2781,6 +2783,7 @@ 3, /* mbmaxlen */ 0, /* min_sort_char */ 255, /* max_sort_char */ + ' ', /* pad char */ 0, /* escape_with_backslash_is_dangerous */ &my_charset_utf8_handler, &my_collation_cs_handler --- 1.52/strings/ctype-win1250ch.c 2005-08-19 23:55:22 +05:00 +++ 1.53/strings/ctype-win1250ch.c 2005-10-13 19:10:16 +05:00 @@ -662,6 +662,7 @@ 1, /* mbmaxlen */ 0, /* min_sort_char */ 0, /* max_sort_char */ + ' ', /* pad char */ 0, /* escape_with_backslash_is_dangerous */ &my_charset_8bit_handler, &my_collation_czech_ci_handler --- New file --- +++ mysql-test/r/type_binary.result 05/10/13 19:15:46 create table t1 (s1 binary(3)); insert into t1 values (0x61), (0x6120), (0x612020); select hex(s1) from t1; hex(s1) 610000 612000 612020 drop table t1; create table t1 (s1 binary(2), s2 varbinary(2)); insert into t1 values (0x4100,0x4100); select length(concat('*',s1,'*',s2,'*')) from t1; length(concat('*',s1,'*',s2,'*')) 7 delete from t1; insert into t1 values (0x4120,0x4120); select length(concat('*',s1,'*',s2,'*')) from t1; length(concat('*',s1,'*',s2,'*')) 7 drop table t1; create table t1 (s1 varbinary(20), s2 varbinary(20)); show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `s1` varbinary(20) default NULL, `s2` varbinary(20) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 insert into t1 values (0x41,0x4100),(0x41,0x4120),(0x4100,0x4120); select hex(s1), hex(s2) from t1; hex(s1) hex(s2) 41 4100 41 4120 4100 4120 select count(*) from t1 where s1 < s2; count(*) 3 drop table t1; create table t1 (s1 varbinary(2), s2 varchar(1)); insert into t1 values (0x41,'a'), (0x4100,'b'), (0x41,'c'), (0x4100,'d'); select hex(s1),s2 from t1 order by s1,s2; hex(s1) s2 41 a 41 c 4100 b 4100 d drop table t1; create table t1 (s1 binary(2) primary key); insert into t1 values (0x01); insert into t1 values (0x0120); insert into t1 values (0x0100); ERROR 23000: Duplicate entry '' for key 1 select hex(s1) from t1 order by s1; hex(s1) 0100 0120 select hex(s1) from t1 where s1=0x01; hex(s1) select hex(s1) from t1 where s1=0x0120; hex(s1) 0120 select hex(s1) from t1 where s1=0x0100; hex(s1) 0100 select count(distinct s1) from t1; count(distinct s1) 2 alter table t1 drop primary key; select hex(s1) from t1 where s1=0x01; hex(s1) select hex(s1) from t1 where s1=0x0120; hex(s1) 0120 select hex(s1) from t1 where s1=0x0100; hex(s1) 0100 select count(distinct s1) from t1; count(distinct s1) 2 drop table t1; create table t1 (s1 varbinary(2) primary key); insert into t1 values (0x01); insert into t1 values (0x0120); insert into t1 values (0x0100); select hex(s1) from t1 order by s1; hex(s1) 01 0100 0120 select hex(s1) from t1 where s1=0x01; hex(s1) 01 select hex(s1) from t1 where s1=0x0120; hex(s1) 0120 select hex(s1) from t1 where s1=0x0100; hex(s1) 0100 select count(distinct s1) from t1; count(distinct s1) 3 alter table t1 drop primary key; select hex(s1) from t1 where s1=0x01; hex(s1) 01 select hex(s1) from t1 where s1=0x0120; hex(s1) 0120 select hex(s1) from t1 where s1=0x0100; hex(s1) 0100 select count(distinct s1) from t1; count(distinct s1) 3 drop table t1; --- New file --- +++ mysql-test/t/type_binary.test 05/10/13 19:15:41 # check 0x00 padding create table t1 (s1 binary(3)); insert into t1 values (0x61), (0x6120), (0x612020); select hex(s1) from t1; drop table t1; # check that 0x00 is not stripped in val_str create table t1 (s1 binary(2), s2 varbinary(2)); insert into t1 values (0x4100,0x4100); select length(concat('*',s1,'*',s2,'*')) from t1; delete from t1; insert into t1 values (0x4120,0x4120); select length(concat('*',s1,'*',s2,'*')) from t1; drop table t1; # check that trailing 0x00 and 0x20 do matter on comparison create table t1 (s1 varbinary(20), s2 varbinary(20)); show create table t1; insert into t1 values (0x41,0x4100),(0x41,0x4120),(0x4100,0x4120); select hex(s1), hex(s2) from t1; select count(*) from t1 where s1 < s2; drop table t1; # check that trailing 0x00 do matter on filesort create table t1 (s1 varbinary(2), s2 varchar(1)); insert into t1 values (0x41,'a'), (0x4100,'b'), (0x41,'c'), (0x4100,'d'); select hex(s1),s2 from t1 order by s1,s2; drop table t1; # check that 0x01 is padded to 0x0100 and thus we get a duplicate value create table t1 (s1 binary(2) primary key); insert into t1 values (0x01); insert into t1 values (0x0120); --error 1062 insert into t1 values (0x0100); select hex(s1) from t1 order by s1; # check index search select hex(s1) from t1 where s1=0x01; select hex(s1) from t1 where s1=0x0120; select hex(s1) from t1 where s1=0x0100; select count(distinct s1) from t1; alter table t1 drop primary key; # check non-indexed search select hex(s1) from t1 where s1=0x01; select hex(s1) from t1 where s1=0x0120; select hex(s1) from t1 where s1=0x0100; select count(distinct s1) from t1; drop table t1; # check that 0x01 is not padded, and all three values are unique create table t1 (s1 varbinary(2) primary key); insert into t1 values (0x01); insert into t1 values (0x0120); insert into t1 values (0x0100); select hex(s1) from t1 order by s1; # check index search select hex(s1) from t1 where s1=0x01; select hex(s1) from t1 where s1=0x0120; select hex(s1) from t1 where s1=0x0100; select count(distinct s1) from t1; alter table t1 drop primary key; # check non-indexed search select hex(s1) from t1 where s1=0x01; select hex(s1) from t1 where s1=0x0120; select hex(s1) from t1 where s1=0x0100; select count(distinct s1) from t1; drop table t1; --- 1.3/mysql-test/r/ndb_types.result 2005-04-02 01:14:04 +05:00 +++ 1.4/mysql-test/r/ndb_types.result 2005-10-13 19:12:30 +05:00 @@ -3,7 +3,7 @@ auto int(5) unsigned NOT NULL auto_increment, string char(10) default "hello", vstring varchar(10) default "hello", -bin binary(7), +bin binary(2), vbin varbinary(7), tiny tinyint(4) DEFAULT '0' NOT NULL , short smallint(6) DEFAULT '1' NOT NULL , --- 1.5/mysql-test/t/ndb_types.test 2005-07-28 18:12:35 +05:00 +++ 1.6/mysql-test/t/ndb_types.test 2005-10-13 19:11:45 +05:00 @@ -12,7 +12,7 @@ auto int(5) unsigned NOT NULL auto_increment, string char(10) default "hello", vstring varchar(10) default "hello", - bin binary(7), + bin binary(2), vbin varbinary(7), tiny tinyint(4) DEFAULT '0' NOT NULL , short smallint(6) DEFAULT '1' NOT NULL , --- 1.52/mysql-test/r/alter_table.result 2005-08-30 11:18:12 +05:00 +++ 1.53/mysql-test/r/alter_table.result 2005-10-13 19:12:12 +05:00 @@ -436,7 +436,7 @@ select a,hex(a) from t1; a hex(a) F2E5F1F2 -alter table t1 change a a binary(10); +alter table t1 change a a binary(4); select a,hex(a) from t1; a hex(a) F2E5F1F2 --- 1.19/mysql-test/r/binary.result 2004-11-16 12:05:08 +04:00 +++ 1.20/mysql-test/r/binary.result 2005-10-13 19:12:15 +05:00 @@ -85,7 +85,7 @@ select b from t1 having binary b like ''; b drop table t1; -create table t1 (a char(15) binary, b binary(15)); +create table t1 (a char(3) binary, b binary(3)); insert into t1 values ('aaa','bbb'),('AAA','BBB'); select upper(a),upper(b) from t1; upper(a) upper(b) --- 1.22/mysql-test/r/func_in.result 2005-09-24 03:39:47 +05:00 +++ 1.23/mysql-test/r/func_in.result 2005-10-13 19:12:24 +05:00 @@ -187,7 +187,7 @@ select 1 in ('1.1',2.0); 1 in ('1.1',2.0) 0 -create table t1 (a char(20) character set binary); +create table t1 (a char(2) character set binary); insert into t1 values ('aa'), ('bb'); select * from t1 where a in (NULL, 'aa'); a --- 1.47/mysql-test/r/type_blob.result 2005-07-01 15:03:41 +05:00 +++ 1.48/mysql-test/r/type_blob.result 2005-10-13 19:12:39 +05:00 @@ -67,7 +67,7 @@ a Where drop table t1; -create table t1 (t text,c char(10),b blob, d binary(10)); +create table t1 (t text,c char(10),b blob, d varbinary(10)); insert into t1 values (NULL,NULL,NULL,NULL); insert into t1 values ("","","",""); insert into t1 values ("hello","hello","hello","hello"); @@ -83,14 +83,14 @@ t text latin1_swedish_ci YES NULL # c char(10) latin1_swedish_ci YES NULL # b blob NULL YES NULL # -d binary(10) 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 # b blob NULL YES NULL # -d binary(10) NULL YES NULL # +d varbinary(10) NULL YES NULL # unlock tables; select t from t1 where t like "hello"; t --- 1.39/mysql-test/t/alter_table.test 2005-08-30 11:18:12 +05:00 +++ 1.40/mysql-test/t/alter_table.test 2005-10-13 19:11:04 +05:00 @@ -278,7 +278,7 @@ select a,hex(a) from t1; alter table t1 change a a char(10) character set cp1251; select a,hex(a) from t1; -alter table t1 change a a binary(10); +alter table t1 change a a binary(4); select a,hex(a) from t1; alter table t1 change a a char(10) character set cp1251; select a,hex(a) from t1; --- 1.14/mysql-test/t/binary.test 2005-07-28 05:21:39 +05:00 +++ 1.15/mysql-test/t/binary.test 2005-10-13 19:11:28 +05:00 @@ -56,7 +56,7 @@ # # Test of binary and upper/lower # -create table t1 (a char(15) binary, b binary(15)); +create table t1 (a char(3) binary, b binary(3)); insert into t1 values ('aaa','bbb'),('AAA','BBB'); select upper(a),upper(b) from t1; select lower(a),lower(b) from t1; --- 1.17/mysql-test/t/func_in.test 2005-09-24 03:35:27 +05:00 +++ 1.18/mysql-test/t/func_in.test 2005-10-13 19:11:39 +05:00 @@ -97,7 +97,7 @@ # Test case for bug #6365 -create table t1 (a char(20) character set binary); +create table t1 (a char(2) character set binary); insert into t1 values ('aa'), ('bb'); select * from t1 where a in (NULL, 'aa'); drop table t1; --- 1.29/mysql-test/t/type_blob.test 2005-07-28 19:09:48 +05:00 +++ 1.30/mysql-test/t/type_blob.test 2005-10-13 19:11:54 +05:00 @@ -67,9 +67,9 @@ drop table t1; # -# test of blob, text, char and char binary +# test of blob, text, char and varbinary # -create table t1 (t text,c char(10),b blob, d binary(10)); +create table t1 (t text,c char(10),b blob, d varbinary(10)); insert into t1 values (NULL,NULL,NULL,NULL); insert into t1 values ("","","",""); insert into t1 values ("hello","hello","hello","hello"); --- 1.33/mysql-test/r/cast.result 2005-09-28 16:29:09 +05:00 +++ 1.34/mysql-test/r/cast.result 2005-10-13 19:12:16 +05:00 @@ -231,7 +231,7 @@ `c5` varchar(2) character set utf8 NOT NULL default '' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; -create table t1 (a binary(10), b char(10) character set koi8r); +create table t1 (a binary(4), b char(4) character set koi8r); insert into t1 values (_binary'',_binary''); select a,b,cast(a as char character set cp1251),cast(b as binary) from t1; a b cast(a as char character set cp1251) cast(b as binary) --- 1.25/mysql-test/t/cast.test 2005-09-28 14:34:49 +05:00 +++ 1.26/mysql-test/t/cast.test 2005-10-13 19:11:30 +05:00 @@ -101,7 +101,7 @@ # Bug 2202 # CAST from BINARY to non-BINARY and from non-BINARY to BINARY # -create table t1 (a binary(10), b char(10) character set koi8r); +create table t1 (a binary(4), b char(4) character set koi8r); insert into t1 values (_binary'',_binary''); select a,b,cast(a as char character set cp1251),cast(b as binary) from t1; set names koi8r; --- 1.6/mysql-test/r/ctype_cp1251.result 2005-03-30 14:10:21 +05:00 +++ 1.7/mysql-test/r/ctype_cp1251.result 2005-10-13 19:12:18 +05:00 @@ -23,7 +23,7 @@ b c drop table t1; -create table t1 (a char(15) binary, b binary(15)) character set cp1251; +create table t1 (a char(3) binary, b binary(3)) character set cp1251; insert into t1 values ('aaa','bbb'),('AAA','BBB'); select upper(a),upper(b) from t1; upper(a) upper(b) --- 1.7/mysql-test/t/ctype_cp1251.test 2005-09-15 19:17:11 +05:00 +++ 1.8/mysql-test/t/ctype_cp1251.test 2005-10-13 19:11:32 +05:00 @@ -21,7 +21,7 @@ # # Test of binary and upper/lower # -create table t1 (a char(15) binary, b binary(15)) character set cp1251; +create table t1 (a char(3) binary, b binary(3)) character set cp1251; insert into t1 values ('aaa','bbb'),('AAA','BBB'); select upper(a),upper(b) from t1; select lower(a),lower(b) from t1; --- 1.31/scripts/mysql_fix_privilege_tables.sql 2005-09-27 15:10:10 +05:00 +++ 1.32/scripts/mysql_fix_privilege_tables.sql 2005-10-13 19:13:28 +05:00 @@ -158,7 +158,7 @@ MODIFY User char(16) NOT NULL default '', ENGINE=MyISAM, CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin; ALTER TABLE user - MODIFY Password binary(41) NOT NULL default '', + MODIFY Password char(41) character set latin1 collate latin1_bin NOT NULL default '', MODIFY Select_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, MODIFY Insert_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, MODIFY Update_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, --- 1.15/mysql-test/r/ndb_condition_pushdown.result 2005-08-01 00:33:20 +05:00 +++ 1.16/mysql-test/r/ndb_condition_pushdown.result 2005-10-13 19:12:28 +05:00 @@ -3,7 +3,7 @@ auto int(5) unsigned NOT NULL auto_increment, string char(10), vstring varchar(10), -bin binary(7), +bin binary(2), vbin varbinary(7), tiny tinyint(4) DEFAULT '0' NOT NULL , short smallint(6) DEFAULT '1' NOT NULL , --- 1.14/mysql-test/t/ndb_condition_pushdown.test 2005-06-01 14:56:27 +05:00 +++ 1.15/mysql-test/t/ndb_condition_pushdown.test 2005-10-13 19:11:43 +05:00 @@ -12,7 +12,7 @@ auto int(5) unsigned NOT NULL auto_increment, string char(10), vstring varchar(10), - bin binary(7), + bin binary(2), vbin varbinary(7), tiny tinyint(4) DEFAULT '0' NOT NULL , short smallint(6) DEFAULT '1' NOT NULL , --- 1.17/mysql-test/r/federated.result 2005-10-01 04:26:18 +05:00 +++ 1.18/mysql-test/r/federated.result 2005-10-13 19:12:22 +05:00 @@ -504,7 +504,7 @@ CREATE TABLE federated.t1 ( `id` int NOT NULL auto_increment, `name` char(32) NOT NULL DEFAULT '', -`bincol` binary(4) NOT NULL, +`bincol` binary(1) NOT NULL, `floatval` decimal(5,2) NOT NULL DEFAULT 0.0, `other` int NOT NULL DEFAULT 0, PRIMARY KEY (id), @@ -515,7 +515,7 @@ CREATE TABLE federated.t1 ( `id` int NOT NULL auto_increment, `name` char(32) NOT NULL DEFAULT '', -`bincol` binary(4) NOT NULL, +`bincol` binary(1) NOT NULL, `floatval` decimal(5,2) NOT NULL DEFAULT 0.0, `other` int NOT NULL DEFAULT 0, PRIMARY KEY (id), --- 1.14/mysql-test/t/federated.test 2005-10-01 04:26:18 +05:00 +++ 1.15/mysql-test/t/federated.test 2005-10-13 19:11:36 +05:00 @@ -348,7 +348,7 @@ CREATE TABLE federated.t1 ( `id` int NOT NULL auto_increment, `name` char(32) NOT NULL DEFAULT '', - `bincol` binary(4) NOT NULL, + `bincol` binary(1) NOT NULL, `floatval` decimal(5,2) NOT NULL DEFAULT 0.0, `other` int NOT NULL DEFAULT 0, PRIMARY KEY (id), @@ -363,7 +363,7 @@ eval CREATE TABLE federated.t1 ( `id` int NOT NULL auto_increment, `name` char(32) NOT NULL DEFAULT '', - `bincol` binary(4) NOT NULL, + `bincol` binary(1) NOT NULL, `floatval` decimal(5,2) NOT NULL DEFAULT 0.0, `other` int NOT NULL DEFAULT 0, PRIMARY KEY (id), --- 1.159/mysql-test/r/sp.result 2005-10-03 22:00:47 +05:00 +++ 1.160/mysql-test/r/sp.result 2005-10-13 19:12:35 +05:00 @@ -1916,7 +1916,7 @@ bug3788() 2005-03-04 drop function bug3788| -create function bug3788() returns binary(5) return 5| +create function bug3788() returns binary(1) return 5| select bug3788()| bug3788() 5 --- 1.155/mysql-test/t/sp.test 2005-10-03 22:00:49 +05:00 +++ 1.156/mysql-test/t/sp.test 2005-10-13 19:11:52 +05:00 @@ -2431,7 +2431,7 @@ select bug3788()| drop function bug3788| -create function bug3788() returns binary(5) return 5| +create function bug3788() returns binary(1) return 5| select bug3788()| drop function bug3788| --- 1.9/strings/ctype-cp932.c 2005-08-20 03:10:42 +05:00 +++ 1.10/strings/ctype-cp932.c 2005-10-13 19:09:49 +05:00 @@ -5522,6 +5522,7 @@ 2, /* mbmaxlen */ 0, /* min_sort_char */ 255, /* max_sort_char */ + ' ', /* pad char */ 1, /* escape_with_backslash_is_dangerous */ &my_charset_handler, &my_collation_ci_handler @@ -5553,6 +5554,7 @@ 2, /* mbmaxlen */ 0, /* min_sort_char */ 255, /* max_sort_char */ + ' ', /* pad char */ 1, /* escape_with_backslash_is_dangerous */ &my_charset_handler, &my_collation_mb_bin_handler --- 1.11/strings/ctype-eucjpms.c 2005-08-20 03:10:42 +05:00 +++ 1.12/strings/ctype-eucjpms.c 2005-10-13 19:09:57 +05:00 @@ -8708,6 +8708,7 @@ 3, /* mbmaxlen */ 0, /* min_sort_char */ 255, /* max_sort_char */ + ' ', /* pad_char */ 0, /* escape_with_backslash_is_dangerous */ &my_charset_handler, &my_collation_ci_handler @@ -8740,6 +8741,7 @@ 3, /* mbmaxlen */ 0, /* min_sort_char */ 255, /* max_sort_char */ + ' ', /* pad_char */ 0, /* escape_with_backslash_is_dangerous */ &my_charset_handler, &my_collation_mb_bin_handler --- 1.28/mysql-test/r/system_mysql_db.result 2005-09-27 23:10:55 +05:00 +++ 1.29/mysql-test/r/system_mysql_db.result 2005-10-13 19:12:37 +05:00 @@ -73,7 +73,7 @@ user CREATE TABLE `user` ( `Host` char(60) collate utf8_bin NOT NULL default '', `User` char(16) collate utf8_bin NOT NULL default '', - `Password` binary(41) NOT NULL default '', + `Password` char(41) character set latin1 collate latin1_bin NOT NULL default '', `Select_priv` enum('N','Y') character set utf8 NOT NULL default 'N', `Insert_priv` enum('N','Y') character set utf8 NOT NULL default 'N', `Update_priv` enum('N','Y') character set utf8 NOT NULL default 'N', --- 1.27/scripts/mysql_create_system_tables.sh 2005-09-27 15:10:10 +05:00 +++ 1.28/scripts/mysql_create_system_tables.sh 2005-10-13 19:13:02 +05:00 @@ -123,7 +123,7 @@ c_u="$c_u CREATE TABLE user (" c_u="$c_u Host char(60) binary DEFAULT '' NOT NULL," c_u="$c_u User char(16) binary DEFAULT '' NOT NULL," - c_u="$c_u Password binary(41) DEFAULT '' NOT NULL," + c_u="$c_u Password char(41) character set latin1 collate latin1_bin DEFAULT '' NOT NULL," c_u="$c_u Select_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL," c_u="$c_u Insert_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL," c_u="$c_u Update_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
| Thread | ||
|---|---|---|
| • bk commit into 5.0 tree (bar:1.2034) | bar | 13 Oct |
© 1995-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
Page generated in 0.865 sec. using MySQL 5.1.14-beta-log