diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-12-27 21:39:05 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-12-27 21:39:05 -0500 |
| commit | 901f7ebcf3aa45c99f82e655a8482c50f10b840e (patch) | |
| tree | 091845fdaadfeb3dbafaca03acec1fdeeffefead /sql/sql_table.cc | |
| parent | 5ddd8149e44122feb0989b9944113d2b92d6f84a (diff) | |
| parent | ec6d8dadc01269451332e5b24b12a5350a2a4896 (diff) | |
| download | mariadb-git-901f7ebcf3aa45c99f82e655a8482c50f10b840e.tar.gz | |
Merge tag 'mariadb-5.5.54' into 5.5-galeramariadb-galera-5.5.54
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index d5e3c1de124..ff080f79da9 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -684,7 +684,7 @@ static bool read_ddl_log_file_entry(uchar *file_entry_buf, DBUG_ENTER("read_ddl_log_file_entry"); DBUG_ASSERT(io_size >= size); - if (mysql_file_pread(file_id, file_entry_buf, size, io_size * entry_no, + if (mysql_file_pread(file_id, file_entry_buf, size, ((my_off_t)io_size) * entry_no, MYF(MY_WME)) != size) error= TRUE; DBUG_RETURN(error); @@ -3167,7 +3167,6 @@ mysql_prepare_create_table(THD *thd, HA_CREATE_INFO *create_info, sql_field->pack_length= dup_field->pack_length; sql_field->key_length= dup_field->key_length; sql_field->decimals= dup_field->decimals; - sql_field->create_length_to_internal_length(); sql_field->unireg_check= dup_field->unireg_check; /* We're making one field from two, the result field will have @@ -3177,6 +3176,7 @@ mysql_prepare_create_table(THD *thd, HA_CREATE_INFO *create_info, if (!(sql_field->flags & NOT_NULL_FLAG)) null_fields--; sql_field->flags= dup_field->flags; + sql_field->create_length_to_internal_length(); sql_field->interval= dup_field->interval; sql_field->vcol_info= dup_field->vcol_info; sql_field->stored_in_db= dup_field->stored_in_db; @@ -3312,12 +3312,8 @@ mysql_prepare_create_table(THD *thd, HA_CREATE_INFO *create_info, my_error(ER_TOO_MANY_KEY_PARTS,MYF(0),tmp); DBUG_RETURN(TRUE); } - if (check_string_char_length(&key->name, "", NAME_CHAR_LEN, - system_charset_info, 1)) - { - my_error(ER_TOO_LONG_IDENT, MYF(0), key->name.str); + if (check_ident_length(&key->name)) DBUG_RETURN(TRUE); - } key_iterator2.rewind (); if (key->type != Key::FOREIGN_KEY) { |