diff options
author | unknown <monty@narttu.mysql.fi> | 2003-05-06 01:38:38 +0300 |
---|---|---|
committer | unknown <monty@narttu.mysql.fi> | 2003-05-06 01:38:38 +0300 |
commit | c2d2f9bb210fb8f8f9127dcff1c7b95a4b62d598 (patch) | |
tree | e4e5fa90d35bf2fc106cf0b773a29900579c7daa /myisam/mi_delete.c | |
parent | 358e088d1341ed80a0b4d645e526919b574c3acf (diff) | |
download | mariadb-git-c2d2f9bb210fb8f8f9127dcff1c7b95a4b62d598.tar.gz |
Removed compiler warnings
Fixed memory leak in new filesort code
Optimzed sub selects to use keys with outer references.
Increased max tables in join to 62
client/Makefile.am:
Remve test programs
myisam/mi_check.c:
Remove compiler warnings
myisam/mi_delete.c:
Remove 'rnd' variable to make usage repeatable
myisam/mi_open.c:
Remove 'rnd' variable to make usage repeatable
myisam/mi_write.c:
Remove 'rnd' variable to make usage repeatable
myisam/myisamdef.h:
Remove 'rnd' variable to make usage repeatable
myisam/myisamlog.c:
Remove 'rnd' variable to make usage repeatable
mysql-test/r/subselect.result:
new test
mysql-test/t/join.test:
Updated test
mysql-test/t/subselect.test:
new test
sql/filesort.cc:
Added function to free buffers allocated by filesort
sql/item.cc:
Sub select optimization
sql/item_cmpfunc.cc:
Sub select optimization
sql/item_subselect.cc:
Sub select optimization
sql/item_sum.cc:
Removed compiler warnings
sql/item_sum.h:
Simple code cleanup
sql/log.cc:
Removed compiler warning
sql/mysql_priv.h:
Made table_map ulonglong to allow 62 tables in join
sql/records.cc:
Moved free of filesort buffers to own function
sql/sql_select.cc:
subselect optimization
Call filesort_free_buffers() to free memory from filesort
sql/unireg.h:
Sub select optimization
Diffstat (limited to 'myisam/mi_delete.c')
-rw-r--r-- | myisam/mi_delete.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/myisam/mi_delete.c b/myisam/mi_delete.c index 96c6400f078..36dd0d2d62c 100644 --- a/myisam/mi_delete.c +++ b/myisam/mi_delete.c @@ -491,7 +491,7 @@ static int underflow(register MI_INFO *info, register MI_KEYDEF *keyinfo, if (info->s->keyinfo+info->lastinx == keyinfo) info->page_changed=1; - if ((keypos < anc_buff+anc_length && (share->rnd++ & 1)) || + if ((keypos < anc_buff+anc_length && (info->state->records & 1)) || keypos == anc_buff+2+key_reflength) { /* Use page right of anc-page */ DBUG_PRINT("test",("use right page")); |