database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime

Browse Source 
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
This commit is contained in:
kostja@bodhi.(none)
2007-07-16 23:31:36 +04:00
parent 06d656b808 5466b0df14
commit 88fc7cab26
36 changed files with 1784 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sql/sql_show.cc
View File

@@ -2824,7 +2824,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)
@@ -3016,7 +3016,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)
@@ -3523,7 +3523,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)
@@ -3613,7 +3613,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)
@@ -3731,7 +3731,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)
@@ -3832,7 +3832,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)
@@ -3909,7 +3909,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)