Commit c30d1cfd authored by unknown's avatar unknown

Fix for bug #14064: information_schema test fails on opnsrv6c.


sql/sql_show.cc:
  1. Use Field_longlong::store(longlong nr, bool unsigned_val) for ulonglong values
     instead of Field_longlong::store(double nr).
  2. CHARACTER_OCTET_LENGTH and CHARACTER_MAXIMUM_LENGTH fields filing order fixed (8 <-> 9).
parent 12dd0baa
...@@ -2561,9 +2561,9 @@ static int get_schema_column_record(THD *thd, struct st_table_list *tables, ...@@ -2561,9 +2561,9 @@ static int get_schema_column_record(THD *thd, struct st_table_list *tables,
{ {
longlong c_octet_len= is_blob ? (longlong) field->max_length() : longlong c_octet_len= is_blob ? (longlong) field->max_length() :
(longlong) field->max_length()/field->charset()->mbmaxlen; (longlong) field->max_length()/field->charset()->mbmaxlen;
table->field[8]->store(c_octet_len, TRUE); table->field[8]->store((longlong) field->max_length(), TRUE);
table->field[8]->set_notnull(); table->field[8]->set_notnull();
table->field[9]->store((longlong) field->max_length()); table->field[9]->store(c_octet_len, TRUE);
table->field[9]->set_notnull(); table->field[9]->set_notnull();
} }
...@@ -2604,7 +2604,7 @@ static int get_schema_column_record(THD *thd, struct st_table_list *tables, ...@@ -2604,7 +2604,7 @@ static int get_schema_column_record(THD *thd, struct st_table_list *tables,
if (field_length >= 0) if (field_length >= 0)
{ {
table->field[10]->store((longlong) field_length); table->field[10]->store((longlong) field_length, TRUE);
table->field[10]->set_notnull(); table->field[10]->set_notnull();
} }
if (decimals >= 0) if (decimals >= 0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment