diff options
| author | unknown <ahristov@bk-internal.mysql.com> | 2006-09-06 14:35:27 +0200 |
|---|---|---|
| committer | unknown <ahristov@bk-internal.mysql.com> | 2006-09-06 14:35:27 +0200 |
| commit | 23a46f410fabb568f7746f8446eac1d38cdc2775 (patch) | |
| tree | cdf3e0dc82ad727eeb336674c00a94ea65e7566f /sql/table.h | |
| parent | d57163fcf84d6fc0e8cad5fdbbe5c14274eb694c (diff) | |
| parent | e22b6703f8061d572beb00ad0b5f0be1bb4f37cc (diff) | |
| download | mariadb-git-23a46f410fabb568f7746f8446eac1d38cdc2775.tar.gz | |
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-runtime
into bk-internal.mysql.com:/data0/bk/mysql-5.1-wl3337
client/mysqltest.c:
Auto merged
libmysqld/Makefile.am:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/events.result:
Auto merged
mysql-test/r/not_embedded_server.result:
Auto merged
mysql-test/t/events.test:
Auto merged
sql/CMakeLists.txt:
Auto merged
sql/Makefile.am:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
sql/table.h:
Auto merged
Diffstat (limited to 'sql/table.h')
| -rw-r--r-- | sql/table.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/table.h b/sql/table.h index 3fb7222cb0d..a6f2783fcf3 100644 --- a/sql/table.h +++ b/sql/table.h @@ -1029,9 +1029,9 @@ typedef struct st_table_field_w_type my_bool -table_check_intact(TABLE *table, uint table_f_count, - TABLE_FIELD_W_TYPE *table_def, time_t *last_create_time, - int error_num); +table_check_intact(TABLE *table, const uint table_f_count, + const TABLE_FIELD_W_TYPE * const table_def, + time_t *last_create_time, int error_num); static inline my_bitmap_map *tmp_use_all_columns(TABLE *table, MY_BITMAP *bitmap) |