Commit fffe5234 authored by unknown's avatar unknown
Browse files

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)
parent 60a569bd

sql/sql_base.cc

+1 −1
Original line number Diff line number Diff line
@@ -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;

    }

sql/sql_plugin.cc

+1 −0
Original line number Diff line number Diff line
@@ -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);

sql/sql_show.cc

+3 −3
Original line number Diff line number Diff line
@@ -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},