Commit f932d859 authored by Sinisa@sinisa.nasamreza.org's avatar Sinisa@sinisa.nasamreza.org

Merge sinisa@work.mysql.com:/home/bk/mysql-4.1

into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.1
parents d60316f1 6d043413
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -3148,8 +3148,8 @@ CHARSET_INFO compiled_charsets[] = { ...@@ -3148,8 +3148,8 @@ CHARSET_INFO compiled_charsets[] = {
ismbchar_gb2312, ismbchar_gb2312,
ismbhead_gb2312, ismbhead_gb2312,
mbcharlen_gb2312, mbcharlen_gb2312,
NULL, /* mb_wc */ my_mb_wc_gb2312, /* mb_wc */
NULL, /* wc_mb */ my_wc_mb_gb2312, /* wc_mb */
my_caseup_str_mb, my_caseup_str_mb,
my_casedn_str_mb, my_casedn_str_mb,
my_caseup_mb, my_caseup_mb,
...@@ -3178,8 +3178,8 @@ CHARSET_INFO compiled_charsets[] = { ...@@ -3178,8 +3178,8 @@ CHARSET_INFO compiled_charsets[] = {
ismbchar_gbk, ismbchar_gbk,
ismbhead_gbk, ismbhead_gbk,
mbcharlen_gbk, mbcharlen_gbk,
NULL, /* mb_wc */ my_mb_wc_gbk, /* mb_wc */
NULL, /* wc_mb */ my_wc_mb_gbk, /* wc_mb */
my_caseup_str_mb, my_caseup_str_mb,
my_casedn_str_mb, my_casedn_str_mb,
my_caseup_mb, my_caseup_mb,
...@@ -3508,8 +3508,8 @@ CHARSET_INFO compiled_charsets[] = { ...@@ -3508,8 +3508,8 @@ CHARSET_INFO compiled_charsets[] = {
ismbchar_sjis, ismbchar_sjis,
ismbhead_sjis, ismbhead_sjis,
mbcharlen_sjis, mbcharlen_sjis,
NULL, /* mb_wc */ my_mb_wc_sjis, /* mb_wc */
NULL, /* wc_mb */ my_wc_mb_sjis, /* wc_mb */
my_caseup_str_8bit, my_caseup_str_8bit,
my_casedn_str_8bit, my_casedn_str_8bit,
my_caseup_8bit, my_caseup_8bit,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment