diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-10-16 19:05:10 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-10-16 19:05:10 +0300 |
| commit | 320d4912f4e6318d7ac080692ed780b6f1557e54 (patch) | |
| tree | 66490ad10c369a5769b1adb2c70bad7536a903b3 /myisam/mi_delete_all.c | |
| parent | 6f38e3083f0d867af8d1499fba92c7eaae295726 (diff) | |
| download | mariadb-git-320d4912f4e6318d7ac080692ed780b6f1557e54.tar.gz | |
Fixes after last merge.
Ignore changed keyblocks when on does DELETE FROM table_name;
acinclude.m4:
Don't give warnings when using openssl installed in /usr/include with gcc 3.x
myisam/mi_delete_all.c:
Ignore changed keyblocks when on does DELETE FROM table_name;
mysql-test/r/null_key.result:
Fix null test
sql/ha_innodb.cc:
Fix bug in last merge
sql/sql_parse.cc:
Fix bug introduced with merge
Diffstat (limited to 'myisam/mi_delete_all.c')
| -rw-r--r-- | myisam/mi_delete_all.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/myisam/mi_delete_all.c b/myisam/mi_delete_all.c index 58f885b63f0..7e4239bc7d1 100644 --- a/myisam/mi_delete_all.c +++ b/myisam/mi_delete_all.c @@ -52,6 +52,11 @@ int mi_delete_all_rows(MI_INFO *info) VOID(_mi_writeinfo(info,WRITEINFO_UPDATE_KEYFILE)); if (my_chsize(info->dfile, 0, 0, MYF(MY_WME))) goto err; + /* + If we are using delayed keys or if the user has done changes to the tables + since it was locked then there may be key blocks in the key cache + */ + flush_key_blocks(share->kfile, FLUSH_IGNORE_CHANGED); allow_break(); /* Allow SIGHUP & SIGINT */ DBUG_RETURN(0); |