diff options
| author | Mattias Jonsson <mattias.jonsson@sun.com> | 2010-05-25 15:41:00 +0200 |
|---|---|---|
| committer | Mattias Jonsson <mattias.jonsson@sun.com> | 2010-05-25 15:41:00 +0200 |
| commit | 0fdd97af48190fab72ea752a7d8120d891bb49af (patch) | |
| tree | 5645afdf3de2c1af3196a6449398bc4b0a03f6fa /sql/ha_partition.cc | |
| parent | 8f8e1d6fb85d4be1e8e44beb22b26a72f76ac84e (diff) | |
| download | mariadb-git-0fdd97af48190fab72ea752a7d8120d891bb49af.tar.gz | |
Bug#49161: Out of memory; restart server and try again (needed 2 bytes)
Problem was reporting wrong error
Fixed by adding a new error which better explain the problem.
mysql-test/r/partition_error.result:
Bug#49161: Out of memory; restart server and try again (needed 2 bytes)
Updated test result
mysql-test/t/partition_error.test:
Bug#49161: Out of memory; restart server and try again (needed 2 bytes)
Added test case
sql/ha_partition.cc:
Bug#49161: Out of memory; restart server and try again (needed 2 bytes)
Better error message. (used ER_UNKNOWN_ERROR to avoid merge
problems in mysql-trunk+)
Diffstat (limited to 'sql/ha_partition.cc')
| -rw-r--r-- | sql/ha_partition.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc index 4fc3b2c9908..60722f0100e 100644 --- a/sql/ha_partition.cc +++ b/sql/ha_partition.cc @@ -359,7 +359,7 @@ bool ha_partition::initialize_partition(MEM_ROOT *mem_root) } else if (get_from_handler_file(table_share->normalized_path.str, mem_root)) { - mem_alloc_error(2); + my_message(ER_UNKNOWN_ERROR, "Failed to read from the .par file", MYF(0)); DBUG_RETURN(1); } /* |