diff options
| author | unknown <jani@hynda.mysql.fi> | 2007-07-02 20:45:15 +0300 |
|---|---|---|
| committer | unknown <jani@hynda.mysql.fi> | 2007-07-02 20:45:15 +0300 |
| commit | 3f4faedb3fcd648bd824de40bec23d981c38d2cd (patch) | |
| tree | 2eb68f1f6af5e60c4bcdd8fcfa7e14f3650de830 /storage/myisammrg | |
| parent | 9e5c1fd667d6fe30660153c290e98338be338240 (diff) | |
| download | mariadb-git-3f4faedb3fcd648bd824de40bec23d981c38d2cd.tar.gz | |
Merged with mysql-5.1 main tree.
BUILD/compile-pentium-debug-max:
Added definition after macro was removed from main tree. This will
be fixed back in main tree later.
Diffstat (limited to 'storage/myisammrg')
| -rw-r--r-- | storage/myisammrg/ha_myisammrg.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/storage/myisammrg/ha_myisammrg.cc b/storage/myisammrg/ha_myisammrg.cc index 551f12e4a8c..f3df1e82c4b 100644 --- a/storage/myisammrg/ha_myisammrg.cc +++ b/storage/myisammrg/ha_myisammrg.cc @@ -48,12 +48,12 @@ static const char *ha_myisammrg_exts[] = { }; extern int table2myisam(TABLE *table_arg, MI_KEYDEF **keydef_out, MI_COLUMNDEF **recinfo_out, uint *records_out); -extern int myisam_check_definition(MI_KEYDEF *t1_keyinfo, - MI_COLUMNDEF *t1_recinfo, - uint t1_keys, uint t1_recs, - MI_KEYDEF *t2_keyinfo, - MI_COLUMNDEF *t2_recinfo, - uint t2_keys, uint t2_recs, bool strict); +extern int check_definition(MI_KEYDEF *t1_keyinfo, + MI_COLUMNDEF *t1_recinfo, + uint t1_keys, uint t1_recs, + MI_KEYDEF *t2_keyinfo, + MI_COLUMNDEF *t2_recinfo, + uint t2_keys, uint t2_recs, bool strict); static void split_file_name(const char *file_name, LEX_STRING *db, LEX_STRING *name); @@ -137,10 +137,10 @@ int ha_myisammrg::open(const char *name, int mode, uint test_if_locked) } for (u_table= file->open_tables; u_table < file->end_table; u_table++) { - if (myisam_check_definition(keyinfo, recinfo, keys, recs, - u_table->table->s->keyinfo, u_table->table->s->rec, - u_table->table->s->base.keys, - u_table->table->s->base.fields, false)) + if (check_definition(keyinfo, recinfo, keys, recs, + u_table->table->s->keyinfo, u_table->table->s->rec, + u_table->table->s->base.keys, + u_table->table->s->base.fields, false)) { error= HA_ERR_WRONG_MRG_TABLE_DEF; if (test_if_locked & HA_OPEN_FOR_REPAIR) |