diff options
author | unknown <monty@donna.mysql.com> | 2000-12-18 16:09:19 +0200 |
---|---|---|
committer | unknown <monty@donna.mysql.com> | 2000-12-18 16:09:19 +0200 |
commit | 374cc051d74e702f4713c393958bbf6cb78760a2 (patch) | |
tree | c93d85948282e07d8ce6727243cecb6a03d0335f /sql/ha_berkeley.cc | |
parent | 289de3ff9d278a61e28d854b9010cc7967b9dc11 (diff) | |
download | mariadb-git-374cc051d74e702f4713c393958bbf6cb78760a2.tar.gz |
Lots of new benchmark runs
Remember filename for temporary files created with mkstemp
Fixed wrongly allocated BDB share structure
Cleanups for SunPRO
BitKeeper/deleted/.del-ATIS-mysql-SunOS_5.6_sun4m~62028e0375b3b8b:
***MISSING WEAVE***
BitKeeper/deleted/.del-RUN-mysql-SunOS_5.6_sun4m~eafc8188345e262b:
***MISSING WEAVE***
BitKeeper/deleted/.del-alter-table-mysql-SunOS_5.6_sun4m~8a1bd6589a189890:
***MISSING WEAVE***
BitKeeper/deleted/.del-big-tables-mysql-SunOS_5.6_sun4m~f351a7f3e1e2257e:
***MISSING WEAVE***
BitKeeper/deleted/.del-connect-mysql-SunOS_5.6_sun4m~a10e3ddfa26a3e7f:
***MISSING WEAVE***
BitKeeper/deleted/.del-create-mysql-SunOS_5.6_sun4m~9233114ae6f8c5f:
***MISSING WEAVE***
BitKeeper/deleted/.del-insert-mysql-SunOS_5.6_sun4m~3402d060ae20e19:
***MISSING WEAVE***
BitKeeper/deleted/.del-select-mysql-SunOS_5.6_sun4m~4da215905bce988d:
***MISSING WEAVE***
BitKeeper/deleted/.del-wisconsin-mysql-SunOS_5.6_sun4m~ec61b14072715dc8:
***MISSING WEAVE***
BitKeeper/deleted/.del-ATIS-mysql-Linux_2.2.12_20smp_i686~28211fb9f0e6ab0e:
***MISSING WEAVE***
BitKeeper/deleted/.del-RUN-mysql-Linux_2.2.12_20smp_i686~da28ced3e0aac09c:
***MISSING WEAVE***
BitKeeper/deleted/.del-alter-table-mysql-Linux_2.2.12_20smp_i686~67ae4e91b5f4eabd:
***MISSING WEAVE***
BitKeeper/deleted/.del-big-tables-mysql-Linux_2.2.12_20smp_i686~a2dcb74a3c73ac18:
***MISSING WEAVE***
BitKeeper/deleted/.del-connect-mysql-Linux_2.2.12_20smp_i686~beedcd769a903c19:
***MISSING WEAVE***
BitKeeper/deleted/.del-create-mysql-Linux_2.2.12_20smp_i686~fe23ee50aea195f4:
***MISSING WEAVE***
BitKeeper/deleted/.del-insert-mysql-Linux_2.2.12_20smp_i686~f120b0ead3836c81:
***MISSING WEAVE***
BitKeeper/deleted/.del-select-mysql-Linux_2.2.12_20smp_i686~3b64aff0dfddfff4:
***MISSING WEAVE***
BitKeeper/deleted/.del-wisconsin-mysql-Linux_2.2.12_20smp_i686~d49db545341a732f:
***MISSING WEAVE***
BitKeeper/deleted/.del-ATIS-mysql-Linux_2.2.13_SMP_alpha~136bdd9fd1a2cd14:
***MISSING WEAVE***
BitKeeper/deleted/.del-ATIS-mysql_fast-Linux_2.2.13_SMP_alpha~defb62af5958fcac:
***MISSING WEAVE***
BitKeeper/deleted/.del-RUN-mysql-Linux_2.2.13_SMP_alpha~f6fa9f46d4a6152:
***MISSING WEAVE***
BitKeeper/deleted/.del-RUN-mysql_fast-Linux_2.2.13_SMP_alpha~16694c5927b7600c:
***MISSING WEAVE***
BitKeeper/deleted/.del-alter-table-mysql-Linux_2.2.13_SMP_alpha~c85eb85ba45dd748:
***MISSING WEAVE***
BitKeeper/deleted/.del-alter-table-mysql_fast-Linux_2.2.13_SMP_alpha~b062db76cf6df5d2:
***MISSING WEAVE***
BitKeeper/deleted/.del-big-tables-mysql-Linux_2.2.13_SMP_alpha~b5f4f4c35225f0f:
***MISSING WEAVE***
BitKeeper/deleted/.del-big-tables-mysql_fast-Linux_2.2.13_SMP_alpha~a9eedd951eab7e8b:
***MISSING WEAVE***
BitKeeper/deleted/.del-connect-mysql-Linux_2.2.13_SMP_alpha~74ec2bf5f55b81f:
***MISSING WEAVE***
BitKeeper/deleted/.del-connect-mysql_fast-Linux_2.2.13_SMP_alpha~f6d7665c418d62c6:
***MISSING WEAVE***
BitKeeper/deleted/.del-create-mysql-Linux_2.2.13_SMP_alpha~771b40d3280fe8ad:
***MISSING WEAVE***
BitKeeper/deleted/.del-create-mysql_fast-Linux_2.2.13_SMP_alpha~c46d6c283c0e34ae:
***MISSING WEAVE***
BitKeeper/deleted/.del-insert-mysql-Linux_2.2.13_SMP_alpha~17f262f12d2244bc:
***MISSING WEAVE***
BitKeeper/deleted/.del-insert-mysql_fast-Linux_2.2.13_SMP_alpha~3245ba5633a18e8:
***MISSING WEAVE***
BitKeeper/deleted/.del-select-mysql-Linux_2.2.13_SMP_alpha~9fd9c6e036f988d7:
***MISSING WEAVE***
BitKeeper/deleted/.del-select-mysql_fast-Linux_2.2.13_SMP_alpha~744633c6e13a897f:
***MISSING WEAVE***
BitKeeper/deleted/.del-wisconsin-mysql-Linux_2.2.13_SMP_alpha~ad7babd436f26841:
***MISSING WEAVE***
BitKeeper/deleted/.del-wisconsin-mysql_fast-Linux_2.2.13_SMP_alpha~6ad065fe4c6b4fa9:
***MISSING WEAVE***
BUILD/compile-pentium:
Added command line arguments
Docs/manual.texi:
Update for 3.23.30
configure.in:
Removed duplicated symbol
include/my_sys.h:
cleanup of my_open/my_create/my_tempfile
mysys/mf_tempfile.c:
Remember filename for temporary files created with mkstemp
mysys/my_create.c:
cleanup of my_open/my_create/my_tempfile
mysys/my_open.c:
cleanup of my_open/my_create/my_tempfile
scripts/mysqld_multi.sh:
Use paths from configure
scripts/safe_mysqld.sh:
Cleanup
sql-bench/Results/ATIS-mysql-SunOS_5.7_sun4m:
New benchmark results
sql-bench/Results/RUN-mysql-SunOS_5.7_sun4m:
New benchmark results
sql-bench/Results/alter-table-mysql-SunOS_5.7_sun4m:
New benchmark results
sql-bench/Results/big-tables-mysql-SunOS_5.7_sun4m:
New benchmark results
sql-bench/Results/connect-mysql-SunOS_5.7_sun4m:
New benchmark results
sql-bench/Results/create-mysql-SunOS_5.7_sun4m:
New benchmark results
sql-bench/Results/insert-mysql-SunOS_5.7_sun4m:
New benchmark results
sql-bench/Results/select-mysql-SunOS_5.7_sun4m:
New benchmark results
sql-bench/Results/wisconsin-mysql-SunOS_5.7_sun4m:
New benchmark results
sql/ha_berkeley.cc:
Fixed wrongly allocated share structure
sql/item_cmpfunc.cc:
Cleanup
sql/item_cmpfunc.h:
Cleanup
sql/log_event.h:
Cleanup
sql/mysqld.cc:
Changed default number of BDB locks to 10000
sql/sql_class.h:
cleanup
sql/sql_show.cc:
cleanup
support-files/mysql.spec.sh:
Added mysqld_multi
sql-bench/Results-linux/ATIS-mysql_dbug-Linux_2.2.14_my_SMP_i686:
***MISSING WEAVE***
sql-bench/Results-linux/ATIS-mysql_dbug_full-Linux_2.2.14_my_SMP_i686:
***MISSING WEAVE***
sql-bench/Results-linux/RUN-mysql_dbug-Linux_2.2.14_my_SMP_i686:
***MISSING WEAVE***
sql-bench/Results-linux/RUN-mysql_dbug_full-Linux_2.2.14_my_SMP_i686:
***MISSING WEAVE***
sql-bench/Results-linux/alter-table-mysql_dbug-Linux_2.2.14_my_SMP_i686:
***MISSING WEAVE***
sql-bench/Results-linux/alter-table-mysql_dbug_full-Linux_2.2.14_my_SMP_i686:
***MISSING WEAVE***
sql-bench/Results-linux/big-tables-mysql_dbug-Linux_2.2.14_my_SMP_i686:
***MISSING WEAVE***
sql-bench/Results-linux/big-tables-mysql_dbug_full-Linux_2.2.14_my_SMP_i686:
***MISSING WEAVE***
sql-bench/Results-linux/connect-mysql_dbug-Linux_2.2.14_my_SMP_i686:
***MISSING WEAVE***
sql-bench/Results-linux/connect-mysql_dbug_full-Linux_2.2.14_my_SMP_i686:
***MISSING WEAVE***
sql-bench/Results-linux/create-mysql_dbug-Linux_2.2.14_my_SMP_i686:
***MISSING WEAVE***
sql-bench/Results-linux/create-mysql_dbug_full-Linux_2.2.14_my_SMP_i686:
***MISSING WEAVE***
sql-bench/Results-linux/insert-mysql_dbug-Linux_2.2.14_my_SMP_i686:
***MISSING WEAVE***
sql-bench/Results-linux/insert-mysql_dbug_full-Linux_2.2.14_my_SMP_i686:
***MISSING WEAVE***
sql-bench/Results-linux/select-mysql_dbug-Linux_2.2.14_my_SMP_i686:
***MISSING WEAVE***
sql-bench/Results-linux/select-mysql_dbug_full-Linux_2.2.14_my_SMP_i686:
***MISSING WEAVE***
sql-bench/Results-linux/wisconsin-mysql_dbug-Linux_2.2.14_my_SMP_i686:
***MISSING WEAVE***
sql-bench/Results-linux/wisconsin-mysql_dbug_full-Linux_2.2.14_my_SMP_i686:
***MISSING WEAVE***
Diffstat (limited to 'sql/ha_berkeley.cc')
-rw-r--r-- | sql/ha_berkeley.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sql/ha_berkeley.cc b/sql/ha_berkeley.cc index bd2e4ee9272..5f01d44e091 100644 --- a/sql/ha_berkeley.cc +++ b/sql/ha_berkeley.cc @@ -1915,14 +1915,16 @@ static BDB_SHARE *get_share(const char *table_name, TABLE *table) uint length=(uint) strlen(table_name); if (!(share=(BDB_SHARE*) hash_search(&bdb_open_tables, table_name, length))) { - if ((share=(BDB_SHARE *) my_malloc(sizeof(*share)+length+1 + - sizeof(ha_rows)* table->keys, + if ((share=(BDB_SHARE *) my_malloc(ALIGN_SIZE(sizeof(*share))+ + sizeof(ha_rows)* table->keys + + length+1, MYF(MY_WME | MY_ZEROFILL)))) { + share->rec_per_key= (ha_rows*) ((char*) share + + ALIGN_SIZE(sizeof(*share))); + share->table_name=(char*) (share->rec_per_key+table->keys); share->table_name_length=length; - share->table_name=(char*) (share+1); strmov(share->table_name,table_name); - share->rec_per_key= (ha_rows*) (share+1); if (hash_insert(&bdb_open_tables, (char*) share)) { pthread_mutex_unlock(&bdb_mutex); |