diff options
| author | unknown <msvensson@mysql.com> | 2006-06-06 14:48:15 +0300 |
|---|---|---|
| committer | unknown <msvensson@mysql.com> | 2006-06-06 14:48:15 +0300 |
| commit | fffe52346fc2902cb6fd772fc866987993fb2bae (patch) | |
| tree | 749be173e028124c233d721423b7612d487ff510 | |
| parent | 60a569bdca092ac957fccfbdb32dbfbf1a991485 (diff) | |
| download | mariadb-git-fffe52346fc2902cb6fd772fc866987993fb2bae.tar.gz | |
Re-apply missing changesets in 5.1
BUG#19544 mysqldump does not backup TS and LG information correctly.
Problem was the type of the column was varchar(8) not an integer type. So mysqld
was outputting a string representation of the number in scientific notation,
which wasn't exact. Now we do it as a bigint and output the number in bytes.
Fix assertion when loading plugins due to handler changes
sql/sql_base.cc:
manual merge (comment by igor)
sql/sql_plugin.cc:
Fix assertion when loading plugins due to handler changes (By jimw)
sql/sql_show.cc:
Correct type of I_S.FILES table columns: INITIAL_SIZE, MAXIMUM_SIZE and AUTOEXTEND_SIZE
so that they really are bigint and not varchar. (By stewart)
| -rw-r--r-- | sql/sql_base.cc | 2 | ||||
| -rw-r--r-- | sql/sql_plugin.cc | 1 | ||||
| -rw-r--r-- | sql/sql_show.cc | 6 |
3 files changed, 5 insertions, 4 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index cc79426d0ca..d21cfa4a240 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -5488,7 +5488,7 @@ bool get_key_map_from_key_list(key_map *map, TABLE *table, 0) { my_error(ER_KEY_COLUMN_DOES_NOT_EXITS, MYF(0), name->c_ptr(), - table->s->table_name.str); + table->pos_in_table_list->alias); map->set_all(); return 1; } diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc index f4bd65c20de..c15b484f448 100644 --- a/sql/sql_plugin.cc +++ b/sql/sql_plugin.cc @@ -843,6 +843,7 @@ my_bool mysql_install_plugin(THD *thd, LEX_STRING *name, LEX_STRING *dl) tmp->state= PLUGIN_IS_READY; + table->use_all_columns(); restore_record(table, s->default_values); table->field[0]->store(name->str, name->length, system_charset_info); table->field[1]->store(dl->str, dl->length, files_charset_info); diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 94a2922eb33..83f64e2c9c9 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -5448,9 +5448,9 @@ ST_FIELD_INFO files_fields_info[]= {"FREE_EXTENTS", 4, MYSQL_TYPE_LONG, 0, 0, 0}, {"TOTAL_EXTENTS", 4, MYSQL_TYPE_LONG, 0, 0, 0}, {"EXTENT_SIZE", 4, MYSQL_TYPE_LONG, 0, 0, 0}, - {"INITIAL_SIZE", 8, MYSQL_TYPE_LONGLONG, 0, 0, 0}, - {"MAXIMUM_SIZE", 8, MYSQL_TYPE_LONGLONG, 0, 0, 0}, - {"AUTOEXTEND_SIZE", 8, MYSQL_TYPE_LONGLONG, 0, 0, 0}, + {"INITIAL_SIZE", 21, MYSQL_TYPE_LONG, 0, 0, 0}, + {"MAXIMUM_SIZE", 21, MYSQL_TYPE_LONG, 0, 0, 0}, + {"AUTOEXTEND_SIZE", 21, MYSQL_TYPE_LONG, 0, 0, 0}, {"CREATION_TIME", 0, MYSQL_TYPE_TIMESTAMP, 0, 0, 0}, {"LAST_UPDATE_TIME", 0, MYSQL_TYPE_TIMESTAMP, 0, 0, 0}, {"LAST_ACCESS_TIME", 0, MYSQL_TYPE_TIMESTAMP, 0, 0, 0}, |