diff options
author | unknown <holyfoot/hf@mysql.com/deer.(none)> | 2006-10-12 13:50:22 +0500 |
---|---|---|
committer | unknown <holyfoot/hf@mysql.com/deer.(none)> | 2006-10-12 13:50:22 +0500 |
commit | bac62fa32e2bb89613948205950f140b622ebd15 (patch) | |
tree | 463e189f3d056f27e63df311f204f3cc1b4b0993 /sql/table.cc | |
parent | 4fc506529cf56789307241dd0c0b348f48ef5a71 (diff) | |
parent | 1ba54cad969fe85a4d1d21140f14ede105b40555 (diff) | |
download | mariadb-git-bac62fa32e2bb89613948205950f140b622ebd15.tar.gz |
Merge bk@192.168.21.1:mysql-4.1
into mysql.com:/home/hf/mysql-5.0.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/ctype-mb.c:
SCCS merged
strings/ctype-utf8.c:
SCCS merged
Diffstat (limited to 'sql/table.cc')
-rw-r--r-- | sql/table.cc | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/sql/table.cc b/sql/table.cc index 1886fdb0b82..61dce3e0c80 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -468,7 +468,21 @@ int openfrm(THD *thd, const char *name, const char *alias, uint db_stat, count))) goto err; for (count= 0; count < interval->count; count++) - interval->type_lengths[count]= strlen(interval->type_names[count]); + { + char *val= (char*) interval->type_names[count]; + interval->type_lengths[count]= strlen(val); + /* + Replace all ',' symbols with NAMES_SEP_CHAR. + See the comment in unireg.cc, pack_fields() function + for details. + */ + for (uint cnt= 0 ; cnt < interval->type_lengths[count] ; cnt++) + { + char c= val[cnt]; + if (c == ',') + val[cnt]= NAMES_SEP_CHAR; + } + } interval->type_lengths[count]= 0; } } |