From c30d1cfd9007e5e43c916fa1fd660b706e8d9c20 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 18 Oct 2005 17:23:18 +0500 Subject: [PATCH] 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). --- sql/sql_show.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sql/sql_show.cc b/sql/sql_show.cc index a03eca54b9d..e1d3c7d6d33 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -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) 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[9]->store((longlong) field->max_length()); + table->field[9]->store(c_octet_len, TRUE); table->field[9]->set_notnull(); } @@ -2604,7 +2604,7 @@ static int get_schema_column_record(THD *thd, struct st_table_list *tables, if (field_length >= 0) { - table->field[10]->store((longlong) field_length); + table->field[10]->store((longlong) field_length, TRUE); table->field[10]->set_notnull(); } if (decimals >= 0)