mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +01:00
a8caad316a
Made a some new buffers thread specific and changeable. Resize of key_buffer. AUTO_COMMIT -> AUTOCOMMIT Fixed mutex bug in DROP DATABASE Fixed bug when using auto_increment as second part of a key where first part could include NULL. Split handler->extra() to extra() and extra_opt() to be able to support thread specific buffers. Don't write message to error log when slave reconnects becasue of timeout. Fixed possible update problem when using DELETE/UPDATE on small tables (In some cases we used index even if table scanning would be better) A lot of minior code cleanups BitKeeper/deleted/.del-net.c~ef21d6402bb882f9: Delete: libmysql/net.c BitKeeper/etc/ignore: added libmysql/net.c Docs/manual.texi: New SET syntax & system variables. client/client_priv.h: moved order of include files client/mysql.cc: Removed compiler warning client/mysqladmin.c: Use new SHOW GLOBAL syntax (if server supports it) configure.in: version change include/Makefile.am: indentation cleanup include/my_getopt.h: Made some helper functions global include/my_sys.h: Removed not used code include/myisam.h: Added extra argument to ..._extra() include/myisammrg.h: Added extra argument to ..._extra() include/mysql_com.h: changed NET to be able to support changeable system variables include/mysql_embed.h: Added MYSQL_SERVER_SUFFIX include/mysql_version.h.in: Added check of multiple including (needed for embedded library) include/mysqld_error.h: New error messages innobase/dict/dict0dict.c: Remove compiler warnings innobase/include/ut0mem.h: Remove compiler warnings innobase/include/ut0mem.ic: Remove compiler warnings isam/isamchk.c: new init_key_cache() arguments isam/isamlog.c: new init_key_cache() arguments isam/test2.c: new init_key_cache() arguments isam/test3.c: new init_key_cache() arguments libmysql/Makefile.am: Removed net.c (Automaticly make it from net_serv.cc) libmysql/Makefile.shared: Removed net.c (Automaticly make it from net_serv.cc) libmysql/libmysql.c: Changeable system variables libmysqld/Makefile.am: Added set_var.cc file libmysqld/embedded_priv.h: Changed order of include fiels libmysqld/lib_sql.cc: merge with mysqld.cc (for changeable variables) libmysqld/libmysqld.c: New changeable system variables myisam/mi_check.c: Added extra argument to ..._extra() myisam/mi_extra.c: Added extra argument to ..._extra() myisam/mi_open.c: Removed not used variable myisam/mi_test1.c: Changed call to init_key_cache myisam/mi_test2.c: Added extra argument to ..._extra() myisam/mi_test3.c: Added extra argument to ..._extra() myisam/mi_write.c: Add cache size argument to bulk-insert-init myisam/myisamchk.c: Use new key cache myisam/myisamdef.h: new mi_init_bulk_insert() arguments myisam/myisamlog.c: Added extra argument to ..._extra() myisam/myisampack.c: Added extra argument to ..._extra() myisammrg/myrg_extra.c: Added extra argument to ..._extra() myisammrg/myrg_rrnd.c: Added extra argument to ..._extra() mysql-test/r/insert_select.result: New changeable system variables mysql-test/r/key.result: Test of bug in auto_increment mysql-test/r/query_cache.result: New changeable system variables mysql-test/r/rpl000001.result: New changeable system variables mysql-test/r/rpl000016.result: New changeable system variables mysql-test/r/union.result: New changeable system variables mysql-test/r/user_var.result: New changeable system variables mysql-test/r/variables.result: New changeable system variables mysql-test/t/key.test: Test of bug in auto_increment mysql-test/t/query_cache.test: New changeable system variables mysql-test/t/rpl000001.test: New changeable system variables mysql-test/t/rpl000009.test: New changeable system variables mysql-test/t/rpl000016.test: New changeable system variables mysql-test/t/rpl_compat.test: New changeable system variables mysql-test/t/union.test: New changeable system variables mysql-test/t/user_var.test: New changeable system variables mysql-test/t/variables.test: New changeable system variables mysys/default.c: Bigger default memory allocation mysys/mf_iocache.c: Removed compiler warning mysys/mf_keycache.c: Made key cache resizable on the fly Removed not needed extra argument to init_key_cache() mysys/my_getopt.c: Made some helper functions global sql/Makefile.am: Aded set_var.cc sql/convert.cc: Comment cleanup sql/field.cc: new changeable system variables sql/filesort.cc: new changeable system variables sql/ha_berkeley.cc: AUTO_COMMIT -> AUTOCOMMIT sql/ha_innodb.cc: new changeable system variables sql/ha_myisam.cc: Added extra argument to ..._extra() sql/ha_myisam.h: Added extra argument to ..._extra() sql/ha_myisammrg.cc: Added extra argument to ..._extra() sql/ha_myisammrg.h: Added extra argument to ..._extra() sql/handler.cc: Added extra argument to ..._extra() Added resize of key cache Change ha_table_typelib for use with new system variables sql/handler.h: Added extra argument to ..._extra() sql/item.cc: new changeable system variables sql/item.h: Added better support of Item_uint sql/item_func.cc: Added support for SET @@[global | session] system_variable sql/item_strfunc.cc: new changeable system variables sql/key.cc: Fixed bug in auto_increment on second part keys sql/lex.h: Removed not needed keywords sql/log.cc: new changeable system variables sql/log_event.cc: new changeable system variables sql/log_event.h: Removed not needed var reference sql/mini_client.cc: new changeable system variables code cleanup sql/mini_client.h: Indentation cleanup sql/mysql_priv.h: Changed order of include files & variables to make file more readable sql/mysqld.cc: Changed order of variables to make file more readable. Support for changeable variables Rename of system variables Moved init_vars to set_var.cc Changed output of --help sql/net_pkg.cc: Added my_net_local_init() to make it possible to set different defaults for network connection depending if you are a client, embedded library or server. sql/net_serv.cc: new changeable system variables To support this, some global variables had to be move to the NET structure. sql/records.cc: new changeable system variables use extra_opt() sql/repl_failsafe.cc: new changeable system variables minior code cleanups sql/repl_failsafe.h: removed not needed external var reference sql/share/czech/errmsg.txt: new changeable system variables sql/share/danish/errmsg.txt: new changeable system variables sql/share/dutch/errmsg.txt: new changeable system variables sql/share/english/errmsg.txt: new changeable system variables sql/share/estonian/errmsg.txt: new changeable system variables sql/share/french/errmsg.txt: new changeable system variables sql/share/german/errmsg.txt: new changeable system variables sql/share/greek/errmsg.txt: new changeable system variables sql/share/hungarian/errmsg.txt: new changeable system variables sql/share/italian/errmsg.txt: new changeable system variables sql/share/japanese/errmsg.txt: new changeable system variables sql/share/korean/errmsg.txt: new changeable system variables sql/share/norwegian-ny/errmsg.txt: new changeable system variables sql/share/norwegian/errmsg.txt: new changeable system variables sql/share/polish/errmsg.txt: new changeable system variables sql/share/portuguese/errmsg.txt: new changeable system variables sql/share/romanian/errmsg.txt: new changeable system variables sql/share/russian/errmsg.txt: new changeable system variables sql/share/slovak/errmsg.txt: new changeable system variables sql/share/spanish/errmsg.txt: new changeable system variables sql/share/swedish/errmsg.txt: new changeable system variables sql/share/ukrainian/errmsg.txt: new changeable system variables sql/slave.cc: new changeable system variables Added some suppression of error messages Initialize current_thd for all slave threads. sql/sql_acl.cc: Added checking of arguments for SET PASSWORD (for new SET defintion) sql/sql_acl.h: new prototypes sql/sql_base.cc: new changeable system variables sql/sql_cache.cc: new changeable system variables sql/sql_cache.h: Renamed some arguments to make code more readable sql/sql_class.cc: new changeable system variables sql/sql_class.h: New changeable system variables Code cleanup sql/sql_db.cc: Fixed bug in DROP DATABASE sql/sql_delete.cc: Usage of wrong define in test (possible speed problem) sql/sql_insert.cc: use extra_opt() Code cleanup sql/sql_lex.cc: Added support for SET @@[global | session] system_variable sql/sql_lex.h: Added support for SET @@[global | session] system_variable sql/sql_load.cc: Cleanup for embedded library Use extra_opt() sql/sql_parse.cc: Cleanup for embedded library New changeable system variables sql/sql_repl.cc: new changeable system variables sql/sql_repl.h: Fixed variable definitions sql/sql_select.cc: new changeable system variables sql/sql_show.cc: New changeable system variables sql/sql_table.cc: Fixed bug in DROP DATABASE sql/sql_union.cc: New changeable system variables sql/sql_update.cc: Usage of wrong define in test (possible speed problem) sql/sql_yacc.yy: New changeable system variables sql/structs.h: Added typedef for SHOW_VAR sql/table.cc: Fixed bug in auto_increment on second part keys sql/uniques.cc: Comment fix sql/unireg.h: A
356 lines
9.5 KiB
C++
356 lines
9.5 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 */
|
|
|
|
|
|
/* Functions to read, write and lock records */
|
|
|
|
#include "mysql_priv.h"
|
|
|
|
static int rr_quick(READ_RECORD *info);
|
|
static int rr_sequential(READ_RECORD *info);
|
|
static int rr_from_tempfile(READ_RECORD *info);
|
|
static int rr_from_pointers(READ_RECORD *info);
|
|
static int rr_from_cache(READ_RECORD *info);
|
|
static int init_rr_cache(READ_RECORD *info);
|
|
static int rr_cmp(uchar *a,uchar *b);
|
|
|
|
/* init struct for read with info->read_record */
|
|
|
|
void init_read_record(READ_RECORD *info,THD *thd, TABLE *table,
|
|
SQL_SELECT *select,
|
|
int use_record_cache, bool print_error)
|
|
{
|
|
IO_CACHE *tempfile;
|
|
DBUG_ENTER("init_read_record");
|
|
|
|
bzero((char*) info,sizeof(*info));
|
|
info->thd=thd;
|
|
info->table=table;
|
|
info->file= table->file;
|
|
info->forms= &info->table; /* Only one table */
|
|
info->record=table->record[0];
|
|
info->ref_length=table->file->ref_length;
|
|
info->select=select;
|
|
info->print_error=print_error;
|
|
table->status=0; /* And it's allways found */
|
|
|
|
if (select && my_b_inited(&select->file))
|
|
tempfile= &select->file;
|
|
else
|
|
tempfile= table->io_cache;
|
|
if (tempfile && my_b_inited(tempfile)) // Test if ref-records was used
|
|
{
|
|
DBUG_PRINT("info",("using rr_from_tempfile"));
|
|
info->read_record=rr_from_tempfile;
|
|
info->io_cache=tempfile;
|
|
reinit_io_cache(info->io_cache,READ_CACHE,0L,0,0);
|
|
info->ref_pos=table->file->ref;
|
|
table->file->rnd_init(0);
|
|
|
|
if (! (specialflag & SPECIAL_SAFE_MODE) &&
|
|
thd->variables.read_rnd_buff_size &&
|
|
!table->file->fast_key_read() &&
|
|
(table->db_stat & HA_READ_ONLY ||
|
|
table->reginfo.lock_type <= TL_READ_NO_INSERT) &&
|
|
(ulonglong) table->reclength*(table->file->records+
|
|
table->file->deleted) >
|
|
(ulonglong) MIN_FILE_LENGTH_TO_USE_ROW_CACHE &&
|
|
info->io_cache->end_of_file/info->ref_length*table->reclength >
|
|
(my_off_t) MIN_ROWS_TO_USE_TABLE_CACHE &&
|
|
!table->blob_fields)
|
|
{
|
|
if (! init_rr_cache(info))
|
|
{
|
|
DBUG_PRINT("info",("using rr_from_cache"));
|
|
info->read_record=rr_from_cache;
|
|
}
|
|
}
|
|
}
|
|
else if (select && select->quick)
|
|
{
|
|
DBUG_PRINT("info",("using rr_quick"));
|
|
info->read_record=rr_quick;
|
|
}
|
|
else if (table->record_pointers)
|
|
{
|
|
DBUG_PRINT("info",("using record_pointers"));
|
|
table->file->rnd_init(0);
|
|
info->cache_pos=table->record_pointers;
|
|
info->cache_end=info->cache_pos+ table->found_records*info->ref_length;
|
|
info->read_record= rr_from_pointers;
|
|
}
|
|
else
|
|
{
|
|
DBUG_PRINT("info",("using rr_sequential"));
|
|
info->read_record=rr_sequential;
|
|
table->file->rnd_init();
|
|
/* We can use record cache if we don't update dynamic length tables */
|
|
if (use_record_cache > 0 ||
|
|
(int) table->reginfo.lock_type <= (int) TL_READ_HIGH_PRIORITY ||
|
|
!(table->db_options_in_use & HA_OPTION_PACK_RECORD) ||
|
|
(use_record_cache < 0 &&
|
|
!(table->file->table_flags() & HA_NOT_DELETE_WITH_CACHE)))
|
|
VOID(table->file->extra_opt(HA_EXTRA_CACHE,
|
|
thd->variables.read_buff_size));
|
|
}
|
|
DBUG_VOID_RETURN;
|
|
} /* init_read_record */
|
|
|
|
|
|
void end_read_record(READ_RECORD *info)
|
|
{ /* free cache if used */
|
|
if (info->cache)
|
|
{
|
|
my_free_lock((char*) info->cache,MYF(0));
|
|
info->cache=0;
|
|
}
|
|
if (info->table)
|
|
{
|
|
(void) info->file->extra(HA_EXTRA_NO_CACHE);
|
|
(void) info->file->rnd_end();
|
|
info->table=0;
|
|
}
|
|
}
|
|
|
|
/* Read a record from head-database */
|
|
|
|
static int rr_quick(READ_RECORD *info)
|
|
{
|
|
int tmp=info->select->quick->get_next();
|
|
if (tmp)
|
|
{
|
|
if (tmp == HA_ERR_END_OF_FILE)
|
|
tmp= -1;
|
|
else
|
|
{
|
|
if (info->print_error)
|
|
info->file->print_error(tmp,MYF(0));
|
|
if (tmp < 0) // Fix negative BDB errno
|
|
tmp=1;
|
|
}
|
|
}
|
|
return tmp;
|
|
}
|
|
|
|
|
|
static int rr_sequential(READ_RECORD *info)
|
|
{
|
|
int tmp;
|
|
while ((tmp=info->file->rnd_next(info->record)))
|
|
{
|
|
if (info->thd->killed)
|
|
{
|
|
my_error(ER_SERVER_SHUTDOWN,MYF(0));
|
|
return 1;
|
|
}
|
|
if (tmp != HA_ERR_RECORD_DELETED)
|
|
{
|
|
if (tmp == HA_ERR_END_OF_FILE)
|
|
tmp= -1;
|
|
else
|
|
{
|
|
if (info->print_error)
|
|
info->table->file->print_error(tmp,MYF(0));
|
|
if (tmp < 0) // Fix negative BDB errno
|
|
tmp=1;
|
|
}
|
|
break;
|
|
}
|
|
}
|
|
return tmp;
|
|
}
|
|
|
|
|
|
static int rr_from_tempfile(READ_RECORD *info)
|
|
{
|
|
int tmp;
|
|
tryNext:
|
|
if (my_b_read(info->io_cache,info->ref_pos,info->ref_length))
|
|
return -1; /* End of file */
|
|
if ((tmp=info->file->rnd_pos(info->record,info->ref_pos)))
|
|
{
|
|
if (tmp == HA_ERR_END_OF_FILE)
|
|
tmp= -1;
|
|
else if (tmp == HA_ERR_RECORD_DELETED)
|
|
goto tryNext;
|
|
else
|
|
{
|
|
if (info->print_error)
|
|
info->file->print_error(tmp,MYF(0));
|
|
if (tmp < 0) // Fix negative BDB errno
|
|
tmp=1;
|
|
}
|
|
}
|
|
return tmp;
|
|
} /* rr_from_tempfile */
|
|
|
|
|
|
static int rr_from_pointers(READ_RECORD *info)
|
|
{
|
|
int tmp;
|
|
byte *cache_pos;
|
|
tryNext:
|
|
if (info->cache_pos == info->cache_end)
|
|
return -1; /* End of file */
|
|
cache_pos=info->cache_pos;
|
|
info->cache_pos+=info->ref_length;
|
|
|
|
if ((tmp=info->file->rnd_pos(info->record,cache_pos)))
|
|
{
|
|
if (tmp == HA_ERR_END_OF_FILE)
|
|
tmp= -1;
|
|
else if (tmp == HA_ERR_RECORD_DELETED)
|
|
goto tryNext;
|
|
else
|
|
{
|
|
if (info->print_error)
|
|
info->file->print_error(tmp,MYF(0));
|
|
if (tmp < 0) // Fix negative BDB errno
|
|
tmp=1;
|
|
}
|
|
}
|
|
return tmp;
|
|
}
|
|
|
|
/* cacheing of records from a database */
|
|
|
|
static int init_rr_cache(READ_RECORD *info)
|
|
{
|
|
uint rec_cache_size;
|
|
THD *thd= current_thd;
|
|
|
|
DBUG_ENTER("init_rr_cache");
|
|
|
|
info->struct_length=3+MAX_REFLENGTH;
|
|
info->reclength=ALIGN_SIZE(info->table->reclength+1);
|
|
if (info->reclength < info->struct_length)
|
|
info->reclength=ALIGN_SIZE(info->struct_length);
|
|
|
|
info->error_offset=info->table->reclength;
|
|
info->cache_records= thd->variables.read_rnd_buff_size /
|
|
(info->reclength+info->struct_length);
|
|
rec_cache_size=info->cache_records*info->reclength;
|
|
info->rec_cache_size=info->cache_records*info->ref_length;
|
|
|
|
if (info->cache_records <= 2 ||
|
|
!(info->cache=(byte*) my_malloc_lock(rec_cache_size+info->cache_records*
|
|
info->struct_length,
|
|
MYF(0))))
|
|
DBUG_RETURN(1);
|
|
#ifdef HAVE_purify
|
|
bzero(info->cache,rec_cache_size); // Avoid warnings in qsort
|
|
#endif
|
|
DBUG_PRINT("info",("Allocated buffert for %d records",info->cache_records));
|
|
info->read_positions=info->cache+rec_cache_size;
|
|
info->cache_pos=info->cache_end=info->cache;
|
|
DBUG_RETURN(0);
|
|
} /* init_rr_cache */
|
|
|
|
|
|
static int rr_from_cache(READ_RECORD *info)
|
|
{
|
|
reg1 uint i;
|
|
ulong length;
|
|
my_off_t rest_of_file;
|
|
int16 error;
|
|
byte *position,*ref_position,*record_pos;
|
|
ulong record;
|
|
|
|
for (;;)
|
|
{
|
|
if (info->cache_pos != info->cache_end)
|
|
{
|
|
if (info->cache_pos[info->error_offset])
|
|
{
|
|
shortget(error,info->cache_pos);
|
|
if (info->print_error)
|
|
info->table->file->print_error(error,MYF(0));
|
|
}
|
|
else
|
|
{
|
|
error=0;
|
|
memcpy(info->record,info->cache_pos,(size_t) info->table->reclength);
|
|
}
|
|
info->cache_pos+=info->reclength;
|
|
return ((int) error);
|
|
}
|
|
length=info->rec_cache_size;
|
|
rest_of_file=info->io_cache->end_of_file - my_b_tell(info->io_cache);
|
|
if ((my_off_t) length > rest_of_file)
|
|
length= (ulong) rest_of_file;
|
|
if (!length || my_b_read(info->io_cache,info->cache,length))
|
|
{
|
|
DBUG_PRINT("info",("Found end of file"));
|
|
return -1; /* End of file */
|
|
}
|
|
|
|
length/=info->ref_length;
|
|
position=info->cache;
|
|
ref_position=info->read_positions;
|
|
for (i=0 ; i < length ; i++,position+=info->ref_length)
|
|
{
|
|
memcpy(ref_position,position,(size_s) info->ref_length);
|
|
ref_position+=MAX_REFLENGTH;
|
|
int3store(ref_position,(long) i);
|
|
ref_position+=3;
|
|
}
|
|
qsort(info->read_positions,length,info->struct_length,(qsort_cmp) rr_cmp);
|
|
|
|
position=info->read_positions;
|
|
for (i=0 ; i < length ; i++)
|
|
{
|
|
memcpy(info->ref_pos,position,(size_s) info->ref_length);
|
|
position+=MAX_REFLENGTH;
|
|
record=uint3korr(position);
|
|
position+=3;
|
|
record_pos=info->cache+record*info->reclength;
|
|
if ((error=(int16) info->file->rnd_pos(record_pos,info->ref_pos)))
|
|
{
|
|
record_pos[info->error_offset]=1;
|
|
shortstore(record_pos,error);
|
|
DBUG_PRINT("error",("Got error: %d:%d when reading row",
|
|
my_errno, error));
|
|
}
|
|
else
|
|
record_pos[info->error_offset]=0;
|
|
}
|
|
info->cache_end=(info->cache_pos=info->cache)+length*info->reclength;
|
|
}
|
|
} /* rr_from_cache */
|
|
|
|
|
|
static int rr_cmp(uchar *a,uchar *b)
|
|
{
|
|
if (a[0] != b[0])
|
|
return (int) a[0] - (int) b[0];
|
|
if (a[1] != b[1])
|
|
return (int) a[1] - (int) b[1];
|
|
if (a[2] != b[2])
|
|
return (int) a[2] - (int) b[2];
|
|
#if MAX_REFLENGTH == 4
|
|
return (int) a[3] - (int) b[3];
|
|
#else
|
|
if (a[3] != b[3])
|
|
return (int) a[3] - (int) b[3];
|
|
if (a[4] != b[4])
|
|
return (int) a[4] - (int) b[4];
|
|
if (a[5] != b[5])
|
|
return (int) a[1] - (int) b[5];
|
|
if (a[6] != b[6])
|
|
return (int) a[6] - (int) b[6];
|
|
return (int) a[7] - (int) b[7];
|
|
#endif
|
|
}
|