diff options
| author | unknown <monty@mashka.mysql.fi> | 2002-12-21 10:56:40 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2002-12-21 10:56:40 +0200 |
| commit | 62c7449a5594972f5e940bfdf8785a70f82af82c (patch) | |
| tree | ad383628b0de0a338b83b72a5c8832d3177b18af /innobase/btr/btr0sea.c | |
| parent | 23362b5cae7acbe00b64980802e8e5e7f9480f7d (diff) | |
| parent | 5f1b9717c53f19ef4f7a5206f59a7678a025dbe2 (diff) | |
| download | mariadb-git-62c7449a5594972f5e940bfdf8785a70f82af82c.tar.gz | |
Merge with 3.23:
Remove duplicate casedn_str() in mysql_change_db()
Fix for null handling in CASE
innobase/btr/btr0sea.c:
Auto merged
mysql-test/t/case.test:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
mysql-test/r/case.result:
merge with 3.23
sql/sql_db.cc:
Merge with 3.23 (to remove duplicate casedn_str())
Diffstat (limited to 'innobase/btr/btr0sea.c')
| -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 */ |