mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-21 22:34:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge dator5.(none):/home/pappa/clean-mysql-5.1

Browse source 
into  dator5.(none):/home/pappa/bug17138
This commit is contained in:
mikael@dator5.(none) 2006-06-20 08:53:12 -04:00
commit 75f3586117
10 changed files with 101 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
mysql-test/r/partition.result
View file

@ -1043,4 +1043,19 @@ alter table t1 add partition (partition p2 values in (3));
alter table t1 drop partition p2;
use test;
drop database db99;
create table t1 (a int)
partition by list (a)
(partition p0 values in (0));
insert into t1 values (0);
create procedure po ()
begin
begin
declare continue handler for sqlexception begin end;
update ignore t1 set a = 1 where a = 0;
end;
prepare stmt1 from 'alter table t1';
execute stmt1;
end//
call po()//
drop table t1;
End of 5.1 tests

23
mysql-test/t/partition.test
View file

@ -1199,4 +1199,27 @@ alter table t1 drop partition p2;
use test;
drop database db99;
#
#BUG 17138 Problem with stored procedure and analyze partition
#
create table t1 (a int)
partition by list (a)
(partition p0 values in (0));
insert into t1 values (0);
delimiter //;
create procedure po ()
begin
begin
declare continue handler for sqlexception begin end;
update ignore t1 set a = 1 where a = 0;
end;
prepare stmt1 from 'alter table t1';
execute stmt1;
end//
call po()//
delimiter ;//
drop table t1;
--echo End of 5.1 tests

8
sql/ha_ndbcluster.h
View file

