Commit 292aefee authored by monty@mishka.local's avatar monty@mishka.local

Fixed some test cases that was not forgotten in a recent patch

parent 29d9aa65
...@@ -1153,12 +1153,12 @@ def id 8 3 1 N 32929 0 63 ...@@ -1153,12 +1153,12 @@ def id 8 3 1 N 32929 0 63
def select_type 253 19 6 N 1 31 8 def select_type 253 19 6 N 1 31 8
def table 253 64 2 Y 0 31 8 def table 253 64 2 Y 0 31 8
def type 253 10 3 Y 0 31 8 def type 253 10 3 Y 0 31 8
def possible_keys 253 4096 0 Y 0 31 8 def possible_keys 252 4096 0 Y 0 31 8
def key 253 64 0 Y 0 31 8 def key 253 64 0 Y 0 31 8
def key_len 8 3 0 Y 32928 0 63 def key_len 8 3 0 Y 32928 0 63
def ref 253 1024 0 Y 0 31 8 def ref 252 1024 0 Y 0 31 8
def rows 8 10 1 Y 32928 0 63 def rows 8 10 1 Y 32928 0 63
def Extra 253 255 0 N 1 31 8 def Extra 252 255 0 N 1 31 8
id select_type table type possible_keys key key_len ref rows Extra id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t9 ALL NULL NULL NULL NULL 3 1 SIMPLE t9 ALL NULL NULL NULL NULL 3
test_sequence test_sequence
......
...@@ -1153,12 +1153,12 @@ def id 8 3 1 N 32929 0 63 ...@@ -1153,12 +1153,12 @@ def id 8 3 1 N 32929 0 63
def select_type 253 19 6 N 1 31 8 def select_type 253 19 6 N 1 31 8
def table 253 64 2 Y 0 31 8 def table 253 64 2 Y 0 31 8
def type 253 10 3 Y 0 31 8 def type 253 10 3 Y 0 31 8
def possible_keys 253 4096 0 Y 0 31 8 def possible_keys 252 4096 0 Y 0 31 8
def key 253 64 0 Y 0 31 8 def key 253 64 0 Y 0 31 8
def key_len 8 3 0 Y 32928 0 63 def key_len 8 3 0 Y 32928 0 63
def ref 253 1024 0 Y 0 31 8 def ref 252 1024 0 Y 0 31 8
def rows 8 10 1 Y 32928 0 63 def rows 8 10 1 Y 32928 0 63
def Extra 253 255 0 N 1 31 8 def Extra 252 255 0 N 1 31 8
id select_type table type possible_keys key key_len ref rows Extra id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t9 ALL NULL NULL NULL NULL 2 1 SIMPLE t9 ALL NULL NULL NULL NULL 2
test_sequence test_sequence
......
...@@ -639,30 +639,33 @@ int mysqld_extend_show_tables(THD *thd,const char *db,const char *wild) ...@@ -639,30 +639,33 @@ int mysqld_extend_show_tables(THD *thd,const char *db,const char *wild)
} }
/* /*
returns the length of the longest type on the given table. returns the length of the longest type on the given table.
This is used so that show fields will return the data using the proper
lengths instead of forcing columns such as type to always return with a This is used so that show fields will return the data using the proper
given length. lengths instead of forcing columns such as type to always return with a
given length.
*/ */
uint get_longest_type_in_table(TABLE *table, const char *wild) uint get_longest_type_in_table(TABLE *table, const char *wild)
{ {
Field **ptr,*field; Field **ptr,*field;
char tmp[MAX_FIELD_WIDTH]; char tmp[MAX_FIELD_WIDTH];
uint max_len = 0; uint max_len= 0;
for (ptr=table->field; (field= *ptr); ptr++) for (ptr=table->field; (field= *ptr); ptr++)
{ {
if (!wild || !wild[0] || if (!wild || !wild[0] ||
!wild_case_compare(system_charset_info, field->field_name,wild)) !wild_case_compare(system_charset_info, field->field_name,wild))
{ {
String type(tmp,sizeof(tmp), system_charset_info); String type(tmp,sizeof(tmp), system_charset_info);
field->sql_type(type); field->sql_type(type);
max_len = max(max_len, type.length()); max_len= max(max_len, type.length());
} }
} }
return max_len; return max_len;
} }
/*************************************************************************** /***************************************************************************
** List all columns in a table_list->real_name ** List all columns in a table_list->real_name
***************************************************************************/ ***************************************************************************/
......
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