diff options
author | unknown <mikael@dator5.(none)> | 2006-06-21 20:55:33 -0400 |
---|---|---|
committer | unknown <mikael@dator5.(none)> | 2006-06-21 20:55:33 -0400 |
commit | 532915484940221bc3c9a3090667c0b441183517 (patch) | |
tree | 229d58cb6bd73929cf19bc60f149f7fb89bbe9e6 /sql/sql_union.cc | |
parent | 9fc2ade279e8feca054262256fe2747e28860b04 (diff) | |
download | mariadb-git-532915484940221bc3c9a3090667c0b441183517.tar.gz |
BUG#17138: Error in stored procedure
Review comments
mysql-test/t/partition.test:
Changed procedure names ensured procedures were dropped
sql/ha_ndbcluster.h:
Improved name of method
sql/ha_partition.h:
Improved name of method
sql/handler.h:
Improved name of method
Removed deprecated constants
sql/item_sum.cc:
Improved name of method
sql/sql_acl.cc:
Improved name of method
sql/sql_insert.cc:
Removed use of HA_WRITE_SKIP and introduced is_fatal_error instead
sql/sql_select.cc:
Improved name of method
sql/sql_table.cc:
Improved name of method
Reintroduced dead code for future possible use
sql/sql_union.cc:
Improved name of method
sql/sql_update.cc:
Improved name of method
Diffstat (limited to 'sql/sql_union.cc')
-rw-r--r-- | sql/sql_union.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index 5ad5ecc6556..fd4529090d4 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -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 (table->file->cannot_ignore_error(error, HA_CHECK_DUPP) && + if (table->file->is_fatal_error(error, HA_CHECK_DUPP) && create_myisam_from_heap(thd, table, &tmp_table_param, error, 1)) return 1; } |