diff options
| author | unknown <anozdrin/alik@quad.> | 2008-01-24 17:40:16 +0300 |
|---|---|---|
| committer | unknown <anozdrin/alik@quad.> | 2008-01-24 17:40:16 +0300 |
| commit | 5785aba2f824100b5df9623a4e4308c07b24c4d5 (patch) | |
| tree | d59a77ecb53e7024c9cc6d75940f9e96c46b7d67 /sql/sql_insert.cc | |
| parent | f23b19eaea46b983db99d1662780a232b3f8cfba (diff) | |
| parent | e63a05012f1cc14a2d21d08b0f5d7fc385c8fd12 (diff) | |
| download | mariadb-git-5785aba2f824100b5df9623a4e4308c07b24c4d5.tar.gz | |
Merge quad.:/mnt/raid/alik/MySQL/devel/5.1
into quad.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged-5.0-rt
mysql-test/r/innodb_mysql.result:
Auto merged
mysql-test/t/disabled.def:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_update.cc:
Auto merged
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 1aa12e83126..7f12fbc8815 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -1863,7 +1863,6 @@ bool delayed_get_table(THD *thd, TABLE_LIST *table_list) { if (!(di= new Delayed_insert())) { - my_error(ER_OUTOFMEMORY,MYF(0),sizeof(Delayed_insert)); thd->fatal_error(); goto end_create; } |