diff options
| author | unknown <monty@mysql.com> | 2005-01-06 13:31:31 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-01-06 13:31:31 +0200 |
| commit | 8ff8867251ccfefed1785efb50e56bc80aaf7663 (patch) | |
| tree | 88cf38e01d5a6bd71bad06acf244a51bbed77d4f /include | |
| parent | 9bb865befc8510e13ad5b231b1fd4888e36b6041 (diff) | |
| parent | acf76e3b88b4ec294c8f63f0fb2a29f895228259 (diff) | |
| download | mariadb-git-8ff8867251ccfefed1785efb50e56bc80aaf7663.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
sql/item_func.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/table.cc:
Auto merged
sql/table.h:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/myisam.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/myisam.h b/include/myisam.h index fd75af2d997..e0eb8715aef 100644 --- a/include/myisam.h +++ b/include/myisam.h @@ -340,8 +340,8 @@ typedef struct st_mi_check_param ha_checksum key_crc[MI_MAX_POSSIBLE_KEY]; ulong rec_per_key_part[MI_MAX_KEY_SEG*MI_MAX_POSSIBLE_KEY]; void *thd; - char *db_name,*table_name; - char *op_name; + const char *db_name, *table_name; + const char *op_name; } MI_CHECK; typedef struct st_sort_ft_buf |