Commit ef0cd2f5 authored by unknown's avatar unknown
Browse files

information_schema_db.result, information_schema.result: 

  Fix test result.
table.h, sql_show.cc:
  Put I_S tables in lexical order.


sql/sql_show.cc:
  Put I_S tables in lexical order.
sql/table.h:
  Put I_S tables in lexical order.
mysql-test/r/information_schema.result:
  Fix test result.
mysql-test/r/information_schema_db.result:
  Fix test result.
parent 6bfbba34

mysql-test/r/information_schema.result

+1 −1
Original line number Diff line number Diff line
@@ -50,8 +50,8 @@ TABLES 
TABLE_CONSTRAINTS

TABLE_PRIVILEGES

TRIGGERS

VIEWS

USER_PRIVILEGES

VIEWS

columns_priv

db

func

mysql-test/r/information_schema_db.result

+1 −1
Original line number Diff line number Diff line
@@ -15,8 +15,8 @@ TABLES 
TABLE_CONSTRAINTS

TABLE_PRIVILEGES

TRIGGERS

VIEWS

USER_PRIVILEGES

VIEWS

show tables from INFORMATION_SCHEMA like 'T%';

Tables_in_information_schema (T%)

TABLES

sql/sql_show.cc

+2 −2
Original line number Diff line number Diff line
@@ -4198,12 +4198,12 @@ ST_SCHEMA_TABLE schema_tables[]= 
    fill_schema_table_privileges, 0, 0, -1, -1, 0},

  {"TRIGGERS", triggers_fields_info, create_schema_table,

   get_all_tables, make_old_format, get_schema_triggers_record, 5, 6, 0},

  {"USER_PRIVILEGES", user_privileges_fields_info, create_schema_table, 

    fill_schema_user_privileges, 0, 0, -1, -1, 0},

  {"VARIABLES", variables_fields_info, create_schema_table, fill_variables,

   make_old_format, 0, -1, -1, 1},

  {"VIEWS", view_fields_info, create_schema_table, 

    get_all_tables, 0, get_schema_views_record, 1, 2, 0},

  {"USER_PRIVILEGES", user_privileges_fields_info, create_schema_table, 

    fill_schema_user_privileges, 0, 0, -1, -1, 0},

  {0, 0, 0, 0, 0, 0, 0, 0, 0}

};

sql/table.h

+2 −2
Original line number Diff line number Diff line
@@ -309,9 +309,9 @@ enum enum_schema_tables 
  SCH_TABLE_NAMES,

  SCH_TABLE_PRIVILEGES,

  SCH_TRIGGERS,

  SCH_USER_PRIVILEGES,

  SCH_VARIABLES,

  SCH_VIEWS,

  SCH_USER_PRIVILEGES

  SCH_VIEWS

};