diff options
| author | unknown <kostja@bodhi.(none)> | 2007-07-17 00:59:21 +0400 |
|---|---|---|
| committer | unknown <kostja@bodhi.(none)> | 2007-07-17 00:59:21 +0400 |
| commit | bc642e113255417907d2759e5355c7b374b8d479 (patch) | |
| tree | e0400520a14ef29677d3e67d0a2c043f43631766 /sql/handler.h | |
| parent | d3c68163627b8ff14694cf223f0690766a7322e6 (diff) | |
| download | mariadb-git-bc642e113255417907d2759e5355c7b374b8d479.tar.gz | |
Post-merge fixes (merge from the main).
mysql-test/r/innodb_mysql.result:
Update test results (merge from the main tree).
mysql-test/r/query_cache.result:
Update test results (merge from the main tree).
mysql-test/r/sp.result:
Update test results (merge from the main tree).
mysql-test/t/query_cache.test:
Use --echo End of to simplify future merges.
sql/handler.h:
st_table_list -> TABLE_LIST
sql/item_create.cc:
A post-merge fix (this code is in sql_yacc.yy in 5.0)
sql/rpl_utility.h:
st_table_list -> TABLE_LIST
sql/sp.cc:
A post-merge fix.
sql/sp_head.cc:
In 5.1 memdup_root returns void*.
sql/sql_show.cc:
st_table_list -> TABLE_LIST
sql/sql_show.h:
st_table_list -> TABLE_LIST
sql/sql_yacc.yy:
A post-merge fix.
sql/table.cc:
st_table_list -> TABLE_LIST
sql/table.h:
st_table_list -> TABLE_LIST
Diffstat (limited to 'sql/handler.h')
| -rw-r--r-- | sql/handler.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/handler.h b/sql/handler.h index c4e45e5b8f1..f45b28c55f5 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -663,7 +663,7 @@ struct handlerton uint (*alter_table_flags)(uint flags); int (*alter_tablespace)(handlerton *hton, THD *thd, st_alter_tablespace *ts_info); int (*fill_files_table)(handlerton *hton, THD *thd, - struct st_table_list *tables, + TABLE_LIST *tables, class Item *cond); uint32 flags; /* global handler flags */ /* |