diff options
| author | Sven Sandberg <sven.sandberg@oracle.com> | 2010-12-19 18:15:12 +0100 |
|---|---|---|
| committer | Sven Sandberg <sven.sandberg@oracle.com> | 2010-12-19 18:15:12 +0100 |
| commit | e37c86de18ba627f8c055e4a1b0923fb1f0a55de (patch) | |
| tree | 91a12675003778cd8ccbccea5ce47ee09fc46efc /sql/opt_range.cc | |
| parent | 7d5df402778b7e5c1df06f3dcaf499612d628a7c (diff) | |
| parent | 09c80e12c535b080eaf914ed25dbf79546494030 (diff) | |
| download | mariadb-git-e37c86de18ba627f8c055e4a1b0923fb1f0a55de.tar.gz | |
Merged BUG#49978 from 5.1-bugteam to 5.5-bugteam.
Diffstat (limited to 'sql/opt_range.cc')
| -rw-r--r-- | sql/opt_range.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc index f39037e9db9..dd5d0ebd80e 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -8278,7 +8278,7 @@ int QUICK_INDEX_MERGE_SELECT::read_keys_and_merge() if (unique == NULL) { - DBUG_EXECUTE_IF("index_merge_may_not_create_a_Unique", abort(); ); + DBUG_EXECUTE_IF("index_merge_may_not_create_a_Unique", DBUG_ABORT(); ); DBUG_EXECUTE_IF("only_one_Unique_may_be_created", DBUG_SET("+d,index_merge_may_not_create_a_Unique"); ); |