diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-04-20 15:25:55 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-04-20 15:25:55 +0200 |
| commit | b069d19284b70ead3ceb62618acdc8ef93a2703e (patch) | |
| tree | 0d5f6764825d51db3b8a37c8043d837c06e3e086 /storage/innobase/dict | |
| parent | 1bc0b0b5245977172e2c3a3c64a42a2c4e762e06 (diff) | |
| parent | e7061f7e5a96c66cb2e0bf46bec7f6ff35801a69 (diff) | |
| download | mariadb-git-b069d19284b70ead3ceb62618acdc8ef93a2703e.tar.gz | |
Merge branch 'mysql/5.5' into 5.5
Diffstat (limited to 'storage/innobase/dict')
| -rw-r--r-- | storage/innobase/dict/dict0crea.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/dict/dict0crea.c b/storage/innobase/dict/dict0crea.c index dcce3c1dca1..8102f570175 100644 --- a/storage/innobase/dict/dict0crea.c +++ b/storage/innobase/dict/dict0crea.c @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1996, 2014, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -1140,7 +1140,7 @@ dict_create_index_step( >= DICT_TF_FORMAT_ZIP); node->index = dict_index_get_if_in_cache_low(index_id); - ut_a(err == DB_SUCCESS ? node->index != NULL : node->index == NULL); + ut_a((node->index == NULL) == (err != DB_SUCCESS)); if (err != DB_SUCCESS) { |