mirror of
https://github.com/MariaDB/server.git
synced 2025-01-30 10:31:54 +01:00
10e22c346a
Some changes to the prepared statement protocol to make it easier to use and faster. Makefile.am: Fix to make dist to work with cmd-line-utils client/mysql.cc: Portability fixes client/mysqlbinlog.cc: Portabiliy fixes and remove usafe of FILE configure.in: Fix to make dist to work with cmd-line-utils heap/_check.c: Portability fixes include/config-win.h: Portability fixes include/m_ctype.h: Indentation cleanup include/my_list.h: Portability fixes include/mysql.h: Cleanup of BIND structure include/violite.h: Portability fixes innobase/dict/dict0dict.c: Portability fixes innobase/dict/dict0load.c: Portability fixes innobase/include/os0proc.h: Portability fixes (Heikki, please check) innobase/os/os0proc.c: Portability fixes (Heikki, please check) innobase/ut/ut0ut.c: Portability fixes isam/pack_isam.c: Portability fixes libmysql/libmysql.c: Portability fixes Remove obscure usage of the length parameter for prepared statements. libmysql/libmysql.def: Remove not existing functions libmysqld/lib_sql.cc: Remove compiler warning mysql-test/r/explain.result: Fix after merge mysql-test/r/join.result: Fix after merge mysys/my_once.c: Portability fix mysys/tree.c: Portability fixes sql/field.cc: Portability fixes sql/filesort.cc: move assert.h to mysql_priv.h sql/ha_berkeley.cc: move assert.h to mysql_priv.h sql/ha_innodb.cc: move assert.h to mysql_priv.h sql/item.cc: move assert.h to mysql_priv.h Fixed syntax error sql/item_cmpfunc.cc: move assert.h to mysql_priv.h sql/item_func.cc: move assert.h to mysql_priv.h sql/item_row.cc: move assert.h to mysql_priv.h sql/item_strfunc.cc: Portability fix sql/item_subselect.cc: Portability fix sql/item_sum.cc: move assert.h to mysql_priv.h sql/lex.h: Portability fix sql/lock.cc: move assert.h to mysql_priv.h sql/log.cc: move assert.h to mysql_priv.h sql/log_event.cc: Portability fix sql/mf_iocache.cc: move assert.h to mysql_priv.h sql/mysql_priv.h: move assert.h to mysql_priv.h sql/mysqld.cc: move assert.h to mysql_priv.h sql/opt_range.cc: move assert.h to mysql_priv.h sql/password.c: Portability fix sql/protocol.cc: move assert.h to mysql_priv.h sql/set_var.cc: Portability fix sql/slave.cc: move assert.h to mysql_priv.h sql/spatial.cc: Portability fix sql/sql_acl.cc: move assert.h to mysql_priv.h sql/sql_base.cc: move assert.h to mysql_priv.h sql/sql_cache.cc: move assert.h to mysql_priv.h sql/sql_class.cc: move assert.h to mysql_priv.h sql/sql_handler.cc: move assert.h to mysql_priv.h sql/sql_help.cc: Removed compiler warning sql/sql_lex.cc: Portability fix sql/sql_lex.h: Portability fix sql/sql_parse.cc: move assert.h to mysql_priv.h sql/sql_prepare.cc: move assert.h to mysql_priv.h sql/sql_repl.cc: move assert.h to mysql_priv.h sql/sql_select.cc: move assert.h to mysql_priv.h sql/sql_string.cc: Portability fix sql/sql_string.h: Portability fix sql/sql_table.cc: move assert.h to mysql_priv.h sql/sql_yacc.yy: Portability fix Remove not accessed code strings/ctype-bin.c: Portability fix strings/ctype-mb.c: Portability fix strings/ctype.c: Portability fix tests/client_test.c: A
188 lines
5.2 KiB
C
188 lines
5.2 KiB
C
/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
/* Check that heap-structure is ok */
|
|
|
|
#include "heapdef.h"
|
|
|
|
static int check_one_key(HP_KEYDEF *keydef, uint keynr, ulong records,
|
|
ulong blength, my_bool print_status);
|
|
static int check_one_rb_key(HP_INFO *info, uint keynr, ulong records,
|
|
my_bool print_status);
|
|
|
|
|
|
/*
|
|
Check if keys and rows are ok in a heap table
|
|
|
|
SYNOPSIS
|
|
heap_check_heap()
|
|
info Table handler
|
|
print_status Prints some extra status
|
|
|
|
NOTES
|
|
Doesn't change the state of the table handler
|
|
|
|
RETURN VALUES
|
|
0 ok
|
|
1 error
|
|
*/
|
|
|
|
int heap_check_heap(HP_INFO *info, my_bool print_status)
|
|
{
|
|
int error;
|
|
uint key;
|
|
ulong records=0, deleted=0, pos, next_block;
|
|
HP_SHARE *share=info->s;
|
|
HP_INFO save_info= *info; /* Needed because scan_init */
|
|
DBUG_ENTER("heap_check_heap");
|
|
|
|
for (error=key= 0 ; key < share->keys ; key++)
|
|
{
|
|
if (share->keydef[key].algorithm == HA_KEY_ALG_BTREE)
|
|
error|= check_one_rb_key(info, key, share->records, print_status);
|
|
else
|
|
error|= check_one_key(share->keydef + key, key, share->records,
|
|
share->blength, print_status);
|
|
}
|
|
/*
|
|
This is basicly the same code as in hp_scan, but we repeat it here to
|
|
get shorter DBUG log file.
|
|
*/
|
|
for (pos=next_block= 0 ; ; pos++)
|
|
{
|
|
if (pos < next_block)
|
|
{
|
|
info->current_ptr+= share->block.recbuffer;
|
|
}
|
|
else
|
|
{
|
|
next_block+= share->block.records_in_block;
|
|
if (next_block >= share->records+share->deleted)
|
|
{
|
|
next_block= share->records+share->deleted;
|
|
if (pos >= next_block)
|
|
break; /* End of file */
|
|
}
|
|
}
|
|
hp_find_record(info,pos);
|
|
|
|
if (!info->current_ptr[share->reclength])
|
|
deleted++;
|
|
else
|
|
records++;
|
|
}
|
|
|
|
if (records != share->records || deleted != share->deleted)
|
|
{
|
|
DBUG_PRINT("error",("Found rows: %lu (%lu) deleted %lu (%lu)",
|
|
records, share->records, deleted, share->deleted));
|
|
error= 1;
|
|
}
|
|
*info= save_info;
|
|
DBUG_RETURN(error);
|
|
}
|
|
|
|
|
|
static int check_one_key(HP_KEYDEF *keydef, uint keynr, ulong records,
|
|
ulong blength, my_bool print_status)
|
|
{
|
|
int error;
|
|
uint i,found,max_links,seek,links;
|
|
uint rec_link; /* Only used with debugging */
|
|
HASH_INFO *hash_info;
|
|
|
|
error=0;
|
|
for (i=found=max_links=seek=0 ; i < records ; i++)
|
|
{
|
|
hash_info=hp_find_hash(&keydef->block,i);
|
|
if (hp_mask(hp_rec_hashnr(keydef, hash_info->ptr_to_rec),
|
|
blength,records) == i)
|
|
{
|
|
found++;
|
|
seek++;
|
|
links=1;
|
|
while ((hash_info=hash_info->next_key) && found < records + 1)
|
|
{
|
|
seek+= ++links;
|
|
if ((rec_link = hp_mask(hp_rec_hashnr(keydef, hash_info->ptr_to_rec),
|
|
blength, records))
|
|
!= i)
|
|
{
|
|
DBUG_PRINT("error",("Record in wrong link: Link %d Record: %lx Record-link %d", i,hash_info->ptr_to_rec,rec_link));
|
|
error=1;
|
|
}
|
|
else
|
|
found++;
|
|
}
|
|
if (links > max_links) max_links=links;
|
|
}
|
|
}
|
|
if (found != records)
|
|
{
|
|
DBUG_PRINT("error",("Found %ld of %ld records"));
|
|
error=1;
|
|
}
|
|
DBUG_PRINT("info",
|
|
("records: %ld seeks: %d max links: %d hitrate: %.2f",
|
|
records,seek,max_links,
|
|
(float) seek / (float) (records ? records : 1)));
|
|
if (print_status)
|
|
printf("Key: %d records: %ld seeks: %d max links: %d hitrate: %.2f\n",
|
|
keynr, records, seek, max_links,
|
|
(float) seek / (float) (records ? records : 1));
|
|
return error;
|
|
}
|
|
|
|
static int check_one_rb_key(HP_INFO *info, uint keynr, ulong records,
|
|
my_bool print_status)
|
|
{
|
|
HP_KEYDEF *keydef= info->s->keydef + keynr;
|
|
int error= 0;
|
|
ulong found= 0;
|
|
byte *key, *recpos;
|
|
uint key_length;
|
|
uint not_used;
|
|
|
|
if ((key= tree_search_edge(&keydef->rb_tree, info->parents,
|
|
&info->last_pos, offsetof(TREE_ELEMENT, left))))
|
|
{
|
|
do
|
|
{
|
|
memcpy(&recpos, key + (*keydef->get_key_length)(keydef,key), sizeof(byte*));
|
|
key_length= hp_rb_make_key(keydef, info->recbuf, recpos, 0);
|
|
if (ha_key_cmp(keydef->seg, info->recbuf, key, key_length,
|
|
SEARCH_FIND | SEARCH_SAME, ¬_used))
|
|
{
|
|
error= 1;
|
|
DBUG_PRINT("error",("Record in wrong link: key: %d Record: %lx\n",
|
|
keynr, recpos));
|
|
}
|
|
else
|
|
found++;
|
|
key= tree_search_next(&keydef->rb_tree, &info->last_pos,
|
|
offsetof(TREE_ELEMENT, left),
|
|
offsetof(TREE_ELEMENT, right));
|
|
} while (key);
|
|
}
|
|
if (found != records)
|
|
{
|
|
DBUG_PRINT("error",("Found %lu of %lu records", found, records));
|
|
error= 1;
|
|
}
|
|
if (print_status)
|
|
printf("Key: %d records: %ld\n", keynr, records);
|
|
return error;
|
|
}
|