mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +01:00
35da5e43fb
Fixed compiler warnings (IRIX C compiler and VC++) VC++Files/client/mysqlclient.dsp: Add missing file to project VC++Files/libmysql/libmysql.dsp: Add missing file to project VC++Files/myisam/myisam.dsp: Add missing file to project VC++Files/mysys/mysys.dsp: Add missing file to project heap/hp_test1.c: Fixed wrong call to heap_rkey() heap/hp_test2.c: Fixed wrong call to heap_rkey() include/hash.h: Move not used (internal) struct to hash.c include/my_pthread.h: Made some structs 'const char*' to avoid warnings include/my_sys.h: Moved key cache structs and functions to keycache.h include/myisam.h: Merge key cache structures to one include/mysql.h: Remove STDCALL from internal functions include/sql_common.h: Remove STDCALL from internal functions include/violite.h: Fixed compiler warning isam/_locking.c: Merge key cache structures to one isam/_page.c: Merge key cache structures to one isam/close.c: Merge key cache structures to one isam/extra.c: Merge key cache structures to one isam/isamchk.c: Merge key cache structures to one isam/isamdef.h: Merge key cache structures to one isam/isamlog.c: Merge key cache structures to one isam/panic.c: Merge key cache structures to one isam/test2.c: Merge key cache structures to one isam/test3.c: Merge key cache structures to one libmysql/client_settings.h: Remove STDCALL from internal functions libmysql/libmysql.c: Remove STDCALL from internal functions myisam/ft_boolean_search.c: Fixed compiler warning myisam/ft_dump.c: Fixed compiler warnings (%qx is not portable) myisam/ft_update.c: Fixed compiler warnings myisam/mi_check.c: Merge key cache structures to one myisam/mi_close.c: Merge key cache structures to one myisam/mi_delete_all.c: Merge key cache structures to one myisam/mi_extra.c: Merge key cache structures to one myisam/mi_keycache.c: Merge key cache structures to one myisam/mi_locking.c: Merge key cache structures to one myisam/mi_page.c: Merge key cache structures to one myisam/mi_panic.c: Merge key cache structures to one myisam/mi_preload.c: Merge key cache structures to one myisam/mi_test1.c: Merge key cache structures to one myisam/mi_test2.c: Merge key cache structures to one myisam/mi_test3.c: Merge key cache structures to one myisam/myisamchk.c: Merge key cache structures to one myisam/myisamdef.h: Merge key cache structures to one myisam/myisamlog.c: Merge key cache structures to one Removed not used option myisam/sort.c: Fixed compiler warnings myisam/sp_test.c: Fixed compiler warnings mysql-test/r/case.result: Updated results after fix of correct NULL detection in WHEN mysql-test/r/date_formats.result: Updated results after fixing date handling mysql-test/r/symlink.result: Updated results after adding DEFAULT CHARSET mysql-test/t/case.test: New test mysql-test/t/symlink.test: Updated error numbers mysys/hash.c: Made HASH_LINK struct local mysys/mf_keycache.c: Merge key cache structures to one Fixed key_cache_read() and key_cache_write() to be resize-safe. mysys/mf_keycaches.c: Merge key cache structures to one mysys/thr_mutex.c: Added test if mutex is initalized sql-common/client.c: Remove STDCALL from internal functions sql/derror.cc: Added comment sql/field.cc: Removed not used variables sql/ha_innodb.cc: Fixed compiler warnings (removed not used variables) sql/ha_myisam.cc: Merge key cache structures to one sql/ha_myisammrg.cc: Removed not used variables sql/handler.cc: Merge key cache structures to one sql/handler.h: Merge key cache structures to one sql/item.cc: Fixed compiler warning sql/item_cmpfunc.cc: Remove not used variables sql/item_func.cc: Remove not used variables sql/item_strfunc.cc: Removed not used variables sql/item_sum.cc: Removed not used variables Moved setting of item_thd to fix_fields() sql/item_timefunc.cc: Removed not used variables sql/mysql_priv.h: Merge key cache structures to one sql/mysqld.cc: Merge key cache structures to one init_thread_environment() is not called before mysql_init_variables(). This fixes a case where a mutex was not initialized before it was used sql/opt_sum.cc: Remove not used variables sql/protocol.cc: Don't send errors after ok has been sent sql/protocol_cursor.cc: Remove not used variable Simple optimization sql/repl_failsafe.cc: Remove not used variables sql/set_var.cc: Merge key cache structures to one sql/set_var.h: Merge key cache structures to one sql/sql_acl.cc: Remove not used variables sql/sql_base.cc: Remove not used function sql/sql_db.cc: Remove not used variables sql/sql_handler.cc: Remove not used variables sql/sql_insert.cc: More DBUG statements Simple code cleanup sql/sql_lex.cc: Remove not used variables sql/sql_parse.cc: Remove not used variables sql/sql_prepare.cc: Remove not used variables sql/sql_repl.cc: Remove not used variables sql/sql_select.cc: Remove not used variables sql/sql_show.cc: Remove not used variables sql/sql_table.cc: Merge key cache structures to one Removed not used variables sql/sql_test.cc: Merge key cache structures to one sql/strfunc.cc: Fixed that find_type() returns correct value for partly matched words. (This fixed the error found by date_formats.test) sql/time.cc: Remove not used variables strings/my_strtoll10.c: Fixed compiler warnings
193 lines
4.9 KiB
C
193 lines
4.9 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 */
|
|
|
|
/* Test av heap-database */
|
|
/* Programmet skapar en heap-databas. Till denna skrivs ett antal poster.
|
|
Databasen st{ngs. D{refter |ppnas den p} nytt och en del av posterna
|
|
raderas.
|
|
*/
|
|
|
|
#include <my_global.h>
|
|
#include <my_sys.h>
|
|
#include <m_string.h>
|
|
#include "heap.h"
|
|
|
|
static int get_options(int argc, char *argv[]);
|
|
|
|
static int flag=0,verbose=0,remove_ant=0,flags[50];
|
|
|
|
int main(int argc, char **argv)
|
|
{
|
|
int i,j,error,deleted;
|
|
HP_INFO *file;
|
|
char record[128],key[32];
|
|
const char *filename;
|
|
HP_KEYDEF keyinfo[10];
|
|
HA_KEYSEG keyseg[4];
|
|
HP_CREATE_INFO hp_create_info;
|
|
MY_INIT(argv[0]);
|
|
|
|
filename= "test1";
|
|
get_options(argc,argv);
|
|
|
|
bzero(&hp_create_info, sizeof(hp_create_info));
|
|
|
|
keyinfo[0].keysegs=1;
|
|
keyinfo[0].seg=keyseg;
|
|
keyinfo[0].algorithm= HA_KEY_ALG_HASH;
|
|
keyinfo[0].seg[0].type=HA_KEYTYPE_BINARY;
|
|
keyinfo[0].seg[0].start=1;
|
|
keyinfo[0].seg[0].length=6;
|
|
keyinfo[0].seg[0].charset= &my_charset_latin1;
|
|
keyinfo[0].flag = HA_NOSAME;
|
|
|
|
deleted=0;
|
|
bzero((gptr) flags,sizeof(flags));
|
|
|
|
printf("- Creating heap-file\n");
|
|
if (heap_create(filename,1,keyinfo,30,(ulong) flag*100000l,10l,
|
|
&hp_create_info) ||
|
|
!(file= heap_open(filename, 2)))
|
|
goto err;
|
|
printf("- Writing records:s\n");
|
|
strmov(record," ..... key ");
|
|
|
|
for (i=49 ; i>=1 ; i-=2 )
|
|
{
|
|
j=i%25 +1;
|
|
sprintf(key,"%6d",j);
|
|
bmove(record+1,key,6);
|
|
error=heap_write(file,record);
|
|
if (heap_check_heap(file,0))
|
|
{
|
|
puts("Heap keys crashed");
|
|
goto err;
|
|
}
|
|
flags[j]=1;
|
|
if (verbose || error) printf("J= %2d heap_write: %d my_errno: %d\n",
|
|
j,error,my_errno);
|
|
}
|
|
if (heap_close(file))
|
|
goto err;
|
|
printf("- Reopening file\n");
|
|
if (!(file=heap_open(filename, 2)))
|
|
goto err;
|
|
|
|
printf("- Removing records\n");
|
|
for (i=1 ; i<=10 ; i++)
|
|
{
|
|
if (i == remove_ant) { VOID(heap_close(file)) ; return (0) ; }
|
|
sprintf(key,"%6d",(j=(int) ((rand() & 32767)/32767.*25)));
|
|
if ((error = heap_rkey(file,record,0,key,6,HA_READ_KEY_EXACT)))
|
|
{
|
|
if (verbose || (flags[j] == 1 ||
|
|
(error && my_errno != HA_ERR_KEY_NOT_FOUND)))
|
|
printf("key: %s rkey: %3d my_errno: %3d\n",key,error,my_errno);
|
|
}
|
|
else
|
|
{
|
|
error=heap_delete(file,record);
|
|
if (error || verbose)
|
|
printf("key: %s delete: %d my_errno: %d\n",key,error,my_errno);
|
|
flags[j]=0;
|
|
if (! error)
|
|
deleted++;
|
|
}
|
|
if (heap_check_heap(file,0))
|
|
{
|
|
puts("Heap keys crashed");
|
|
goto err;
|
|
}
|
|
}
|
|
|
|
printf("- Reading records with key\n");
|
|
for (i=1 ; i<=25 ; i++)
|
|
{
|
|
sprintf(key,"%6d",i);
|
|
bmove(record+1,key,6);
|
|
my_errno=0;
|
|
error=heap_rkey(file,record,0,key,6,HA_READ_KEY_EXACT);
|
|
if (verbose ||
|
|
(error == 0 && flags[i] != 1) ||
|
|
(error && (flags[i] != 0 || my_errno != HA_ERR_KEY_NOT_FOUND)))
|
|
{
|
|
printf("key: %s rkey: %3d my_errno: %3d record: %s\n",
|
|
key,error,my_errno,record+1);
|
|
}
|
|
}
|
|
|
|
#ifdef OLD_HEAP_VERSION
|
|
{
|
|
int found;
|
|
printf("- Reading records with position\n");
|
|
for (i=1,found=0 ; i <= 30 ; i++)
|
|
{
|
|
my_errno=0;
|
|
if ((error=heap_rrnd(file,record,i == 1 ? 0L : (ulong) -1)) ==
|
|
HA_ERR_END_OF_FILE)
|
|
{
|
|
if (found != 25-deleted)
|
|
printf("Found only %d of %d records\n",found,25-deleted);
|
|
break;
|
|
}
|
|
if (!error)
|
|
found++;
|
|
if (verbose || (error != 0 && error != HA_ERR_RECORD_DELETED))
|
|
{
|
|
printf("pos: %2d ni_rrnd: %3d my_errno: %3d record: %s\n",
|
|
i-1,error,my_errno,record+1);
|
|
}
|
|
}
|
|
}
|
|
#endif
|
|
|
|
if (heap_close(file) || heap_panic(HA_PANIC_CLOSE))
|
|
goto err;
|
|
my_end(MY_GIVE_INFO);
|
|
return(0);
|
|
err:
|
|
printf("got error: %d when using heap-database\n",my_errno);
|
|
return(1);
|
|
} /* main */
|
|
|
|
|
|
/* Read options */
|
|
|
|
static int get_options(int argc, char **argv)
|
|
{
|
|
char *pos;
|
|
|
|
while (--argc >0 && *(pos = *(++argv)) == '-' ) {
|
|
switch(*++pos) {
|
|
case 'B': /* Big file */
|
|
flag=1;
|
|
break;
|
|
case 'v': /* verbose */
|
|
verbose=1;
|
|
break;
|
|
case 'm':
|
|
remove_ant=atoi(++pos);
|
|
break;
|
|
case 'V':
|
|
printf("hp_test1 Ver 3.0 \n");
|
|
exit(0);
|
|
case '#':
|
|
DBUG_PUSH (++pos);
|
|
break;
|
|
}
|
|
}
|
|
return 0;
|
|
} /* get options */
|