database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge maint1.mysql.com:/data/localhome/tsmith/bk/maint/50

Browse Source 
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51


configure.in:
  Auto merged
include/m_ctype.h:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysys/charset-def.c:
  Auto merged
mysys/charset.c:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-gbk.c:
  Auto merged
strings/ctype-sjis.c:
  Auto merged
strings/ctype-uca.c:
  Auto merged
strings/ctype.c:
  Auto merged
mysql-test/r/innodb.result:
  Manual merge
mysql-test/r/multi_update.result:
  Manual merge
mysql-test/t/multi_update.test:
  Manual merge
sql/sql_update.cc:
  SCCS merged
This commit is contained in:
unknown
2007-06-21 20:55:37 +02:00
parent a1c0a4b45d 8ddf61d382
commit 2da92ead65
24 changed files with 906 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
strings/ctype.c
View File

@ -123,7 +123,7 @@ static struct my_cs_file_section_st * cs_file_sec(const char *attr, size_t len)
}
#define MY_CS_CSDESCR_SIZE 64
#define MY_CS_TAILORING_SIZE 128
#define MY_CS_TAILORING_SIZE 1024
typedef struct my_cs_file_info
{