diff options
author | unknown <elliot@mysql.com> | 2005-08-19 15:29:30 -0400 |
---|---|---|
committer | unknown <elliot@mysql.com> | 2005-08-19 15:29:30 -0400 |
commit | e9c420ccf140112995ff47a03a9c41cb3b12f18f (patch) | |
tree | df0249492ecffbc91a5e3478685c8f1ad074a428 /strings/ctype-big5.c | |
parent | 141a36c31b9b9732a479f5b40a2ba35781418ad6 (diff) | |
parent | 1b970e94e0a736a2056cb94cfcba0b50133da1d6 (diff) | |
download | mariadb-git-e9c420ccf140112995ff47a03a9c41cb3b12f18f.tar.gz |
Merge mysql.com:/home/emurphy/src/bk-clean/mysql-4.1
into mysql.com:/home/emurphy/src/work/mysql-5.0
BitKeeper/deleted/.del-ctype-cp932.c:
Auto merged
BitKeeper/deleted/.del-ctype_cp932.result:
Auto merged
BitKeeper/deleted/.del-ctype_cp932.test:
Auto merged
include/m_ctype.h:
Auto merged
include/my_sys.h:
Auto merged
innobase/srv/srv0start.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysys/charset.c:
Auto merged
netware/BUILD/nwbootstrap:
Auto merged
sql/item.h:
Auto merged
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/sql_prepare.cc:
Auto merged
strings/ctype-big5.c:
Auto merged
strings/ctype-bin.c:
Auto merged
strings/ctype-czech.c:
Auto merged
strings/ctype-euc_kr.c:
Auto merged
strings/ctype-extra.c:
Auto merged
strings/ctype-gb2312.c:
Auto merged
strings/ctype-gbk.c:
Auto merged
strings/ctype-latin1.c:
Auto merged
strings/ctype-sjis.c:
Auto merged
strings/ctype-tis620.c:
Auto merged
strings/ctype-uca.c:
Auto merged
strings/ctype-ucs2.c:
Auto merged
strings/ctype-ujis.c:
Auto merged
strings/ctype-utf8.c:
Auto merged
strings/ctype-win1250ch.c:
Auto merged
configure.in:
Manual merge from 4.1
include/config-netware.h:
Manual merge from 4.1
sql/item.cc:
Manual merge from 4.1
sql/mysqld.cc:
Manual merge from 4.1
Diffstat (limited to 'strings/ctype-big5.c')
-rw-r--r-- | strings/ctype-big5.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/strings/ctype-big5.c b/strings/ctype-big5.c index 9ccbb149523..5069a1dc082 100644 --- a/strings/ctype-big5.c +++ b/strings/ctype-big5.c @@ -6399,6 +6399,7 @@ CHARSET_INFO my_charset_big5_chinese_ci= 2, /* mbmaxlen */ 0, /* min_sort_char */ 255, /* max_sort_char */ + 0, /* escape_with_backslash_is_dangerous */ &my_charset_big5_handler, &my_collation_big5_chinese_ci_handler }; @@ -6430,6 +6431,7 @@ CHARSET_INFO my_charset_big5_bin= 2, /* mbmaxlen */ 0, /* min_sort_char */ 255, /* max_sort_char */ + 0, /* escape_with_backslash_is_dangerous */ &my_charset_big5_handler, &my_collation_mb_bin_handler }; |