@ -654,6 +654,14 @@ class ha_ndbcluster: public handler
int get_default_no_partitions(ulonglong max_rows);
bool get_no_parts(const char *name, uint *no_parts);
void set_auto_partitions(partition_info *part_info);
virtual bool cannot_ignore_error(int error, uint flags)
{
if (!handler::cannot_ignore_error(error, flags))
return FALSE;
if (error == HA_ERR_NO_PARTITION_FOUND)
return FALSE;
return TRUE;
}
THR_LOCK_DATA **store_lock(THD *thd,
THR_LOCK_DATA **to,

8
sql/ha_partition.h
View file

@ -302,6 +302,14 @@ public:
virtual void start_bulk_insert(ha_rows rows);
virtual int end_bulk_insert();
virtual bool cannot_ignore_error(int error, uint flags)
{
if (!handler::cannot_ignore_error(error, flags))
return FALSE;
if (error == HA_ERR_NO_PARTITION_FOUND)
return FALSE;
return TRUE;
}
/*
-------------------------------------------------------------------------
MODULE full table scan

25
sql/handler.h
View file

@ -970,7 +970,28 @@ public:
bool has_transactions()
{ return (ha_table_flags() & HA_NO_TRANSACTIONS) == 0; }
virtual uint extra_rec_buf_length() const { return 0; }
/*
This method is used to analyse the error to see whether the error
is ignorable or not, certain handlers can have more error that are
ignorable than others. E.g. the partition handler can get inserts
into a range where there is no partition and this is an ignorable
error.
*/
#define HA_CHECK_DUPP_KEY 1
#define HA_CHECK_DUPP_UNIQUE 2
#define HA_CHECK_DUPP (HA_CHECK_DUPP_KEY + HA_CHECK_DUPP_UNIQUE)
virtual bool cannot_ignore_error(int error, uint flags)
{
if (!error ||
((flags & HA_CHECK_DUPP_KEY) &&
error == HA_ERR_FOUND_DUPP_KEY) ||
((flags & HA_CHECK_DUPP_UNIQUE) &&
error == HA_ERR_FOUND_DUPP_UNIQUE))
return FALSE;
return TRUE;
}
/*
Number of rows in table. It will only be called if
(table_flags() & (HA_HAS_RECORDS | HA_STATS_RECORDS_IS_EXACT)) != 0
@ -1022,7 +1043,7 @@ public:
DBUG_RETURN(rnd_end());
}
int ha_reset();
/* this is necessary in many places, e.g. in HANDLER command */
int ha_index_or_rnd_end()
{

9
sql/sql_acl.cc
View file

@ -2049,8 +2049,7 @@ static int replace_user_table(THD *thd, TABLE *table, const LEX_USER &combo,
}
else if ((error=table->file->ha_write_row(table->record[0]))) // insert
{ // This should never happen
if (error && error != HA_ERR_FOUND_DUPP_KEY &&
error != HA_ERR_FOUND_DUPP_UNIQUE) /* purecov: inspected */
if (table->file->cannot_ignore_error(error, HA_CHECK_DUPP))
{
table->file->print_error(error,MYF(0)); /* purecov: deadcode */
error= -1; /* purecov: deadcode */
@ -2172,7 +2171,7 @@ static int replace_db_table(TABLE *table, const char *db,
}
else if (rights && (error= table->file->ha_write_row(table->record[0])))
{
if (error && error != HA_ERR_FOUND_DUPP_KEY) /* purecov: inspected */
if (table->file->cannot_ignore_error(error, HA_CHECK_DUPP_KEY))
goto table_error; /* purecov: deadcode */
}
@ -2744,7 +2743,7 @@ static int replace_table_table(THD *thd, GRANT_TABLE *grant_table,
else
{
error=table->file->ha_write_row(table->record[0]);
if (error && error != HA_ERR_FOUND_DUPP_KEY)
if (table->file->cannot_ignore_error(error, HA_CHECK_DUPP_KEY))
goto table_error; /* purecov: deadcode */
}
@ -2862,7 +2861,7 @@ static int replace_routine_table(THD *thd, GRANT_NAME *grant_name,
else
{
error=table->file->ha_write_row(table->record[0]);
if (error && error != HA_ERR_FOUND_DUPP_KEY)
if (table->file->cannot_ignore_error(error, HA_CHECK_DUPP_KEY))
goto table_error;
}

8
sql/sql_insert.cc
View file

@ -979,6 +979,9 @@ int write_record(THD *thd, TABLE *table,COPY_INFO *info)
if (error != HA_WRITE_SKIP)
goto err;
table->file->restore_auto_increment(); // it's too early here! BUG#20188
if (info->ignore &&
!table->file->cannot_ignore_error(error, 0))
goto ok_or_after_trg_err;
if ((int) (key_nr = table->file->get_dup_key(error)) < 0)
{
error=HA_WRITE_SKIP; /* Database can't find key */
@ -1062,7 +1065,8 @@ int write_record(THD *thd, TABLE *table,COPY_INFO *info)
if ((error=table->file->ha_update_row(table->record[1],
table->record[0])))
{
if ((error == HA_ERR_FOUND_DUPP_KEY) && info->ignore)
if (info->ignore &&
!table->file->cannot_ignore_error(error, HA_CHECK_DUPP_KEY))
goto ok_or_after_trg_err;
goto err;
}
@ -1148,7 +1152,7 @@ int write_record(THD *thd, TABLE *table,COPY_INFO *info)
else if ((error=table->file->ha_write_row(table->record[0])))
{
if (!info->ignore ||
(error != HA_ERR_FOUND_DUPP_KEY && error != HA_ERR_FOUND_DUPP_UNIQUE))
table->file->cannot_ignore_error(error, HA_CHECK_DUPP))
goto err;
table->file->restore_auto_increment();
}

6
sql/sql_table.cc
View file

@ -6268,10 +6268,8 @@ copy_data_between_tables(TABLE *from,TABLE *to,
}
if ((error=to->file->ha_write_row((byte*) to->record[0])))
{
if ((!ignore &&
handle_duplicates != DUP_REPLACE) ||
(error != HA_ERR_FOUND_DUPP_KEY &&
error != HA_ERR_FOUND_DUPP_UNIQUE))
if (!ignore ||
to->file->cannot_ignore_error(error, HA_CHECK_DUPP))
{
if (error == HA_ERR_FOUND_DUPP_KEY)
{

2
sql/sql_union.cc
View file

@ -65,7 +65,7 @@ bool select_union::send_data(List<Item> &values)
if ((error= table->file->ha_write_row(table->record[0])))
{
/* create_myisam_from_heap will generate error if needed */
if (error != HA_ERR_FOUND_DUPP_KEY && error != HA_ERR_FOUND_DUPP_UNIQUE &&
if (table->file->cannot_ignore_error(error, HA_CHECK_DUPP) &&
create_myisam_from_heap(thd, table, &tmp_table_param, error, 1))
return 1;
}

20
sql/sql_update.cc
View file

@ -541,13 +541,14 @@ int mysql_update(THD *thd,
break;
}
}
else if (!ignore || error != HA_ERR_FOUND_DUPP_KEY)
else if (!ignore ||
table->file->cannot_ignore_error(error, HA_CHECK_DUPP_KEY))
{
/*
If (ignore && error == HA_ERR_FOUND_DUPP_KEY) we don't have to
If (ignore && error is ignorable) we don't have to
do anything; otherwise...
*/
if (error != HA_ERR_FOUND_DUPP_KEY)
if (table->file->cannot_ignore_error(error, HA_CHECK_DUPP_KEY))
thd->fatal_error(); /* Other handler errors are fatal */
table->file->print_error(error,MYF(0));
error= 1;
@ -1417,13 +1418,14 @@ bool multi_update::send_data(List<Item> &not_used_values)
table->record[0])))
{
updated--;
if (!ignore || error != HA_ERR_FOUND_DUPP_KEY)
if (!ignore ||
table->file->cannot_ignore_error(error, HA_CHECK_DUPP_KEY))
{
/*
If (ignore && error == HA_ERR_FOUND_DUPP_KEY) we don't have to
If (ignore && error == is ignorable) we don't have to
do anything; otherwise...
*/
if (error != HA_ERR_FOUND_DUPP_KEY)
if (table->file->cannot_ignore_error(error, HA_CHECK_DUPP_KEY))
thd->fatal_error(); /* Other handler errors are fatal */
table->file->print_error(error,MYF(0));
DBUG_RETURN(1);
@ -1452,8 +1454,7 @@ bool multi_update::send_data(List<Item> &not_used_values)
/* Write row, ignoring duplicated updates to a row */
if ((error= tmp_table->file->ha_write_row(tmp_table->record[0])))
{
if (error != HA_ERR_FOUND_DUPP_KEY &&
error != HA_ERR_FOUND_DUPP_UNIQUE &&
if (tmp_table->file->cannot_ignore_error(error, HA_CHECK_DUPP) &&
create_myisam_from_heap(thd, tmp_table,
tmp_table_param + offset, error, 1))
{
@ -1576,7 +1577,8 @@ int multi_update::do_updates(bool from_send_error)
if ((local_error=table->file->ha_update_row(table->record[1],
table->record[0])))
{
if (!ignore || local_error != HA_ERR_FOUND_DUPP_KEY)
if (!ignore ||
table->file->cannot_ignore_error(local_error, HA_CHECK_DUPP_KEY))
goto err;
}
updated++;