diff options
author | unknown <bar@bar.intranet.mysql.r18.ru> | 2006-10-03 16:00:09 +0500 |
---|---|---|
committer | unknown <bar@bar.intranet.mysql.r18.ru> | 2006-10-03 16:00:09 +0500 |
commit | bac017b0b5eb193017f118500f64f7e1b923a6c6 (patch) | |
tree | c5a7e46139bbb959fb88b34de786ab54fa761ac3 /strings/ctype-eucjpms.c | |
parent | 02e52e5063b99ac1151965acbe0314f480618200 (diff) | |
parent | 9207c4d8d3148ff1490a0ab9a2a00fec7e0c7550 (diff) | |
download | mariadb-git-bac017b0b5eb193017f118500f64f7e1b923a6c6.tar.gz |
After merge fix
BitKeeper/deleted/.del-ps_6bdb.result:
Auto merged
client/mysql.cc:
Auto merged
include/m_ctype.h:
Auto merged
mysql-test/r/cast.result:
Auto merged
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/r/ps.result:
Auto merged
mysql-test/r/ps_2myisam.result:
Auto merged
mysql-test/r/ps_3innodb.result:
Auto merged
mysql-test/r/ps_4heap.result:
Auto merged
mysql-test/r/ps_5merge.result:
Auto merged
mysql-test/r/ps_7ndb.result:
Auto merged
mysql-test/t/cast.test:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
mysql-test/t/strict.test:
Auto merged
sql/field_conv.cc:
Auto merged
sql/item_func.cc:
Auto merged
strings/ctype-big5.c:
Auto merged
strings/ctype-bin.c:
Auto merged
strings/ctype-cp932.c:
Auto merged
strings/ctype-euc_kr.c:
Auto merged
strings/ctype-eucjpms.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-ucs2.c:
Auto merged
strings/ctype-ujis.c:
Auto merged
strings/ctype-utf8.c:
Auto merged
Diffstat (limited to 'strings/ctype-eucjpms.c')
-rw-r--r-- | strings/ctype-eucjpms.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/strings/ctype-eucjpms.c b/strings/ctype-eucjpms.c index 0f59cc2b305..4d09bc0e01e 100644 --- a/strings/ctype-eucjpms.c +++ b/strings/ctype-eucjpms.c @@ -8678,6 +8678,7 @@ static MY_CHARSET_HANDLER my_charset_handler= my_strntoull_8bit, my_strntod_8bit, my_strtoll10_8bit, + my_strntoull10rnd_8bit, my_scan_8bit }; |