mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-02 05:05:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge mysql.com:/home/hf/mysql-5.0.mrg

Browse source 
into  mysql.com:/home/hf/mysql-5.1.mrg


include/m_ctype.h:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/type_enum.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/unireg.cc:
  Auto merged
strings/CHARSET_INFO.txt:
  Auto merged
strings/ctype-mb.c:
  Auto merged
strings/ctype-utf8.c:
  Auto merged
This commit is contained in:
unknown 2006-10-12 15:42:05 +05:00
commit 89d5a1a541
10 changed files with 234 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/m_ctype.h
View file

@ -120,6 +120,8 @@ enum my_lex_states
struct charset_info_st;
/* See strings/CHARSET_INFO.txt for information about this structure */
typedef struct my_collation_handler_st
{
my_bool (*init)(struct charset_info_st *, void *(*alloc)(uint));
@ -162,6 +164,7 @@ extern MY_COLLATION_HANDLER my_collation_8bit_simple_ci_handler;
extern MY_COLLATION_HANDLER my_collation_ucs2_uca_handler;
/* See strings/CHARSET_INFO.txt about information on this structure */
typedef struct my_charset_handler_st
{
my_bool (*init)(struct charset_info_st *, void *(*alloc)(uint));
@ -228,6 +231,7 @@ extern MY_CHARSET_HANDLER my_charset_8bit_handler;
extern MY_CHARSET_HANDLER my_charset_ucs2_handler;
/* See strings/CHARSET_INFO.txt about information on this structure */
typedef struct charset_info_st
{
uint number;