diff options
| author | unknown <mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se> | 2006-06-13 14:36:23 -0400 |
|---|---|---|
| committer | unknown <mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se> | 2006-06-13 14:36:23 -0400 |
| commit | 60be734e52dfa96aa4cec371d1b41c2ba1efcbb8 (patch) | |
| tree | 3baba20c740f347bd41deb095102fe95ae05dda4 /sql/partition_info.cc | |
| parent | e05d55de5ff6c95143fb1096da8019ab5fb7c6a2 (diff) | |
| download | mariadb-git-60be734e52dfa96aa4cec371d1b41c2ba1efcbb8.tar.gz | |
BUG#19307: CSV engine can cause crashes in partitioned tables (due to its conversion of NULLs to 0)
mysql-test/r/partition.result:
New test case
mysql-test/t/partition.test:
New test case
sql/partition_info.cc:
Disable CSV engine for partitioned tables
sql/share/errmsg.txt:
Update error message for more flexibility
sql/sql_partition.cc:
Editing fixes
Diffstat (limited to 'sql/partition_info.cc')
| -rw-r--r-- | sql/partition_info.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/partition_info.cc b/sql/partition_info.cc index 0924a8adf6e..0af200dc4d2 100644 --- a/sql/partition_info.cc +++ b/sql/partition_info.cc @@ -442,9 +442,11 @@ bool partition_info::check_engine_mix(handlerton **engine_array, uint no_parts) DBUG_RETURN(TRUE); } } while (++i < no_parts); - if (engine_array[0] == &myisammrg_hton) + if (engine_array[0] == &myisammrg_hton || + engine_array[0] == &tina_hton) { - my_error(ER_PARTITION_MERGE_ERROR, MYF(0)); + my_error(ER_PARTITION_MERGE_ERROR, MYF(0), + engine_array[0] == &myisammrg_hton ? "MyISAM Merge" : "CSV"); DBUG_RETURN(TRUE); } DBUG_RETURN(FALSE); |