diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-12-11 09:53:42 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-12-11 09:53:42 +0100 |
| commit | 2f20d297f8ea731d845bb220e680ad10c7a927bc (patch) | |
| tree | 9bd18ef1ab766422ba4c51b4ab189e259955a2d0 /sql/sql_table.cc | |
| parent | a629b5172e96c96c414fca70fffd64c80f2f7e8f (diff) | |
| parent | eb4f2e063c341d9f3644339c68cb01679e782001 (diff) | |
| download | mariadb-git-2f20d297f8ea731d845bb220e680ad10c7a927bc.tar.gz | |
Merge branch '10.0' into 10.1
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 c7471a85e8c..aaf423b7290 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -665,7 +665,7 @@ static bool read_ddl_log_file_entry(uint entry_no) bool error= FALSE; File file_id= global_ddl_log.file_id; uchar *file_entry_buf= (uchar*)global_ddl_log.file_entry_buf; - uint io_size= global_ddl_log.io_size; + size_t io_size= global_ddl_log.io_size; DBUG_ENTER("read_ddl_log_file_entry"); mysql_mutex_assert_owner(&LOCK_gdl); @@ -3101,8 +3101,7 @@ void promote_first_timestamp_column(List<Create_field> *column_definitions) @param key_info Key meta-data info. @param key_list List of existing keys. */ -static void check_duplicate_key(THD *thd, - Key *key, KEY *key_info, +static void check_duplicate_key(THD *thd, Key *key, KEY *key_info, List<Key> *key_list) { /* @@ -3164,14 +3163,11 @@ static void check_duplicate_key(THD *thd, // Report a warning if we have two identical keys. - DBUG_ASSERT(thd->lex->query_tables->alias); if (all_columns_are_identical) { push_warning_printf(thd, Sql_condition::WARN_LEVEL_NOTE, ER_DUP_INDEX, ER_THD(thd, ER_DUP_INDEX), - key_info->name, - thd->lex->query_tables->db, - thd->lex->query_tables->alias); + key_info->name); break; } } |