diff options
| author | monty@mashka.mysql.fi <> | 2002-12-21 10:56:40 +0200 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2002-12-21 10:56:40 +0200 |
| commit | f03bbd3fe28455885603890a21eebfe2792f2704 (patch) | |
| tree | ad383628b0de0a338b83b72a5c8832d3177b18af /innobase | |
| parent | 1033c9d2ece70cae86c24d60f2b724c492ca8827 (diff) | |
| parent | 962042e76d8529fb24abb0808f37247f3448f69a (diff) | |
| download | mariadb-git-f03bbd3fe28455885603890a21eebfe2792f2704.tar.gz | |
Merge with 3.23:
Remove duplicate casedn_str() in mysql_change_db()
Fix for null handling in CASE
Diffstat (limited to 'innobase')
| -rw-r--r-- | innobase/btr/btr0sea.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/innobase/btr/btr0sea.c b/innobase/btr/btr0sea.c index cef3a4e4b38..31f001ee769 100644 --- a/innobase/btr/btr0sea.c +++ b/innobase/btr/btr0sea.c @@ -453,8 +453,6 @@ btr_search_info_update_slow( } if (build_index) { - ut_a(block->n_fields + block->n_bytes > 0); - btr_search_build_page_hash_index(block->frame, block->n_fields, block->n_bytes, @@ -1028,7 +1026,10 @@ btr_search_build_page_hash_index( return; } - ut_a(n_fields + n_bytes > 0); + if (n_fields + n_bytes == 0) { + + return; + } /* Calculate and cache fold values and corresponding records into an array for fast insertion to the hash index */ |