database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge bk-internal.mysql.com:/home/bk/mysql-5.0

Browse Source 
into  bodhi.(none):/opt/local/work/mysql-5.0-runtime


mysql-test/t/sp.test:
  Auto merged
sql/item.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Manual merge.
mysql-test/t/innodb_mysql.test:
  Manual merge.
This commit is contained in:
unknown
2007-07-16 23:41:28 +04:00
parent 7d3cecca0a de2089264f
commit b94fb82847
36 changed files with 1779 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sql/sql_show.cc
View File

@ -2427,7 +2427,7 @@ int fill_schema_shemata(THD *thd, TABLE_LIST *tables, COND *cond)
}
static int get_schema_tables_record(THD *thd, struct st_table_list *tables,
static int get_schema_tables_record(THD *thd, TABLE_LIST *tables,
TABLE *table, bool res,
const char *base_name,
const char *file_name)
@ -2617,7 +2617,7 @@ static int get_schema_tables_record(THD *thd, struct st_table_list *tables,
}
static int get_schema_column_record(THD *thd, struct st_table_list *tables,
static int get_schema_column_record(THD *thd, TABLE_LIST *tables,
TABLE *table, bool res,
const char *base_name,
const char *file_name)
@ -3059,7 +3059,7 @@ err:
}
static int get_schema_stat_record(THD *thd, struct st_table_list *tables,
static int get_schema_stat_record(THD *thd, TABLE_LIST *tables,
TABLE *table, bool res,
const char *base_name,
const char *file_name)
@ -3149,7 +3149,7 @@ static int get_schema_stat_record(THD *thd, struct st_table_list *tables,
}
static int get_schema_views_record(THD *thd, struct st_table_list *tables,
static int get_schema_views_record(THD *thd, TABLE_LIST *tables,
TABLE *table, bool res,
const char *base_name,
const char *file_name)
@ -3261,7 +3261,7 @@ bool store_constraints(THD *thd, TABLE *table, const char *db,
}
static int get_schema_constraints_record(THD *thd, struct st_table_list *tables,
static int get_schema_constraints_record(THD *thd, TABLE_LIST *tables,
TABLE *table, bool res,
const char *base_name,
const char *file_name)
@ -3357,7 +3357,7 @@ static bool store_trigger(THD *thd, TABLE *table, const char *db,
}
static int get_schema_triggers_record(THD *thd, struct st_table_list *tables,
static int get_schema_triggers_record(THD *thd, TABLE_LIST *tables,
TABLE *table, bool res,
const char *base_name,
const char *file_name)
@ -3424,7 +3424,7 @@ void store_key_column_usage(TABLE *table, const char*db, const char *tname,
static int get_schema_key_column_usage_record(THD *thd,
struct st_table_list *tables,
TABLE_LIST *tables,
TABLE *table, bool res,
const char *base_name,
const char *file_name)