diff options
| author | unknown <marko@hundin.mysql.fi> | 2005-02-08 16:41:34 +0200 |
|---|---|---|
| committer | unknown <marko@hundin.mysql.fi> | 2005-02-08 16:41:34 +0200 |
| commit | edf5f0eca644b8e4c3f1099073e6da81abde0ed2 (patch) | |
| tree | 1d41c43c651ff0ac97e4022bf7e9181709da34e2 /innobase/include/row0mysql.h | |
| parent | 61e36a967b46dcc37d0cff1deaf9e775244fb756 (diff) | |
| download | mariadb-git-edf5f0eca644b8e4c3f1099073e6da81abde0ed2.tar.gz | |
InnoDB: Fix Bug #7350 without hard-coding charset-collation numbers.
innobase/data/data0type.c:
Add mbminlen and mbmaxlen to dtype_t
innobase/include/data0type.h:
Add mbminlen and mbmaxlen to dtype_t
Add dtype_get_mbminlen() and dtype_get_mbmaxlen()
innobase/include/data0type.ic:
Add dtype_set_mblen()
Add dtype_get_mbminlen() and dtype_get_mbmaxlen()
Replace innobase_is_mb_cset() with innobase_get_mb_cset()
innobase/include/row0mysql.h:
Add mbminlen and mbmaxlen
innobase/include/row0mysql.ic:
Detect UCS2 collations based on mbminlen
innobase/row/row0sel.c:
Detect UCS2 collations based on mbminlen
sql/ha_innodb.cc:
Replace innobase_is_mb_cset() with innobase_get_mb_cset()
build_template(): Initialize templ->mbminlen and templ->mbmaxlen
Diffstat (limited to 'innobase/include/row0mysql.h')
| -rw-r--r-- | innobase/include/row0mysql.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/innobase/include/row0mysql.h b/innobase/include/row0mysql.h index 2ef260829fc..7ffa6ebf87d 100644 --- a/innobase/include/row0mysql.h +++ b/innobase/include/row0mysql.h @@ -458,6 +458,10 @@ struct mysql_row_templ_struct { numbers DATA_CHAR... */ ulint charset; /* MySQL charset-collation code of the column, or zero */ + ulint mbminlen; /* minimum length of a char, in bytes, + or zero if not a char type */ + ulint mbmaxlen; /* maximum length of a char, in bytes, + or zero if not a char type */ ulint is_unsigned; /* if a column type is an integer type and this field is != 0, then it is an unsigned integer type */ |