diff options
| author | unknown <monty@mashka.mysql.fi> | 2002-12-06 21:11:27 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2002-12-06 21:11:27 +0200 |
| commit | ae4323e0d9fcbbca12b65f811cadb993b816d636 (patch) | |
| tree | 969377c9c94475e559670dfcc0a8c4f7ed16b388 /heap | |
| parent | 6d33f73416b5576b4e48412fd3a7342385c1c747 (diff) | |
| download | mariadb-git-ae4323e0d9fcbbca12b65f811cadb993b816d636.tar.gz | |
After merge fixes
Added THD to add_to_xxx_list() functions for faster parsing.
heap/_check.c:
After merge fix
mysql-test/r/distinct.result:
After merge fix
mysql-test/r/multi_update.result:
Make timestamp test portable
mysql-test/t/multi_update.test:
Make timestamp test portable
sql/field.cc:
After merge fix
sql/item_sum.cc:
After merge fix
sql/log_event.cc:
Remove compiler warning
sql/mysql_priv.h:
Added THD to add_to_list (Faster parsing)
sql/sql_derived.cc:
Fixed parameters to create_tmp_table()
sql/sql_lex.cc:
Added THD to add_to_list (Faster parsing)
sql/sql_lex.h:
Added THD to add_to_list (Faster parsing)
sql/sql_parse.cc:
Added THD to add_to_list (Faster parsing)
sql/sql_select.cc:
After merge fixes
Fixed return values from JOIN::optimize()
Replaced test_function_query with '!tables_list'
Optimized arguments to create_tmp_table()
sql/sql_select.h:
Removed test_function_query variable
Updated prototypes
sql/sql_union.cc:
Updated argument lists.
sql/sql_update.cc:
After merge fixes
sql/sql_yacc.yy:
Added THD to all add_xxx_to_list() functions
sql/table.h:
After merge fix
Diffstat (limited to 'heap')
| -rw-r--r-- | heap/_check.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/heap/_check.c b/heap/_check.c index 5ee511bf92a..bc1cd24113c 100644 --- a/heap/_check.c +++ b/heap/_check.c @@ -75,7 +75,7 @@ int heap_check_heap(HP_INFO *info, my_bool print_status) break; /* End of file */ } } - _hp_find_record(info,pos); + hp_find_record(info,pos); if (!info->current_ptr[share->reclength]) deleted++; |