diff options
| author | unknown <aivanov@mysql.com> | 2005-12-13 16:49:24 +0300 |
|---|---|---|
| committer | unknown <aivanov@mysql.com> | 2005-12-13 16:49:24 +0300 |
| commit | ad4d8773506e1c13d39f7b89a4ce4dce63b9ad49 (patch) | |
| tree | 2b49f5bf8c4bd1ae14a7c9930b7364deb447f530 /storage/innobase/ha | |
| parent | 2309be62e54ac54877645e0c264797646a379b32 (diff) | |
| download | mariadb-git-ad4d8773506e1c13d39f7b89a4ce4dce63b9ad49.tar.gz | |
Changes from the innodb-5.1-ss28 snapshot.
Removed include/Makefile.am and the reference to it.
Deleted db/db0err.h and db directory.
Check index column sizes in a better way (bug 13315).
Fixed comments for memory allocation functions and added
some extra checks. Adapted callers.
BitKeeper/deleted/.del-Makefile.am~ab5c84d46412dc2e:
Delete: storage/innobase/include/Makefile.am
BitKeeper/deleted/.del-db0err.h~bfeec2efe86ac48b:
Delete: storage/innobase/db/db0err.h
mysql-test/r/innodb.result:
Changes from the innodb-5.1-ss28 snapshot.
mysql-test/t/innodb.test:
Changes from the innodb-5.1-ss28 snapshot.
sql/ha_innodb.cc:
Changes from the innodb-5.1-ss28 snapshot.
sql/ha_innodb.h:
Changes from the innodb-5.1-ss28 snapshot.
storage/innobase/Makefile.am:
Changes from the innodb-5.1-ss28 snapshot.
storage/innobase/configure.in:
Changes from the innodb-5.1-ss28 snapshot.
storage/innobase/ha/ha0ha.c:
Changes from the innodb-5.1-ss28 snapshot.
storage/innobase/include/ha0ha.h:
Changes from the innodb-5.1-ss28 snapshot.
storage/innobase/include/ha0ha.ic:
Changes from the innodb-5.1-ss28 snapshot.
storage/innobase/include/mem0mem.h:
Changes from the innodb-5.1-ss28 snapshot.
storage/innobase/include/mem0mem.ic:
Changes from the innodb-5.1-ss28 snapshot.
storage/innobase/lock/lock0lock.c:
Changes from the innodb-5.1-ss28 snapshot.
storage/innobase/mem/mem0mem.c:
Changes from the innodb-5.1-ss28 snapshot.
Diffstat (limited to 'storage/innobase/ha')
| -rw-r--r-- | storage/innobase/ha/ha0ha.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/storage/innobase/ha/ha0ha.c b/storage/innobase/ha/ha0ha.c index ad1391ff83e..fdc3d48c14b 100644 --- a/storage/innobase/ha/ha0ha.c +++ b/storage/innobase/ha/ha0ha.c @@ -40,9 +40,13 @@ ha_create( table->adaptive = FALSE; } + /* Creating MEM_HEAP_BTR_SEARCH type heaps can potentially fail, + but in practise it never should in this case, hence the asserts. */ + if (n_mutexes == 0) { if (in_btr_search) { table->heap = mem_heap_create_in_btr_search(4096); + ut_a(table->heap); } else { table->heap = mem_heap_create_in_buffer(4096); } @@ -57,6 +61,7 @@ ha_create( for (i = 0; i < n_mutexes; i++) { if (in_btr_search) { table->heaps[i] = mem_heap_create_in_btr_search(4096); + ut_a(table->heaps[i]); } else { table->heaps[i] = mem_heap_create_in_buffer(4096); } |