diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2009-12-18 16:44:24 -0200 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2009-12-18 16:44:24 -0200 |
| commit | 61ae92889808c3c38c5e449e36fc30f89e8e3f23 (patch) | |
| tree | 8cb3e4210dd5da0c3cec217f0e5008ee9104715b /sql/sql_table.cc | |
| parent | f815246486444ca2dc5d408099439e1d973d3a7b (diff) | |
| parent | 06a1df91813ea2c39f7312bcf8af972c7e8a926f (diff) | |
| download | mariadb-git-61ae92889808c3c38c5e449e36fc30f89e8e3f23.tar.gz | |
Manual merge.
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 869ae42c98c..3b7354111ba 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -2575,7 +2575,7 @@ mysql_prepare_create_table(THD *thd, HA_CREATE_INFO *create_info, !(sql_field->charset= get_charset_by_csname(sql_field->charset->csname, MY_CS_BINSORT,MYF(0)))) { - char tmp[64]; + char tmp[65]; strmake(strmake(tmp, save_cs->csname, sizeof(tmp)-4), STRING_WITH_LEN("_bin")); my_error(ER_UNKNOWN_COLLATION, MYF(0), tmp); |