diff options
| author | unknown <monty@donna.mysql.com> | 2000-12-24 15:19:00 +0200 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2000-12-24 15:19:00 +0200 |
| commit | 78cf07c8ea126fc03706988de23893ca4680ac77 (patch) | |
| tree | 899e99579647137316d4fbc999750fb989b1cf2e /sql-bench | |
| parent | b23a560f84a33ee28d630f6baf7b4f7848fa3db8 (diff) | |
| download | mariadb-git-78cf07c8ea126fc03706988de23893ca4680ac77.tar.gz | |
New benchmark test
Fixed bug in REPLACE with BDB tables
Prepare for write lock on read for BDB
Inform the handler when we want to use IGNORE / REPLACE
New manual pages
Docs/manual.texi:
Updates for BDB tables and new changes
client/mysql.cc:
Cleanup
configure.in:
Added sys/ioctl.h
heap/hp_rkey.c:
Fixed bug when reading next on not unique key
include/my_base.h:
Added new extra options
man/mysql.1:
Added example
mysys/my_write.c:
Safety fix
scripts/mysqlaccess.sh:
Removed debug output
scripts/safe_mysqld.sh:
Added --open-files-limit
sql-bench/Results/ATIS-mysql-Linux_2.2.14_my_SMP_i686:
Updated to new benchmark
sql-bench/Results/RUN-mysql-Linux_2.2.14_my_SMP_i686:
Updated to new benchmark
sql-bench/Results/alter-table-mysql-Linux_2.2.14_my_SMP_i686:
Updated to new benchmark
sql-bench/Results/big-tables-mysql-Linux_2.2.14_my_SMP_i686:
Updated to new benchmark
sql-bench/Results/connect-mysql-Linux_2.2.14_my_SMP_i686:
Updated to new benchmark
sql-bench/Results/create-mysql-Linux_2.2.14_my_SMP_i686:
Updated to new benchmark
sql-bench/Results/insert-mysql-Linux_2.2.14_my_SMP_i686:
Updated to new benchmark
sql-bench/Results/select-mysql-Linux_2.2.14_my_SMP_i686:
Updated to new benchmark
sql-bench/Results/wisconsin-mysql-Linux_2.2.14_my_SMP_i686:
Updated to new benchmark
sql-bench/bench-init.pl.sh:
Updated to new benchmark
sql-bench/server-cfg.sh:
Fixes for HEAP tables
sql-bench/test-ATIS.sh:
Fix for heap tables
sql-bench/test-insert.sh:
Added some ORDER BY benchmarks to test more things
sql/ha_berkeley.cc:
Fix a bug in REPLACE
sql/ha_berkeley.h:
Fix to handle lock_on_read
sql/mysql_priv.h:
Prepare for internal subtransactions in BDB
sql/mysqld.cc:
Added -O open_files_limit=#
sql/sql_insert.cc:
Inform the handler when we want to use IGNORE / REPLACE
sql/sql_load.cc:
Inform the handler when we want to use IGNORE / REPLACE
sql/sql_parse.cc:
Cleanup
sql/sql_show.cc:
Cleanup
sql/sql_table.cc:
Inform the handler when we want to use IGNORE / REPLACE
sql/sql_update.cc:
Inform the handler when we want to use IGNORE / REPLACE
support-files/binary-configure.sh:
Better message
Diffstat (limited to 'sql-bench')
| -rw-r--r-- | sql-bench/Results/ATIS-mysql-Linux_2.2.14_my_SMP_i686 | 17 | ||||
| -rw-r--r-- | sql-bench/Results/RUN-mysql-Linux_2.2.14_my_SMP_i686 | 153 | ||||
| -rw-r--r-- | sql-bench/Results/alter-table-mysql-Linux_2.2.14_my_SMP_i686 | 10 | ||||
| -rw-r--r-- | sql-bench/Results/big-tables-mysql-Linux_2.2.14_my_SMP_i686 | 12 | ||||
| -rw-r--r-- | sql-bench/Results/connect-mysql-Linux_2.2.14_my_SMP_i686 | 20 | ||||
| -rw-r--r-- | sql-bench/Results/create-mysql-Linux_2.2.14_my_SMP_i686 | 14 | ||||
| -rw-r--r-- | sql-bench/Results/insert-mysql-Linux_2.2.14_my_SMP_i686 | 86 | ||||
| -rw-r--r-- | sql-bench/Results/select-mysql-Linux_2.2.14_my_SMP_i686 | 26 | ||||
| -rw-r--r-- | sql-bench/Results/wisconsin-mysql-Linux_2.2.14_my_SMP_i686 | 8 | ||||
| -rw-r--r-- | sql-bench/bench-init.pl.sh | 2 | ||||
| -rw-r--r-- | sql-bench/server-cfg.sh | 7 | ||||
| -rw-r--r-- | sql-bench/test-ATIS.sh | 6 | ||||
| -rw-r--r-- | sql-bench/test-insert.sh | 44 |
13 files changed, 227 insertions, 178 deletions
diff --git a/sql-bench/Results/ATIS-mysql-Linux_2.2.14_my_SMP_i686 b/sql-bench/Results/ATIS-mysql-Linux_2.2.14_my_SMP_i686 index 0658a828d59..4d7075ed8e3 100644 --- a/sql-bench/Results/ATIS-mysql-Linux_2.2.14_my_SMP_i686 +++ b/sql-bench/Results/ATIS-mysql-Linux_2.2.14_my_SMP_i686 @@ -1,4 +1,4 @@ -Testing server 'MySQL 3.23.29a gamma' at 2000-12-17 21:48:32 +Testing server 'MySQL 3.23.29a gamma' at 2000-12-24 6:39:08 ATIS table test @@ -6,14 +6,15 @@ Creating tables Time for create_table (28): 0 wallclock secs ( 0.00 usr 0.00 sys + 0.00 cusr 0.00 csys = 0.00 CPU) Inserting data -Time to insert (9768): 3 wallclock secs ( 0.49 usr 0.45 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time to insert (9768): 3 wallclock secs ( 0.38 usr 0.42 sys + 0.00 cusr 0.00 csys = 0.00 CPU) Retrieving data -Time for select_simple_join (500): 2 wallclock secs ( 0.65 usr 0.26 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for select_join (200): 16 wallclock secs ( 4.55 usr 2.23 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for select_distinct (800): 12 wallclock secs ( 1.64 usr 0.81 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for select_group (2800): 14 wallclock secs ( 1.86 usr 0.40 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for select_simple_join (500): 2 wallclock secs ( 0.68 usr 0.19 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for select_join (100): 2 wallclock secs ( 0.57 usr 0.28 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for select_key_prefix_join (100): 13 wallclock secs ( 4.13 usr 1.96 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for select_distinct (800): 11 wallclock secs ( 1.84 usr 0.70 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for select_group (2800): 13 wallclock secs ( 1.55 usr 0.51 sys + 0.00 cusr 0.00 csys = 0.00 CPU) Removing tables -Time to drop_table (28): 0 wallclock secs ( 0.00 usr 0.00 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Total time: 47 wallclock secs ( 9.20 usr 4.15 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time to drop_table (28): 0 wallclock secs ( 0.01 usr 0.00 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Total time: 44 wallclock secs ( 9.18 usr 4.06 sys + 0.00 cusr 0.00 csys = 0.00 CPU) diff --git a/sql-bench/Results/RUN-mysql-Linux_2.2.14_my_SMP_i686 b/sql-bench/Results/RUN-mysql-Linux_2.2.14_my_SMP_i686 index 01c90de71ef..779c802059c 100644 --- a/sql-bench/Results/RUN-mysql-Linux_2.2.14_my_SMP_i686 +++ b/sql-bench/Results/RUN-mysql-Linux_2.2.14_my_SMP_i686 @@ -1,92 +1,95 @@ -Benchmark DBD suite: 2.10 -Date of test: 2000-12-17 23:35:25 +Benchmark DBD suite: 2.12 +Date of test: 2000-12-24 15:30:34 Running tests on: Linux 2.2.14-my-SMP i686 Arguments: Comments: Intel Xeon, 2x550 Mhz, 1G ram, key_buffer=16M Limits from: Server version: MySQL 3.23.29a gamma -ATIS: Total time: 47 wallclock secs ( 9.20 usr 4.15 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -alter-table: Total time: 463 wallclock secs ( 0.39 usr 0.15 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -big-tables: Total time: 32 wallclock secs ( 8.71 usr 6.83 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -connect: Total time: 79 wallclock secs (35.02 usr 18.29 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -create: Total time: 135 wallclock secs ( 9.85 usr 3.27 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -insert: Total time: 2216 wallclock secs (423.12 usr 155.81 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -select: Total time: 1312 wallclock secs (63.58 usr 18.29 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -wisconsin: Total time: 17 wallclock secs ( 3.57 usr 1.80 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +ATIS: Total time: 44 wallclock secs ( 9.18 usr 4.06 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +alter-table: Total time: 468 wallclock secs ( 0.25 usr 0.12 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +big-tables: Total time: 31 wallclock secs ( 8.67 usr 6.87 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +connect: Total time: 79 wallclock secs (34.39 usr 17.84 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +create: Total time: 126 wallclock secs (10.09 usr 3.20 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +insert: Total time: 2227 wallclock secs (451.81 usr 170.75 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +select: Total time: 1379 wallclock secs (61.35 usr 18.95 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +wisconsin: Total time: 16 wallclock secs ( 3.25 usr 1.72 sys + 0.00 cusr 0.00 csys = 0.00 CPU) All 8 test executed successfully Totals per operation: Operation seconds usr sys cpu tests -alter_table_add 258.00 0.26 0.07 0.00 992 -alter_table_drop 196.00 0.07 0.01 0.00 496 -connect 13.00 7.93 2.58 0.00 10000 -connect+select_1_row 15.00 7.98 3.18 0.00 10000 -connect+select_simple 14.00 7.69 3.24 0.00 10000 -count 45.00 0.10 0.01 0.00 100 -count_distinct 124.00 0.68 0.16 0.00 2000 -count_distinct_big 111.00 7.80 5.59 0.00 120 -count_distinct_group 74.00 1.26 0.40 0.00 1000 -count_distinct_group_on_key 61.00 0.43 0.08 0.00 1000 -count_distinct_group_on_key_parts 73.00 1.27 0.42 0.00 1000 -count_group_on_key_parts 62.00 1.13 0.43 0.00 1000 -count_on_key 514.00 17.86 3.19 0.00 50100 -create+drop 36.00 2.52 0.89 0.00 10000 -create_MANY_tables 28.00 1.87 0.47 0.00 10000 +alter_table_add 263.00 0.10 0.05 0.00 992 +alter_table_drop 197.00 0.05 0.03 0.00 496 +connect 12.00 7.18 2.61 0.00 10000 +connect+select_1_row 15.00 7.75 3.29 0.00 10000 +connect+select_simple 14.00 7.39 3.61 0.00 10000 +count 47.00 0.05 0.00 0.00 100 +count_distinct 119.00 0.66 0.17 0.00 2000 +count_distinct_big 111.00 7.48 5.86 0.00 120 +count_distinct_group 80.00 1.02 0.43 0.00 1000 +count_distinct_group_on_key 60.00 0.40 0.08 0.00 1000 +count_distinct_group_on_key_parts 81.00 0.79 0.41 0.00 1000 +count_group_on_key_parts 54.00 1.00 0.47 0.00 1000 +count_on_key 559.00 17.07 3.00 0.00 50100 +create+drop 29.00 2.43 0.82 0.00 10000 +create_MANY_tables 29.00 2.27 0.46 0.00 10000 create_index 4.00 0.00 0.00 0.00 8 -create_key+drop 46.00 4.05 0.70 0.00 10000 +create_key+drop 40.00 3.97 0.87 0.00 10000 create_table 0.00 0.00 0.00 0.00 31 -delete_all 19.00 0.01 0.00 0.00 12 -delete_all_many_keys 181.00 0.02 0.00 0.00 1 +delete_all 20.00 0.00 0.00 0.00 12 +delete_all_many_keys 151.00 0.03 0.01 0.00 1 delete_big 0.00 0.00 0.00 0.00 1 -delete_big_many_keys 181.00 0.02 0.00 0.00 128 -delete_key 3.00 0.50 0.39 0.00 10000 +delete_big_many_keys 151.00 0.03 0.01 0.00 128 +delete_key 4.00 0.56 0.45 0.00 10000 drop_index 4.00 0.00 0.00 0.00 8 -drop_table 0.00 0.00 0.00 0.00 28 -drop_table_when_MANY_tables 14.00 0.60 0.60 0.00 10000 -insert 134.00 22.42 14.46 0.00 350768 -insert_duplicates 24.00 2.86 2.57 0.00 100000 -insert_key 172.00 10.70 4.06 0.00 100000 -insert_many_fields 9.00 0.39 0.10 0.00 2000 +drop_table 0.00 0.01 0.00 0.00 28 +drop_table_when_MANY_tables 12.00 0.63 0.43 0.00 10000 +insert 131.00 22.93 14.02 0.00 350768 +insert_duplicates 24.00 3.18 3.05 0.00 100000 +insert_key 154.00 10.52 4.42 0.00 100000 +insert_many_fields 9.00 0.44 0.07 0.00 2000 insert_select_1_key 7.00 0.00 0.00 0.00 1 insert_select_2_keys 9.00 0.00 0.00 0.00 1 -min_max 30.00 0.03 0.00 0.00 60 -min_max_on_key 206.00 27.71 4.96 0.00 85000 -multiple_value_insert 9.00 1.92 0.07 0.00 100000 -order_by_big 53.00 22.27 16.17 0.00 10 -order_by_big_key 33.00 22.36 10.06 0.00 10 -order_by_big_key2 33.00 22.83 9.51 0.00 10 -order_by_big_key_desc 32.00 22.03 10.36 0.00 10 -order_by_big_key_diff 49.00 21.98 16.40 0.00 10 -order_by_key 3.00 1.28 0.40 0.00 500 -order_by_key2_diff 5.00 1.91 0.83 0.00 500 -order_by_range 5.00 1.09 0.51 0.00 500 -outer_join 73.00 0.01 0.00 0.00 10 -outer_join_found 70.00 0.00 0.00 0.00 10 -outer_join_not_found 50.00 0.00 0.01 0.00 500 -outer_join_on_key 61.00 0.00 0.00 0.00 10 -select_1_row 3.00 0.71 0.67 0.00 10000 -select_2_rows 3.00 0.65 0.68 0.00 10000 -select_big 58.00 31.42 17.06 0.00 10080 -select_column+column 4.00 0.48 0.60 0.00 10000 -select_diff_key 184.00 0.36 0.02 0.00 500 -select_distinct 12.00 1.64 0.81 0.00 800 -select_group 70.00 1.92 0.41 0.00 2911 -select_group_when_MANY_tables 11.00 0.81 0.61 0.00 10000 -select_join 16.00 4.55 2.23 0.00 200 -select_key 126.00 68.62 14.75 0.00 200000 -select_key2 134.00 73.78 14.11 0.00 200000 -select_key_prefix 136.00 69.37 14.48 0.00 200000 -select_many_fields 22.00 8.31 6.73 0.00 2000 -select_range 201.00 9.29 3.51 0.00 410 -select_range_key2 18.00 6.59 1.71 0.00 25010 -select_range_prefix 20.00 6.80 1.51 0.00 25010 -select_simple 2.00 0.53 0.51 0.00 10000 -select_simple_join 2.00 0.65 0.26 0.00 500 -update_big 65.00 0.00 0.00 0.00 10 -update_of_key 97.00 3.15 2.09 0.00 50256 -update_of_key_big 33.00 0.01 0.02 0.00 501 -update_with_key 116.00 15.94 12.19 0.00 300000 -wisc_benchmark 4.00 1.92 0.66 0.00 114 -TOTALS 4480.00 553.34 208.50 0.00 1946237 +min_max 32.00 0.01 0.00 0.00 60 +min_max_on_key 238.00 27.34 5.17 0.00 85000 +multiple_value_insert 9.00 1.88 0.06 0.00 100000 +order_by_big 52.00 22.29 15.95 0.00 10 +order_by_big_key 34.00 23.91 10.39 0.00 10 +order_by_big_key2 33.00 22.58 10.06 0.00 10 +order_by_big_key_desc 36.00 23.89 10.41 0.00 10 +order_by_big_key_diff 50.00 22.07 16.43 0.00 10 +order_by_big_key_prefix 32.00 22.21 10.50 0.00 10 +order_by_key2_diff 5.00 1.12 0.07 0.00 500 +order_by_key_prefix 3.00 1.10 0.38 0.00 500 +order_by_range 5.00 1.14 0.41 0.00 500 +outer_join 72.00 0.00 0.00 0.00 10 +outer_join_found 67.00 0.00 0.01 0.00 10 +outer_join_not_found 50.00 0.00 0.00 0.00 500 +outer_join_on_key 57.00 0.01 0.00 0.00 10 +select_1_row 2.00 0.45 0.57 0.00 10000 +select_2_rows 3.00 0.59 0.61 0.00 10000 +select_big 62.00 32.48 15.99 0.00 10080 +select_column+column 3.00 0.58 0.68 0.00 10000 +select_diff_key 191.00 0.33 0.03 0.00 500 +select_distinct 11.00 1.84 0.70 0.00 800 +select_group 67.00 1.60 0.52 0.00 2911 +select_group_when_MANY_tables 16.00 0.79 0.62 0.00 10000 +select_join 2.00 0.57 0.28 0.00 100 +select_key 126.00 68.35 14.42 0.00 200000 +select_key2 132.00 69.41 13.86 0.00 200000 +select_key_prefix 134.00 71.19 14.71 0.00 200000 +select_key_prefix_join 13.00 4.13 1.96 0.00 100 +select_many_fields 22.00 8.22 6.80 0.00 2000 +select_range 194.00 9.08 3.79 0.00 410 +select_range_key2 18.00 6.36 1.64 0.00 25010 +select_range_prefix 20.00 6.82 1.38 0.00 25010 +select_simple 2.00 0.47 0.71 0.00 10000 +select_simple_join 2.00 0.68 0.19 0.00 500 +update_big 64.00 0.00 0.00 0.00 10 +update_of_key 88.00 2.82 2.30 0.00 50256 +update_of_key_big 33.00 0.11 0.03 0.00 501 +update_with_key 113.00 17.01 12.17 0.00 300000 +update_with_key_prefix 32.00 5.68 4.36 0.00 100000 +wisc_benchmark 4.00 1.80 0.69 0.00 114 +TOTALS 4519.00 578.85 223.47 0.00 2046247 diff --git a/sql-bench/Results/alter-table-mysql-Linux_2.2.14_my_SMP_i686 b/sql-bench/Results/alter-table-mysql-Linux_2.2.14_my_SMP_i686 index edf04cd304b..1e58f7a49dc 100644 --- a/sql-bench/Results/alter-table-mysql-Linux_2.2.14_my_SMP_i686 +++ b/sql-bench/Results/alter-table-mysql-Linux_2.2.14_my_SMP_i686 @@ -1,16 +1,16 @@ -Testing server 'MySQL 3.23.29a gamma' at 2000-12-17 21:49:19 +Testing server 'MySQL 3.23.29a gamma' at 2000-12-24 6:39:53 Testing of ALTER TABLE Testing with 1000 columns and 1000 rows in 20 steps Insert data into the table -Time for insert (1000) 1 wallclock secs ( 0.06 usr 0.07 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for insert (1000) 0 wallclock secs ( 0.09 usr 0.03 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for alter_table_add (992): 258 wallclock secs ( 0.26 usr 0.07 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for alter_table_add (992): 263 wallclock secs ( 0.10 usr 0.05 sys + 0.00 cusr 0.00 csys = 0.00 CPU) Time for create_index (8): 4 wallclock secs ( 0.00 usr 0.00 sys + 0.00 cusr 0.00 csys = 0.00 CPU) Time for drop_index (8): 4 wallclock secs ( 0.00 usr 0.00 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for alter_table_drop (496): 196 wallclock secs ( 0.07 usr 0.01 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for alter_table_drop (496): 197 wallclock secs ( 0.05 usr 0.03 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Total time: 463 wallclock secs ( 0.39 usr 0.15 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Total time: 468 wallclock secs ( 0.25 usr 0.12 sys + 0.00 cusr 0.00 csys = 0.00 CPU) diff --git a/sql-bench/Results/big-tables-mysql-Linux_2.2.14_my_SMP_i686 b/sql-bench/Results/big-tables-mysql-Linux_2.2.14_my_SMP_i686 index a9ba6d06997..e8235536b44 100644 --- a/sql-bench/Results/big-tables-mysql-Linux_2.2.14_my_SMP_i686 +++ b/sql-bench/Results/big-tables-mysql-Linux_2.2.14_my_SMP_i686 @@ -1,19 +1,19 @@ -Testing server 'MySQL 3.23.29a gamma' at 2000-12-17 21:57:03 +Testing server 'MySQL 3.23.29a gamma' at 2000-12-24 6:47:42 Testing of some unusual tables All tests are done 1000 times with 1000 fields Testing table with 1000 fields Testing select * from table with 1 record -Time to select_many_fields(1000): 9 wallclock secs ( 4.22 usr 3.26 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time to select_many_fields(1000): 9 wallclock secs ( 4.02 usr 3.44 sys + 0.00 cusr 0.00 csys = 0.00 CPU) Testing select all_fields from table with 1 record -Time to select_many_fields(1000): 13 wallclock secs ( 4.09 usr 3.47 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time to select_many_fields(1000): 13 wallclock secs ( 4.20 usr 3.36 sys + 0.00 cusr 0.00 csys = 0.00 CPU) Testing insert VALUES() -Time to insert_many_fields(1000): 3 wallclock secs ( 0.34 usr 0.05 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time to insert_many_fields(1000): 3 wallclock secs ( 0.37 usr 0.05 sys + 0.00 cusr 0.00 csys = 0.00 CPU) Testing insert (all_fields) VALUES() -Time to insert_many_fields(1000): 6 wallclock secs ( 0.05 usr 0.05 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time to insert_many_fields(1000): 6 wallclock secs ( 0.07 usr 0.02 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Total time: 32 wallclock secs ( 8.71 usr 6.83 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Total time: 31 wallclock secs ( 8.67 usr 6.87 sys + 0.00 cusr 0.00 csys = 0.00 CPU) diff --git a/sql-bench/Results/connect-mysql-Linux_2.2.14_my_SMP_i686 b/sql-bench/Results/connect-mysql-Linux_2.2.14_my_SMP_i686 index 5aa94079de2..6a3869a0ab2 100644 --- a/sql-bench/Results/connect-mysql-Linux_2.2.14_my_SMP_i686 +++ b/sql-bench/Results/connect-mysql-Linux_2.2.14_my_SMP_i686 @@ -1,30 +1,30 @@ -Testing server 'MySQL 3.23.29a gamma' at 2000-12-17 21:57:35 +Testing server 'MySQL 3.23.29a gamma' at 2000-12-24 6:48:14 Testing the speed of connecting to the server and sending of data All tests are done 10000 times Testing connection/disconnect -Time to connect (10000): 13 wallclock secs ( 7.93 usr 2.58 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time to connect (10000): 12 wallclock secs ( 7.18 usr 2.61 sys + 0.00 cusr 0.00 csys = 0.00 CPU) Test connect/simple select/disconnect -Time for connect+select_simple (10000): 14 wallclock secs ( 7.69 usr 3.24 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for connect+select_simple (10000): 14 wallclock secs ( 7.39 usr 3.61 sys + 0.00 cusr 0.00 csys = 0.00 CPU) Test simple select -Time for select_simple (10000): 2 wallclock secs ( 0.53 usr 0.51 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for select_simple (10000): 2 wallclock secs ( 0.47 usr 0.71 sys + 0.00 cusr 0.00 csys = 0.00 CPU) Testing connect/select 1 row from table/disconnect -Time to connect+select_1_row (10000): 15 wallclock secs ( 7.98 usr 3.18 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time to connect+select_1_row (10000): 15 wallclock secs ( 7.75 usr 3.29 sys + 0.00 cusr 0.00 csys = 0.00 CPU) Testing select 1 row from table -Time to select_1_row (10000): 3 wallclock secs ( 0.71 usr 0.67 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time to select_1_row (10000): 2 wallclock secs ( 0.45 usr 0.57 sys + 0.00 cusr 0.00 csys = 0.00 CPU) Testing select 2 rows from table -Time to select_2_rows (10000): 3 wallclock secs ( 0.65 usr 0.68 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time to select_2_rows (10000): 3 wallclock secs ( 0.59 usr 0.61 sys + 0.00 cusr 0.00 csys = 0.00 CPU) Test select with aritmetic (+) -Time for select_column+column (10000): 4 wallclock secs ( 0.48 usr 0.60 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for select_column+column (10000): 3 wallclock secs ( 0.58 usr 0.68 sys + 0.00 cusr 0.00 csys = 0.00 CPU) Testing retrieval of big records (65000 bytes) -Time to select_big (10000): 25 wallclock secs ( 9.05 usr 6.81 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time to select_big (10000): 28 wallclock secs ( 9.97 usr 5.76 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Total time: 79 wallclock secs (35.02 usr 18.29 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Total time: 79 wallclock secs (34.39 usr 17.84 sys + 0.00 cusr 0.00 csys = 0.00 CPU) diff --git a/sql-bench/Results/create-mysql-Linux_2.2.14_my_SMP_i686 b/sql-bench/Results/create-mysql-Linux_2.2.14_my_SMP_i686 index 1c7699dda72..e363a7adc9f 100644 --- a/sql-bench/Results/create-mysql-Linux_2.2.14_my_SMP_i686 +++ b/sql-bench/Results/create-mysql-Linux_2.2.14_my_SMP_i686 @@ -1,18 +1,18 @@ -Testing server 'MySQL 3.23.29a gamma' at 2000-12-17 21:58:54 +Testing server 'MySQL 3.23.29a gamma' at 2000-12-24 15:28:12 Testing the speed of creating and droping tables Testing with 10000 tables and 10000 loop count Testing create of tables -Time for create_MANY_tables (10000): 28 wallclock secs ( 1.87 usr 0.47 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for create_MANY_tables (10000): 29 wallclock secs ( 2.27 usr 0.46 sys + 0.00 cusr 0.00 csys = 0.00 CPU) Accessing tables -Time to select_group_when_MANY_tables (10000): 11 wallclock secs ( 0.81 usr 0.61 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time to select_group_when_MANY_tables (10000): 16 wallclock secs ( 0.79 usr 0.62 sys + 0.00 cusr 0.00 csys = 0.00 CPU) Testing drop -Time for drop_table_when_MANY_tables (10000): 14 wallclock secs ( 0.60 usr 0.60 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for drop_table_when_MANY_tables (10000): 12 wallclock secs ( 0.63 usr 0.43 sys + 0.00 cusr 0.00 csys = 0.00 CPU) Testing create+drop -Time for create+drop (10000): 36 wallclock secs ( 2.52 usr 0.89 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for create_key+drop (10000): 46 wallclock secs ( 4.05 usr 0.70 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Total time: 135 wallclock secs ( 9.85 usr 3.27 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for create+drop (10000): 29 wallclock secs ( 2.43 usr 0.82 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for create_key+drop (10000): 40 wallclock secs ( 3.97 usr 0.87 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Total time: 126 wallclock secs (10.09 usr 3.20 sys + 0.00 cusr 0.00 csys = 0.00 CPU) diff --git a/sql-bench/Results/insert-mysql-Linux_2.2.14_my_SMP_i686 b/sql-bench/Results/insert-mysql-Linux_2.2.14_my_SMP_i686 index af085f00b84..034e06ab81b 100644 --- a/sql-bench/Results/insert-mysql-Linux_2.2.14_my_SMP_i686 +++ b/sql-bench/Results/insert-mysql-Linux_2.2.14_my_SMP_i686 @@ -1,4 +1,4 @@ -Testing server 'MySQL 3.23.29a gamma' at 2000-12-17 22:01:09 +Testing server 'MySQL 3.23.29a gamma' at 2000-12-24 6:49:34 Testing the speed of inserting data into 1 table and do some selects on it. The tests are done with a table that has 100000 rows. @@ -8,53 +8,55 @@ Creating tables Inserting 100000 rows in order Inserting 100000 rows in reverse order Inserting 100000 rows in random order -Time for insert (300000): 114 wallclock secs (19.41 usr 12.48 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for insert (300000): 111 wallclock secs (20.07 usr 12.09 sys + 0.00 cusr 0.00 csys = 0.00 CPU) Testing insert of duplicates -Time for insert_duplicates (100000): 24 wallclock secs ( 2.86 usr 2.57 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for insert_duplicates (100000): 24 wallclock secs ( 3.18 usr 3.05 sys + 0.00 cusr 0.00 csys = 0.00 CPU) Retrieving data from the table -Time for select_big (10:3000000): 32 wallclock secs (22.21 usr 10.20 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for order_by_big_key (10:3000000): 33 wallclock secs (22.36 usr 10.06 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for order_by_big_key_desc (10:3000000): 32 wallclock secs (22.03 usr 10.36 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for order_by_big_key2 (10:3000000): 33 wallclock secs (22.83 usr 9.51 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for order_by_big_key_diff (10:3000000): 49 wallclock secs (21.98 usr 16.40 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for order_by_big (10:3000000): 53 wallclock secs (22.27 usr 16.17 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for order_by_range (500:125750): 5 wallclock secs ( 1.09 usr 0.51 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for order_by_key (500:125750): 3 wallclock secs ( 1.28 usr 0.40 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for order_by_key2_diff (500:250500): 5 wallclock secs ( 1.91 usr 0.83 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for select_diff_key (500:1000): 184 wallclock secs ( 0.36 usr 0.02 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for select_range_prefix (5010:42084): 11 wallclock secs ( 3.09 usr 0.61 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for select_range_key2 (5010:42084): 10 wallclock secs ( 3.00 usr 0.75 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for select_key_prefix (200000): 136 wallclock secs (69.37 usr 14.48 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for select_key (200000): 126 wallclock secs (68.62 usr 14.75 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for select_key2 (200000): 134 wallclock secs (73.78 usr 14.11 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for select_big (10:3000000): 33 wallclock secs (22.37 usr 10.19 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for order_by_big_key (10:3000000): 34 wallclock secs (23.91 usr 10.39 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for order_by_big_key_desc (10:3000000): 36 wallclock secs (23.89 usr 10.41 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for order_by_big_key_prefix (10:3000000): 32 wallclock secs (22.21 usr 10.50 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for order_by_big_key2 (10:3000000): 33 wallclock secs (22.58 usr 10.06 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for order_by_big_key_diff (10:3000000): 50 wallclock secs (22.07 usr 16.43 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for order_by_big (10:3000000): 52 wallclock secs (22.29 usr 15.95 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for order_by_range (500:125750): 5 wallclock secs ( 1.14 usr 0.41 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for order_by_key_prefix (500:125750): 3 wallclock secs ( 1.10 usr 0.38 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for order_by_key2_diff (500:250500): 5 wallclock secs ( 1.12 usr 0.07 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for select_diff_key (500:1000): 191 wallclock secs ( 0.33 usr 0.03 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for select_range_prefix (5010:42084): 11 wallclock secs ( 3.03 usr 0.63 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for select_range_key2 (5010:42084): 10 wallclock secs ( 2.59 usr 0.68 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for select_key_prefix (200000): 134 wallclock secs (71.19 usr 14.71 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for select_key (200000): 126 wallclock secs (68.35 usr 14.42 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for select_key2 (200000): 132 wallclock secs (69.41 usr 13.86 sys + 0.00 cusr 0.00 csys = 0.00 CPU) Test of compares with simple ranges -Time for select_range_prefix (20000:43500): 9 wallclock secs ( 3.71 usr 0.90 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for select_range_key2 (20000:43500): 8 wallclock secs ( 3.59 usr 0.96 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for select_group (111): 56 wallclock secs ( 0.06 usr 0.01 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for min_max_on_key (15000): 8 wallclock secs ( 4.85 usr 0.88 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for min_max (60): 30 wallclock secs ( 0.03 usr 0.00 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for count_on_key (100): 47 wallclock secs ( 0.04 usr 0.00 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for count (100): 45 wallclock secs ( 0.10 usr 0.01 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for count_distinct_big (20): 64 wallclock secs ( 0.01 usr 0.01 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for select_range_prefix (20000:43500): 9 wallclock secs ( 3.79 usr 0.75 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for select_range_key2 (20000:43500): 8 wallclock secs ( 3.77 usr 0.96 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for select_group (111): 54 wallclock secs ( 0.05 usr 0.01 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for min_max_on_key (15000): 8 wallclock secs ( 4.55 usr 0.93 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for min_max (60): 32 wallclock secs ( 0.01 usr 0.00 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for count_on_key (100): 51 wallclock secs ( 0.09 usr 0.02 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for count (100): 47 wallclock secs ( 0.05 usr 0.00 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for count_distinct_big (20): 64 wallclock secs ( 0.02 usr 0.00 sys + 0.00 cusr 0.00 csys = 0.00 CPU) Testing update of keys with functions -Time for update_of_key (50000): 23 wallclock secs ( 3.12 usr 2.07 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for update_of_key_big (501): 33 wallclock secs ( 0.01 usr 0.02 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for update_of_key (50000): 23 wallclock secs ( 2.80 usr 2.29 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for update_of_key_big (501): 33 wallclock secs ( 0.11 usr 0.03 sys + 0.00 cusr 0.00 csys = 0.00 CPU) Testing update with key -Time for update_with_key (300000): 116 wallclock secs (15.94 usr 12.19 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for update_with_key (300000): 113 wallclock secs (17.01 usr 12.17 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for update_with_key_prefix (100000): 32 wallclock secs ( 5.68 usr 4.36 sys + 0.00 cusr 0.00 csys = 0.00 CPU) Testing update of all rows -Time for update_big (10): 65 wallclock secs ( 0.00 usr 0.00 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for update_big (10): 64 wallclock secs ( 0.00 usr 0.00 sys + 0.00 cusr 0.00 csys = 0.00 CPU) Testing left outer join -Time for outer_join_on_key (10:10): 61 wallclock secs ( 0.00 usr 0.00 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for outer_join (10:10): 73 wallclock secs ( 0.01 usr 0.00 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for outer_join_found (10:10): 70 wallclock secs ( 0.00 usr 0.00 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for outer_join_not_found (500:10): 50 wallclock secs ( 0.00 usr 0.01 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for outer_join_on_key (10:10): 57 wallclock secs ( 0.01 usr 0.00 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for outer_join (10:10): 72 wallclock secs ( 0.00 usr 0.00 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for outer_join_found (10:10): 67 wallclock secs ( 0.00 usr 0.01 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for outer_join_not_found (500:10): 50 wallclock secs ( 0.00 usr 0.00 sys + 0.00 cusr 0.00 csys = 0.00 CPU) Testing INSERT INTO ... SELECT Time for insert_select_1_key (1): 7 wallclock secs ( 0.00 usr 0.00 sys + 0.00 cusr 0.00 csys = 0.00 CPU) @@ -62,24 +64,24 @@ Time for insert_select_2_keys (1): 9 wallclock secs ( 0.00 usr 0.00 sys + 0. Time for drop table(2): 0 wallclock secs ( 0.00 usr 0.00 sys + 0.00 cusr 0.00 csys = 0.00 CPU) Testing delete -Time for delete_key (10000): 3 wallclock secs ( 0.50 usr 0.39 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for delete_all (12): 19 wallclock secs ( 0.01 usr 0.00 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for delete_key (10000): 4 wallclock secs ( 0.56 usr 0.45 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for delete_all (12): 20 wallclock secs ( 0.00 usr 0.00 sys + 0.00 cusr 0.00 csys = 0.00 CPU) Insert into table with 16 keys and with a primary key with 16 parts -Time for insert_key (100000): 172 wallclock secs (10.70 usr 4.06 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for insert_key (100000): 154 wallclock secs (10.52 usr 4.42 sys + 0.00 cusr 0.00 csys = 0.00 CPU) Testing update of keys -Time for update_of_key (256): 74 wallclock secs ( 0.03 usr 0.02 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for update_of_key (256): 65 wallclock secs ( 0.02 usr 0.01 sys + 0.00 cusr 0.00 csys = 0.00 CPU) Deleting rows from the table -Time for delete_big_many_keys (128): 181 wallclock secs ( 0.02 usr 0.00 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for delete_big_many_keys (128): 151 wallclock secs ( 0.03 usr 0.01 sys + 0.00 cusr 0.00 csys = 0.00 CPU) Deleting everything from table -Time for delete_all_many_keys (1): 181 wallclock secs ( 0.02 usr 0.00 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for delete_all_many_keys (1): 151 wallclock secs ( 0.03 usr 0.01 sys + 0.00 cusr 0.00 csys = 0.00 CPU) Inserting 100000 rows with multiple values -Time for multiple_value_insert (100000): 9 wallclock secs ( 1.92 usr 0.07 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for multiple_value_insert (100000): 9 wallclock secs ( 1.88 usr 0.06 sys + 0.00 cusr 0.00 csys = 0.00 CPU) Time for drop table(1): 0 wallclock secs ( 0.00 usr 0.00 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Total time: 2216 wallclock secs (423.12 usr 155.81 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Total time: 2227 wallclock secs (451.81 usr 170.75 sys + 0.00 cusr 0.00 csys = 0.00 CPU) diff --git a/sql-bench/Results/select-mysql-Linux_2.2.14_my_SMP_i686 b/sql-bench/Results/select-mysql-Linux_2.2.14_my_SMP_i686 index 4fe416e8f2e..8c7eed79c64 100644 --- a/sql-bench/Results/select-mysql-Linux_2.2.14_my_SMP_i686 +++ b/sql-bench/Results/select-mysql-Linux_2.2.14_my_SMP_i686 @@ -1,23 +1,23 @@ -Testing server 'MySQL 3.23.29a gamma' at 2000-12-17 22:38:07 +Testing server 'MySQL 3.23.29a gamma' at 2000-12-24 7:26:42 Testing the speed of selecting on keys that consist of many parts The test-table has 10000 rows and the test is done with 500 ranges. Creating table Inserting 10000 rows -Time to insert (10000): 4 wallclock secs ( 0.88 usr 0.39 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time to insert (10000): 5 wallclock secs ( 1.03 usr 0.48 sys + 0.00 cusr 0.00 csys = 0.00 CPU) Testing big selects on the table -Time for select_big (70:17207): 1 wallclock secs ( 0.16 usr 0.05 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for select_range (410:1057904): 201 wallclock secs ( 9.29 usr 3.51 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for min_max_on_key (70000): 198 wallclock secs (22.86 usr 4.08 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for count_on_key (50000): 467 wallclock secs (17.82 usr 3.19 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for select_big (70:17207): 1 wallclock secs ( 0.14 usr 0.04 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for select_range (410:1057904): 194 wallclock secs ( 9.08 usr 3.79 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for min_max_on_key (70000): 230 wallclock secs (22.79 usr 4.24 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for count_on_key (50000): 508 wallclock secs (16.98 usr 2.98 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for count_group_on_key_parts (1000:100000): 62 wallclock secs ( 1.13 usr 0.43 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for count_group_on_key_parts (1000:100000): 54 wallclock secs ( 1.00 usr 0.47 sys + 0.00 cusr 0.00 csys = 0.00 CPU) Testing count(distinct) on the table -Time for count_distinct (2000:2000): 124 wallclock secs ( 0.68 usr 0.16 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for count_distinct_group_on_key (1000:6000): 61 wallclock secs ( 0.43 usr 0.08 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for count_distinct_group_on_key_parts (1000:100000): 73 wallclock secs ( 1.27 usr 0.42 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for count_distinct_group (1000:100000): 74 wallclock secs ( 1.26 usr 0.40 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for count_distinct_big (100:1000000): 47 wallclock secs ( 7.79 usr 5.58 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Total time: 1312 wallclock secs (63.58 usr 18.29 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for count_distinct (2000:2000): 119 wallclock secs ( 0.66 usr 0.17 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for count_distinct_group_on_key (1000:6000): 60 wallclock secs ( 0.40 usr 0.08 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for count_distinct_group_on_key_parts (1000:100000): 81 wallclock secs ( 0.79 usr 0.41 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for count_distinct_group (1000:100000): 80 wallclock secs ( 1.02 usr 0.43 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for count_distinct_big (100:1000000): 47 wallclock secs ( 7.46 usr 5.86 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Total time: 1379 wallclock secs (61.35 usr 18.95 sys + 0.00 cusr 0.00 csys = 0.00 CPU) diff --git a/sql-bench/Results/wisconsin-mysql-Linux_2.2.14_my_SMP_i686 b/sql-bench/Results/wisconsin-mysql-Linux_2.2.14_my_SMP_i686 index 4859ad596d6..8d3875bd5e6 100644 --- a/sql-bench/Results/wisconsin-mysql-Linux_2.2.14_my_SMP_i686 +++ b/sql-bench/Results/wisconsin-mysql-Linux_2.2.14_my_SMP_i686 @@ -1,14 +1,14 @@ -Testing server 'MySQL 3.23.29a gamma' at 2000-12-17 22:59:59 +Testing server 'MySQL 3.23.29a gamma' at 2000-12-24 7:49:42 Wisconsin benchmark test Time for create_table (3): 0 wallclock secs ( 0.00 usr 0.00 sys + 0.00 cusr 0.00 csys = 0.00 CPU) Inserting data -Time to insert (31000): 13 wallclock secs ( 1.64 usr 1.14 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time to insert (31000): 12 wallclock secs ( 1.45 usr 1.03 sys + 0.00 cusr 0.00 csys = 0.00 CPU) Time to delete_big (1): 0 wallclock secs ( 0.00 usr 0.00 sys + 0.00 cusr 0.00 csys = 0.00 CPU) Running actual benchmark -Time for wisc_benchmark (114): 4 wallclock secs ( 1.92 usr 0.66 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for wisc_benchmark (114): 4 wallclock secs ( 1.80 usr 0.69 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Total time: 17 wallclock secs ( 3.57 usr 1.80 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Total time: 16 wallclock secs ( 3.25 usr 1.72 sys + 0.00 cusr 0.00 csys = 0.00 CPU) diff --git a/sql-bench/bench-init.pl.sh b/sql-bench/bench-init.pl.sh index af292257bab..54a5d624b32 100644 --- a/sql-bench/bench-init.pl.sh +++ b/sql-bench/bench-init.pl.sh @@ -31,7 +31,7 @@ # $server Object for current server # $limits Hash reference to limits for benchmark -$benchmark_version="2.10"; +$benchmark_version="2.11"; use Getopt::Long; require "$pwd/server-cfg" || die "Can't read Configuration file: $!\n"; diff --git a/sql-bench/server-cfg.sh b/sql-bench/server-cfg.sh index 02dbb5dd712..6e27e84a08d 100644 --- a/sql-bench/server-cfg.sh +++ b/sql-bench/server-cfg.sh @@ -188,6 +188,13 @@ sub new $smds{'q16'} = 'a'; $smds{'q17'} = 'c'; + # Some fixes that depends on the environment + if (defined($main::opt_create_options) && + $main::opt_create_options =~ /type=heap/i) + { + $limits{'working_blobs'} = 0; # HEAP tables can't handle BLOB's + } + return $self; } diff --git a/sql-bench/test-ATIS.sh b/sql-bench/test-ATIS.sh index 3ec6a4c6ed8..77e0e7d79bf 100644 --- a/sql-bench/test-ATIS.sh +++ b/sql-bench/test-ATIS.sh @@ -167,7 +167,9 @@ print "Retrieving data\n"; ); @Q2=("select_join", - "select airline.airline_name,aircraft.aircraft_type from aircraft,airline,flight where flight.aircraft_code=aircraft.aircraft_code and flight.airline_code=airline.airline_code",579,1, + "select airline.airline_name,aircraft.aircraft_type from aircraft,airline,flight where flight.aircraft_code=aircraft.aircraft_code and flight.airline_code=airline.airline_code",579,1); + +@Q21=("select_key_prefix_join", "select fare.fare_code from restrict_carrier,airline,fare where restrict_carrier.airline_code=airline.airline_code and fare.restrict_code=restrict_carrier.restrict_code",5692,1, ); @@ -214,7 +216,7 @@ print "Retrieving data\n"; "select engines,category,cruising_speed,from_airport,to_airport FROM aircraft,flight WHERE category='JET' AND ENGINES >= 1 AND aircraft.aircraft_code=flight.aircraft_code AND to_airport NOT LIKE from_airport AND stops>0 GROUP BY engines,category,cruising_speed,from_airport,to_airport ORDER BY engines DESC",29,$limits->{'group_functions'} && $limits->{'like_with_column'}, ); -@Q=(\@Q1,\@Q2,\@Q3,\@Q4); +@Q=(\@Q1,\@Q2,\@Q21,\@Q3,\@Q4); foreach $Q (@Q) diff --git a/sql-bench/test-insert.sh b/sql-bench/test-insert.sh index 7bed5f18c3d..b2fa52cfdf1 100644 --- a/sql-bench/test-insert.sh +++ b/sql-bench/test-insert.sh @@ -291,7 +291,7 @@ $loop_time=new Benchmark; $estimated=$rows=0; for ($i=1 ; $i <= $small_loop_count ; $i++) { - $rows+=fetch_all_rows($dbh,"select id from bench1 order by id",1); + $rows+=fetch_all_rows($dbh,"select id,id2 from bench1 order by id,id2",1); $end_time=new Benchmark; last if ($estimated=predict_query_time($loop_time,$end_time,\$i,$i, $small_loop_count)); @@ -303,11 +303,12 @@ else print " for order_by_big_key ($small_loop_count:$rows): " . timestr(timediff($end_time, $loop_time),"all") . "\n"; + $loop_time=new Benchmark; $estimated=$rows=0; for ($i=1 ; $i <= $small_loop_count ; $i++) { - $rows+=fetch_all_rows($dbh,"select id from bench1 order by id desc",1); + $rows+=fetch_all_rows($dbh,"select id,id2 from bench1 order by id desc, id2 desc",1); $end_time=new Benchmark; last if ($estimated=predict_query_time($loop_time,$end_time,\$i,$i, $small_loop_count)); @@ -319,6 +320,24 @@ else print " for order_by_big_key_desc ($small_loop_count:$rows): " . timestr(timediff($end_time, $loop_time),"all") . "\n"; + +$loop_time=new Benchmark; +$estimated=$rows=0; +for ($i=1 ; $i <= $small_loop_count ; $i++) +{ + $rows+=fetch_all_rows($dbh,"select id from bench1 order by id desc",1); + $end_time=new Benchmark; + last if ($estimated=predict_query_time($loop_time,$end_time,\$i,$i, + $small_loop_count)); +} +if ($estimated) +{ print "Estimated time"; } +else +{ print "Time"; } +print " for order_by_big_key_prefix ($small_loop_count:$rows): " . + timestr(timediff($end_time, $loop_time),"all") . "\n"; + + $loop_time=new Benchmark; $estimated=$rows=0; for ($i=1 ; $i <= $small_loop_count ; $i++) @@ -407,7 +426,7 @@ if ($estimated) { print "Estimated time"; } else { print "Time"; } -print " for order_by_key ($range_loop_count:$rows): " . +print " for order_by_key_prefix ($range_loop_count:$rows): " . timestr(timediff($end_time, $loop_time),"all") . "\n"; $sel=$limits->{'order_by_unused'} ? "id2" : "id2,id3"; @@ -889,13 +908,23 @@ print "Testing update with key\n"; $loop_time=new Benchmark; for ($i=0 ; $i < $opt_loop_count*3 ; $i++) { - $sth = $dbh->do("update bench1 set dummy1='updated' where id=$i") or die $DBI::errstr; + $sth = $dbh->do("update bench1 set dummy1='updated' where id=$i and id2=$i") or die $DBI::errstr; } $end_time=new Benchmark; print "Time for update_with_key (" . ($opt_loop_count*3) . "): " . timestr(timediff($end_time, $loop_time),"all") . "\n"; +$loop_time=new Benchmark; +for ($i=0 ; $i < $opt_loop_count*3 ; $i+=3) +{ + $sth = $dbh->do("update bench1 set dummy1='updated' where id=$i") or die $DBI::errstr; +} + +$end_time=new Benchmark; +print "Time for update_with_key_prefix (" . ($opt_loop_count) . "): " . + timestr(timediff($end_time, $loop_time),"all") . "\n"; + print "\nTesting update of all rows\n"; $loop_time=new Benchmark; for ($i=0 ; $i < $small_loop_count ; $i++) @@ -1530,7 +1559,12 @@ sub check_or_range $estimated=0; $loop_time=new Benchmark; $found=0; - $loop_count=$range_loop_count*10; + # The number of tests must be divisible by the following + $tmp= $limits->{'func_extra_in_num'} ? 15 : 10; + # We need to calculate the exact number of test to make 'Estimated' right + $loop_count=$range_loop_count*10+$tmp-1; + $loop_count=$loop_count- ($loop_count % $tmp); + for ($count=0 ; $count < $loop_count ; ) { for ($rowcnt=0; $rowcnt <= $columns; $rowcnt+= $columns/4) |