diff options
| author | unknown <serg@janus.mylan> | 2007-02-26 16:12:40 +0100 |
|---|---|---|
| committer | unknown <serg@janus.mylan> | 2007-02-26 16:12:40 +0100 |
| commit | 39622e126775b6b7de3b727aa4dd0da5fdab5d74 (patch) | |
| tree | abec5b528446805866d0c3e28ebea8ef58ccab4f /sql/unireg.cc | |
| parent | 506af377b3af4b677fce194e0935aca4cd230a5a (diff) | |
| parent | 1eb71c68cb1b2f335a8e6b393cdb3e724ea65a0a (diff) | |
| download | mariadb-git-39622e126775b6b7de3b727aa4dd0da5fdab5d74.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into janus.mylan:/usr/home/serg/Abk/mysql-5.1
include/my_global.h:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/opt_range.h:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/table.cc:
Auto merged
sql/tztime.cc:
Auto merged
storage/innobase/handler/ha_innodb.cc:
Auto merged
storage/myisam/ha_myisam.cc:
Auto merged
storage/myisammrg/ha_myisammrg.cc:
Auto merged
support-files/Makefile.am:
Auto merged
BUILD/compile-solaris-sparc-forte:
merged
BUILD/compile-solaris-sparc-purify:
merged
Diffstat (limited to 'sql/unireg.cc')
| -rw-r--r-- | sql/unireg.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/unireg.cc b/sql/unireg.cc index 5faacb02d5f..d90420313a6 100644 --- a/sql/unireg.cc +++ b/sql/unireg.cc @@ -913,7 +913,10 @@ static bool make_empty_rec(THD *thd, File file,enum legacy_db_type table_type, field->interval, field->field_name); if (!regfield) + { + error= 1; goto err; // End of memory + } /* save_in_field() will access regfield->table->in_use */ regfield->init(&table); |