diff options
| author | Michael Widenius <monty@askmonty.org> | 2009-02-19 11:01:25 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2009-02-19 11:01:25 +0200 |
| commit | 945fa0d913a65c447306e945c44f50828903445b (patch) | |
| tree | 5178630451a60c8da965c19e0c339eb4f629de2f /storage/maria/ma_rt_index.c | |
| parent | 8526274c21ce0fd7eedac5275cb210cd2b048dc5 (diff) | |
| parent | 6a1bc662d67cdb7716480654ddd63d504508b4fa (diff) | |
| download | mariadb-git-945fa0d913a65c447306e945c44f50828903445b.tar.gz | |
Merge with mysql-maria tree
mysql-test/t/variables.test:
Reset delay_key_write, otherwise maria.maria test may fail
sql/set_var.cc:
Reset ha_open_options if one resets the delay_key_write variable.
Before there was no way to reset it without restarting mysqld, which caused some tests to fail
Diffstat (limited to 'storage/maria/ma_rt_index.c')
| -rw-r--r-- | storage/maria/ma_rt_index.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/maria/ma_rt_index.c b/storage/maria/ma_rt_index.c index 8967b0f3428..134514091bb 100644 --- a/storage/maria/ma_rt_index.c +++ b/storage/maria/ma_rt_index.c @@ -438,7 +438,7 @@ int maria_rtree_get_first(MARIA_HA *info, uint keynr, uint key_length) info->maria_rtree_recursion_depth= -1; info->keyread_buff_used= 1; - return maria_rtree_get_req(info, &keyinfo[keynr], key_length, root, 0); + return maria_rtree_get_req(info, keyinfo, key_length, root, 0); } |