diff options
author | unknown <anozdrin/alik@station.> | 2007-12-13 12:06:37 +0300 |
---|---|---|
committer | unknown <anozdrin/alik@station.> | 2007-12-13 12:06:37 +0300 |
commit | f2b8de236827d12fdb3d48a15f9cac2fcd344cdf (patch) | |
tree | 9a07f340dee38c8809e640e9365a67fbbeb1086f /sql/sql_partition.cc | |
parent | 0d5caaa4a1213e7d2d52a27ed41de32f3da0c050 (diff) | |
parent | a3a0d4359fef580a30704797ceeed613600deedc (diff) | |
download | mariadb-git-f2b8de236827d12fdb3d48a15f9cac2fcd344cdf.tar.gz |
Merge station.:/mnt/raid/alik/MySQL/devel/5.1
into station.:/mnt/raid/alik/MySQL/devel/5.1-rt
sql/ha_partition.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_partition.cc:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'sql/sql_partition.cc')
-rw-r--r-- | sql/sql_partition.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc index 04b7703ef88..541de387c6e 100644 --- a/sql/sql_partition.cc +++ b/sql/sql_partition.cc @@ -2068,6 +2068,7 @@ char *generate_partition_syntax(partition_info *part_info, default: DBUG_ASSERT(0); /* We really shouldn't get here, no use in continuing from here */ + my_error(ER_OUT_OF_RESOURCES, MYF(0)); current_thd->fatal_error(); DBUG_RETURN(NULL); } |