mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
3e6215d9d0
Deleted a lot of old benchmark runs BitKeeper/deleted/.del-ATIS-mysql-Linux_2.2.14_i686_xeon~3e820c28bf4af63a: Delete: sql-bench/Results/ATIS-mysql-Linux_2.2.14_i686_xeon BitKeeper/deleted/.del-RUN-mysql-Linux_2.2.14_i686_xeon~17854e751e1d9d1d: Delete: sql-bench/Results/RUN-mysql-Linux_2.2.14_i686_xeon BitKeeper/deleted/.del-alter-table-mysql-Linux_2.2.14_i686_xeon~64cc4b874cd6fabf: Delete: sql-bench/Results/alter-table-mysql-Linux_2.2.14_i686_xeon BitKeeper/deleted/.del-big-tables-mysql-Linux_2.2.14_i686_xeon~290c2c3de9d8e6b: Delete: sql-bench/Results/big-tables-mysql-Linux_2.2.14_i686_xeon BitKeeper/deleted/.del-connect-mysql-Linux_2.2.14_i686_xeon~ea19dc3ec55b3618: Delete: sql-bench/Results/connect-mysql-Linux_2.2.14_i686_xeon BitKeeper/deleted/.del-create-mysql-Linux_2.2.14_i686_xeon~50d15991293030ef: Delete: sql-bench/Results/create-mysql-Linux_2.2.14_i686_xeon BitKeeper/deleted/.del-insert-mysql-Linux_2.2.14_i686_xeon~c683ee4b9d214298: Delete: sql-bench/Results/insert-mysql-Linux_2.2.14_i686_xeon BitKeeper/deleted/.del-select-mysql-Linux_2.2.14_i686_xeon~ead3f11b46ac626f: Delete: sql-bench/Results/select-mysql-Linux_2.2.14_i686_xeon BitKeeper/deleted/.del-wisconsin-mysql-Linux_2.2.14_i686_xeon~7525b23938631801: Delete: sql-bench/Results/wisconsin-mysql-Linux_2.2.14_i686_xeon BitKeeper/deleted/.del-ATIS-mysql-Linux_2.2.14_my_SMP_i686~d275df58a04737c8: Delete: sql-bench/Results/ATIS-mysql-Linux_2.2.14_my_SMP_i686 BitKeeper/deleted/.del-RUN-mysql-Linux_2.2.14_my_SMP_i686~d4766c7f8e70d7a2: Delete: sql-bench/Results/RUN-mysql-Linux_2.2.14_my_SMP_i686 BitKeeper/deleted/.del-alter-table-mysql-Linux_2.2.14_my_SMP_i686~155a83b53c0e9d6: Delete: sql-bench/Results/alter-table-mysql-Linux_2.2.14_my_SMP_i686 BitKeeper/deleted/.del-big-tables-mysql-Linux_2.2.14_my_SMP_i686~f1127add9307098b: Delete: sql-bench/Results/big-tables-mysql-Linux_2.2.14_my_SMP_i686 BitKeeper/deleted/.del-connect-mysql-Linux_2.2.14_my_SMP_i686~45d2cdf9bea9cc37: Delete: sql-bench/Results/connect-mysql-Linux_2.2.14_my_SMP_i686 BitKeeper/deleted/.del-create-mysql-Linux_2.2.14_my_SMP_i686~d46860c29c5d51ee: Delete: sql-bench/Results/create-mysql-Linux_2.2.14_my_SMP_i686 BitKeeper/deleted/.del-insert-mysql-Linux_2.2.14_my_SMP_i686~e1771e0a164bc310: Delete: sql-bench/Results/insert-mysql-Linux_2.2.14_my_SMP_i686 BitKeeper/deleted/.del-select-mysql-Linux_2.2.14_my_SMP_i686~ee2a063d66a183d: Delete: sql-bench/Results/select-mysql-Linux_2.2.14_my_SMP_i686 BitKeeper/deleted/.del-wisconsin-mysql-Linux_2.2.14_my_SMP_i686~b7552710d35202b6: Delete: sql-bench/Results/wisconsin-mysql-Linux_2.2.14_my_SMP_i686 BitKeeper/deleted/.del-ATIS-mysql-3.21-Linux_2.2.1_i686~660fb76ed6ccfb6f: Delete: sql-bench/Results/ATIS-mysql-3.21-Linux_2.2.1_i686 BitKeeper/deleted/.del-RUN-mysql-3.21-Linux_2.2.1_i686~f6fdd64859e11de9: Delete: sql-bench/Results/RUN-mysql-3.21-Linux_2.2.1_i686 BitKeeper/deleted/.del-alter-table-mysql-3.21-Linux_2.2.1_i686~f6f7ccd7b3c35f97: Delete: sql-bench/Results/alter-table-mysql-3.21-Linux_2.2.1_i686 BitKeeper/deleted/.del-big-tables-mysql-3.21-Linux_2.2.1_i686~baa649caba113497: Delete: sql-bench/Results/big-tables-mysql-3.21-Linux_2.2.1_i686 BitKeeper/deleted/.del-connect-mysql-3.21-Linux_2.2.1_i686~c0c26d4320182d85: Delete: sql-bench/Results/connect-mysql-3.21-Linux_2.2.1_i686 BitKeeper/deleted/.del-create-mysql-3.21-Linux_2.2.1_i686~51581b24f45e0f5c: Delete: sql-bench/Results/create-mysql-3.21-Linux_2.2.1_i686 BitKeeper/deleted/.del-insert-mysql-3.21-Linux_2.2.1_i686~fd082017c7c57a6: Delete: sql-bench/Results/insert-mysql-3.21-Linux_2.2.1_i686 BitKeeper/deleted/.del-select-mysql-3.21-Linux_2.2.1_i686~ed3687e713ff0571: Delete: sql-bench/Results/select-mysql-3.21-Linux_2.2.1_i686 BitKeeper/deleted/.del-wisconsin-mysql-3.21-Linux_2.2.1_i686~8147dc16a1dc6c47: Delete: sql-bench/Results/wisconsin-mysql-3.21-Linux_2.2.1_i686 BitKeeper/deleted/.del-ATIS-mysql_3.21-Linux_2.0.35_i686~c25425e045ca8dfc: Delete: sql-bench/Results/ATIS-mysql_3.21-Linux_2.0.35_i686 BitKeeper/deleted/.del-RUN-mysql_3.21-Linux_2.0.35_i686~ea8672d8473435: Delete: sql-bench/Results/RUN-mysql_3.21-Linux_2.0.35_i686 BitKeeper/deleted/.del-alter-table-mysql_3.21-Linux_2.0.35_i686~762639f2560976bd: Delete: sql-bench/Results/alter-table-mysql_3.21-Linux_2.0.35_i686 BitKeeper/deleted/.del-big-tables-mysql_3.21-Linux_2.0.35_i686~190e827e569c99a4: Delete: sql-bench/Results/big-tables-mysql_3.21-Linux_2.0.35_i686 BitKeeper/deleted/.del-connect-mysql_3.21-Linux_2.0.35_i686~650abd213e6828c6: Delete: sql-bench/Results/connect-mysql_3.21-Linux_2.0.35_i686 BitKeeper/deleted/.del-create-mysql_3.21-Linux_2.0.35_i686~df1b037d17b33587: Delete: sql-bench/Results/create-mysql_3.21-Linux_2.0.35_i686 BitKeeper/deleted/.del-insert-mysql_3.21-Linux_2.0.35_i686~60c0965dff31db07: Delete: sql-bench/Results/insert-mysql_3.21-Linux_2.0.35_i686 BitKeeper/deleted/.del-select-mysql_3.21-Linux_2.0.35_i686~5fadbac5f98696a: Delete: sql-bench/Results/select-mysql_3.21-Linux_2.0.35_i686 BitKeeper/deleted/.del-wisconsin-mysql_3.21-Linux_2.0.35_i686~31703d40ea6b4f66: Delete: sql-bench/Results/wisconsin-mysql_3.21-Linux_2.0.35_i686 BitKeeper/deleted/.del-ATIS-mysql-Linux_2.2.10_i686~3fa4d167cceff7e8: Delete: sql-bench/Results/ATIS-mysql-Linux_2.2.10_i686 BitKeeper/deleted/.del-RUN-mysql-Linux_2.2.10_i686~712f52be5d195406: Delete: sql-bench/Results/RUN-mysql-Linux_2.2.10_i686 BitKeeper/deleted/.del-alter-table-mysql-Linux_2.2.10_i686~93b78a85b720a186: Delete: sql-bench/Results/alter-table-mysql-Linux_2.2.10_i686 BitKeeper/deleted/.del-big-tables-mysql-Linux_2.2.10_i686~99daa1c5370d077d: Delete: sql-bench/Results/big-tables-mysql-Linux_2.2.10_i686 BitKeeper/deleted/.del-connect-mysql-Linux_2.2.10_i686~c92505d77e19d5ec: Delete: sql-bench/Results/connect-mysql-Linux_2.2.10_i686 BitKeeper/deleted/.del-create-mysql-Linux_2.2.10_i686~9e7822f66df6aa76: Delete: sql-bench/Results/create-mysql-Linux_2.2.10_i686 BitKeeper/deleted/.del-insert-mysql-Linux_2.2.10_i686~763edf9aec633f51: Delete: sql-bench/Results/insert-mysql-Linux_2.2.10_i686 BitKeeper/deleted/.del-select-mysql-Linux_2.2.10_i686~a2e264d777b787d: Delete: sql-bench/Results/select-mysql-Linux_2.2.10_i686 BitKeeper/deleted/.del-wisconsin-mysql-Linux_2.2.10_i686~301a82b12a84922b: Delete: sql-bench/Results/wisconsin-mysql-Linux_2.2.10_i686 BitKeeper/deleted/.del-ATIS-mysql-win98~cd0705815d3af451: Delete: sql-bench/Results-win32/ATIS-mysql-win98 BitKeeper/deleted/.del-RUN-mysql-win98~7f09e396772a8665: Delete: sql-bench/Results-win32/RUN-mysql-win98 BitKeeper/deleted/.del-alter-table-mysql-win98~e8743982f790462: Delete: sql-bench/Results-win32/alter-table-mysql-win98 BitKeeper/deleted/.del-big-tables-mysql-win98~99a1882effebbdf2: Delete: sql-bench/Results-win32/big-tables-mysql-win98 BitKeeper/deleted/.del-connect-mysql-win98~2a11d5e3dfc0bc67: Delete: sql-bench/Results-win32/connect-mysql-win98 BitKeeper/deleted/.del-create-mysql-win98~f66c2cb2909c4792: Delete: sql-bench/Results-win32/create-mysql-win98 BitKeeper/deleted/.del-insert-mysql-win98~6d6cafc85a6c837: Delete: sql-bench/Results-win32/insert-mysql-win98 BitKeeper/deleted/.del-select-mysql-win98~f370fac2d66a9faf: Delete: sql-bench/Results-win32/select-mysql-win98 BitKeeper/deleted/.del-wisconsin-mysql-win98~8b3da9c5c5d2365b: Delete: sql-bench/Results-win32/wisconsin-mysql-win98 BUILD/compile-pentium-debug-max: Innobase -> Innodb BUILD/compile-pentium-max: Innobase -> Innodb Docs/manual.texi: Innobase -> Innodb acinclude.m4: Innobase -> Innodb bdb/Makefile.in: Fix that make clean works configure.in: Innobase -> Innodb mysql-test/include/have_innodb.inc: Innobase -> Innodb mysql-test/install_test_db.sh: Innobase -> Innodb mysql-test/mysql-test-run.sh: Innobase -> Innodb mysql-test/r/have_innodb.require: Innobase -> Innodb mysql-test/r/innodb.result: Innobase -> Innodb mysql-test/t/innodb.test: Innobase -> Innodb scripts/mysql_install_db.sh: Innobase -> Innodb scripts/mysqlhotcopy.sh: Remove some warnings sql-bench/server-cfg.sh: Innobase -> Innodb sql/Makefile.am: Innobase -> Innodb sql/ha_innobase.cc: Innobase -> Innodb sql/ha_innobase.h: Innobase -> Innodb sql/handler.cc: Innobase -> Innodb sql/mysqld.cc: Innobase -> Innodb sql/sql_delete.cc: Innobase -> Innodb support-files/my-huge.cnf.sh: Innobase -> Innodb support-files/my-large.cnf.sh: Innobase -> Innodb support-files/my-medium.cnf.sh: Innobase -> Innodb support-files/my-small.cnf.sh: Innobase -> Innodb support-files/mysql-max.spec.sh: Innobase -> Innodb support-files/mysql.spec.sh: Innobase -> Innodb tests/fork_big.pl: Added checking of whole database
255 lines
7.4 KiB
C++
255 lines
7.4 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 */
|
|
|
|
|
|
/* Delete of records */
|
|
|
|
#include "mysql_priv.h"
|
|
#include "ha_innobase.h"
|
|
|
|
/*
|
|
Optimize delete of all rows by doing a full generate of the table
|
|
This will work even if the .ISM and .ISD tables are destroyed
|
|
*/
|
|
|
|
int generate_table(THD *thd, TABLE_LIST *table_list, TABLE *locked_table)
|
|
{
|
|
char path[FN_REFLEN];
|
|
int error;
|
|
TABLE **table_ptr;
|
|
DBUG_ENTER("generate_table");
|
|
|
|
thd->proc_info="generate_table";
|
|
|
|
if (global_read_lock)
|
|
{
|
|
if(thd->global_read_lock)
|
|
{
|
|
my_error(ER_TABLE_NOT_LOCKED_FOR_WRITE,MYF(0),
|
|
table_list->real_name);
|
|
DBUG_RETURN(-1);
|
|
}
|
|
pthread_mutex_lock(&LOCK_open);
|
|
while (global_read_lock && ! thd->killed ||
|
|
thd->version != refresh_version)
|
|
{
|
|
(void) pthread_cond_wait(&COND_refresh,&LOCK_open);
|
|
}
|
|
pthread_mutex_unlock(&LOCK_open);
|
|
}
|
|
|
|
|
|
/* If it is a temporary table, close and regenerate it */
|
|
if ((table_ptr=find_temporary_table(thd,table_list->db,
|
|
table_list->real_name)))
|
|
{
|
|
TABLE *table= *table_ptr;
|
|
HA_CREATE_INFO create_info;
|
|
table->file->info(HA_STATUS_AUTO | HA_STATUS_NO_LOCK);
|
|
bzero((char*) &create_info,sizeof(create_info));
|
|
create_info.auto_increment_value= table->file->auto_increment_value;
|
|
db_type table_type=table->db_type;
|
|
|
|
strmov(path,table->path);
|
|
*table_ptr= table->next; // Unlink table from list
|
|
close_temporary(table,0);
|
|
*fn_ext(path)=0; // Remove the .frm extension
|
|
ha_create_table(path, &create_info,1);
|
|
if ((error= (int) !(open_temporary_table(thd, path, table_list->db,
|
|
table_list->real_name, 1))))
|
|
{
|
|
(void) rm_temporary_table(table_type, path);
|
|
}
|
|
}
|
|
else
|
|
{
|
|
(void) sprintf(path,"%s/%s/%s%s",mysql_data_home,table_list->db,
|
|
table_list->real_name,reg_ext);
|
|
fn_format(path,path,"","",4);
|
|
VOID(pthread_mutex_lock(&LOCK_open));
|
|
if (locked_table)
|
|
mysql_lock_abort(thd,locked_table); // end threads waiting on lock
|
|
// close all copies in use
|
|
if (remove_table_from_cache(thd,table_list->db,table_list->real_name))
|
|
{
|
|
if (!locked_table)
|
|
{
|
|
VOID(pthread_mutex_unlock(&LOCK_open));
|
|
DBUG_RETURN(1); // We must get a lock on table
|
|
}
|
|
}
|
|
if (locked_table)
|
|
locked_table->file->extra(HA_EXTRA_FORCE_REOPEN);
|
|
if (thd->locked_tables)
|
|
close_data_tables(thd,table_list->db,table_list->real_name);
|
|
else
|
|
close_thread_tables(thd,1);
|
|
HA_CREATE_INFO create_info;
|
|
bzero((char*) &create_info,sizeof(create_info));
|
|
*fn_ext(path)=0; // Remove the .frm extension
|
|
error= ha_create_table(path,&create_info,1) ? -1 : 0;
|
|
if (thd->locked_tables && reopen_tables(thd,1,0))
|
|
error= -1;
|
|
VOID(pthread_mutex_unlock(&LOCK_open));
|
|
}
|
|
if (!error)
|
|
{
|
|
mysql_update_log.write(thd,thd->query,thd->query_length);
|
|
if (mysql_bin_log.is_open())
|
|
{
|
|
Query_log_event qinfo(thd, thd->query);
|
|
mysql_bin_log.write(&qinfo);
|
|
}
|
|
send_ok(&thd->net); // This should return record count
|
|
}
|
|
DBUG_RETURN(error ? -1 : 0);
|
|
}
|
|
|
|
|
|
int mysql_delete(THD *thd,TABLE_LIST *table_list,COND *conds,ha_rows limit,
|
|
thr_lock_type lock_type, ulong options)
|
|
{
|
|
int error;
|
|
TABLE *table;
|
|
SQL_SELECT *select;
|
|
READ_RECORD info;
|
|
bool using_limit=limit != HA_POS_ERROR;
|
|
bool use_generate_table,using_transactions;
|
|
DBUG_ENTER("mysql_delete");
|
|
|
|
if (!table_list->db)
|
|
table_list->db=thd->db;
|
|
if ((thd->options & OPTION_SAFE_UPDATES) && !conds)
|
|
{
|
|
send_error(&thd->net,ER_UPDATE_WITHOUT_KEY_IN_SAFE_MODE);
|
|
DBUG_RETURN(1);
|
|
}
|
|
|
|
use_generate_table= (!using_limit && !conds &&
|
|
!(specialflag &
|
|
(SPECIAL_NO_NEW_FUNC | SPECIAL_SAFE_MODE)) &&
|
|
!(thd->options &
|
|
(OPTION_NOT_AUTO_COMMIT | OPTION_BEGIN)));
|
|
#ifdef HAVE_INNOBASE_DB
|
|
/* We need to add code to not generate table based on the table type */
|
|
if (!innodb_skip)
|
|
use_generate_table=0; // Innodb can't use re-generate table
|
|
#endif
|
|
if (use_generate_table && ! thd->open_tables)
|
|
{
|
|
error=generate_table(thd,table_list,(TABLE*) 0);
|
|
if (error <= 0)
|
|
DBUG_RETURN(error); // Error or ok
|
|
}
|
|
if (!(table = open_ltable(thd,table_list,
|
|
limit != HA_POS_ERROR ? TL_WRITE_LOW_PRIORITY :
|
|
lock_type)))
|
|
DBUG_RETURN(-1);
|
|
table->file->info(HA_STATUS_VARIABLE | HA_STATUS_NO_LOCK);
|
|
thd->proc_info="init";
|
|
if (use_generate_table)
|
|
DBUG_RETURN(generate_table(thd,table_list,table));
|
|
table->map=1;
|
|
if (setup_conds(thd,table_list,&conds))
|
|
DBUG_RETURN(-1);
|
|
|
|
table->used_keys=table->quick_keys=0; // Can't use 'only index'
|
|
select=make_select(table,0,0,conds,&error);
|
|
if (error)
|
|
DBUG_RETURN(-1);
|
|
if (select && select->check_quick(test(thd->options & SQL_SAFE_UPDATES),
|
|
limit))
|
|
{
|
|
delete select;
|
|
send_ok(&thd->net,0L);
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
/* If running in safe sql mode, don't allow updates without keys */
|
|
if (!table->quick_keys)
|
|
{
|
|
thd->lex.options|=QUERY_NO_INDEX_USED;
|
|
if ((thd->options & OPTION_SAFE_UPDATES) && limit == HA_POS_ERROR)
|
|
{
|
|
delete select;
|
|
send_error(&thd->net,ER_UPDATE_WITHOUT_KEY_IN_SAFE_MODE);
|
|
DBUG_RETURN(1);
|
|
}
|
|
}
|
|
(void) table->file->extra(HA_EXTRA_NO_READCHECK);
|
|
if (options & OPTION_QUICK)
|
|
(void) table->file->extra(HA_EXTRA_QUICK);
|
|
init_read_record(&info,thd,table,select,-1,1);
|
|
ulong deleted=0L;
|
|
thd->proc_info="updating";
|
|
while (!(error=info.read_record(&info)) && !thd->killed)
|
|
{
|
|
if (!(select && select->skipp_record()))
|
|
{
|
|
if (!(error=table->file->delete_row(table->record[0])))
|
|
{
|
|
deleted++;
|
|
if (!--limit && using_limit)
|
|
{
|
|
error= -1;
|
|
break;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
table->file->print_error(error,MYF(0));
|
|
error=0;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
thd->proc_info="end";
|
|
end_read_record(&info);
|
|
(void) table->file->extra(HA_EXTRA_READCHECK);
|
|
if (options & OPTION_QUICK)
|
|
(void) table->file->extra(HA_EXTRA_NORMAL);
|
|
using_transactions=table->file->has_transactions();
|
|
if (deleted && (error <= 0 || !using_transactions))
|
|
{
|
|
mysql_update_log.write(thd,thd->query, thd->query_length);
|
|
if (mysql_bin_log.is_open())
|
|
{
|
|
Query_log_event qinfo(thd, thd->query, using_transactions);
|
|
if (mysql_bin_log.write(&qinfo) && using_transactions)
|
|
error=1;
|
|
}
|
|
if (!using_transactions)
|
|
thd->options|=OPTION_STATUS_NO_TRANS_UPDATE;
|
|
}
|
|
if (using_transactions && ha_autocommit_or_rollback(thd,error >= 0))
|
|
error=1;
|
|
if (thd->lock)
|
|
{
|
|
mysql_unlock_tables(thd, thd->lock);
|
|
thd->lock=0;
|
|
}
|
|
delete select;
|
|
if (error >= 0) // Fatal error
|
|
send_error(&thd->net,thd->killed ? ER_SERVER_SHUTDOWN: 0);
|
|
else
|
|
{
|
|
send_ok(&thd->net,deleted);
|
|
DBUG_PRINT("info",("%d records deleted",deleted));
|
|
}
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
|