diff options
| author | unknown <monty@donna.mysql.fi> | 2001-04-20 15:18:46 +0300 |
|---|---|---|
| committer | unknown <monty@donna.mysql.fi> | 2001-04-20 15:18:46 +0300 |
| commit | 4a7af05c7fdd23d5ec194531b6fdb5dcfb113868 (patch) | |
| tree | a82d8683eb9e83050b873052f53cd7e717d2a572 | |
| parent | b61b56b2939eb45b89fa9de98f16bf4a6a158f51 (diff) | |
| download | mariadb-git-4a7af05c7fdd23d5ec194531b6fdb5dcfb113868.tar.gz | |
Portability fixes
BitKeeper/deleted/.del-compile-ia64-O0-sgicc~a4e0732013d6b602:
Delete: BUILD/compile-ia64-O0-sgicc
BitKeeper/deleted/.del-compile-ia64-O0~3a41dfebefc817d1:
Delete: BUILD/compile-ia64-O0
BitKeeper/deleted/.del-compile-ia64-O2-sgicc~6ff796ecac337849:
Delete: BUILD/compile-ia64-O2-sgicc
BitKeeper/deleted/.del-compile-ia64-O2~87d13594c3599830:
Delete: BUILD/compile-ia64-O2
BitKeeper/deleted/.del-compile-ia64-O6~c34e6b943b12c468:
Delete: BUILD/compile-ia64-O6
Docs/manual.texi:
Cleanup
mysql-test/r/rpl000014.result:
Change port number for comparison
mysql-test/r/rpl000015.result:
Change port number for comparison
mysql-test/r/rpl000016.result:
Change port number for comparison
mysql-test/t/rpl000014.test:
Change port number for comparison
mysql-test/t/rpl000015.test:
Change port number for comparison
mysql-test/t/rpl000016.test:
Change port number for comparison
sql-bench/Results/ATIS-mysql-NT_4.0:
New test results
sql-bench/Results/RUN-mysql-NT_4.0:
New test results
sql-bench/Results/alter-table-mysql-NT_4.0:
New test results
sql-bench/Results/big-tables-mysql-NT_4.0:
New test results
sql-bench/Results/connect-mysql-NT_4.0:
New test results
sql-bench/Results/create-mysql-NT_4.0:
New test results
sql-bench/Results/insert-mysql-NT_4.0:
New test results
sql-bench/Results/select-mysql-NT_4.0:
New test results
sql-bench/Results/wisconsin-mysql-NT_4.0:
New test results
sql/slave.cc:
Removed not used variable
29 files changed, 245 insertions, 274 deletions
diff --git a/BUILD/compile-ia64-O0 b/BUILD/compile-ia64-O0 deleted file mode 100644 index d07067289b4..00000000000 --- a/BUILD/compile-ia64-O0 +++ /dev/null @@ -1,12 +0,0 @@ -make -k clean -/bin/rm -f */.deps/*.P config.cache - -aclocal; autoheader; aclocal; automake; autoconf - -CFLAGS="-O0 -fomit-frame-pointer" CXX=gcc CXXFLAGS="-O0 -fomit-frame-pointer -felide-constructors -fno-exceptions -fno-rtti" ./configure --prefix=/usr/local/mysql --enable-assembler --with-mysqld-ldflags=-all-static --disable-shared --with-extra-charsets=complex -make -strip sql/mysqld - - - - diff --git a/BUILD/compile-ia64-O0-sgicc b/BUILD/compile-ia64-O0-sgicc deleted file mode 100644 index c5e14eab033..00000000000 --- a/BUILD/compile-ia64-O0-sgicc +++ /dev/null @@ -1,12 +0,0 @@ -make -k clean -/bin/rm -f */.deps/*.P config.cache - -aclocal; autoheader; aclocal; automake; autoconf - -CC=sgicc CFLAGS="-O0" CXX=sgicc CXXFLAGS="-O0" ./configure --prefix=/usr/local/mysql --enable-assembler --with-mysqld-ldflags=-all-static --disable-shared --with-extra-charsets=complex -make -strip sql/mysqld - - - - diff --git a/BUILD/compile-ia64-O2 b/BUILD/compile-ia64-O2 deleted file mode 100644 index 140d34b2466..00000000000 --- a/BUILD/compile-ia64-O2 +++ /dev/null @@ -1,12 +0,0 @@ -make -k clean -/bin/rm -f */.deps/*.P config.cache - -aclocal; autoheader; aclocal; automake; autoconf - -CFLAGS="-O2 -fomit-frame-pointer" CXX=gcc CXXFLAGS="-O2 -fomit-frame-pointer -felide-constructors -fno-exceptions -fno-rtti" ./configure --prefix=/usr/local/mysql --enable-assembler --with-mysqld-ldflags=-all-static --disable-shared --with-extra-charsets=complex -make -strip sql/mysqld - - - - diff --git a/BUILD/compile-ia64-O2-sgicc b/BUILD/compile-ia64-O2-sgicc deleted file mode 100644 index 64b2ff17beb..00000000000 --- a/BUILD/compile-ia64-O2-sgicc +++ /dev/null @@ -1,12 +0,0 @@ -make -k clean -/bin/rm -f */.deps/*.P config.cache - -aclocal; autoheader; aclocal; automake; autoconf - -CC=sgicc CFLAGS="-O2" CXX=sgicc CXXFLAGS="-O2" ./configure --prefix=/usr/local/mysql --enable-assembler --with-mysqld-ldflags=-all-static --disable-shared --with-extra-charsets=complex -make -strip sql/mysqld - - - - diff --git a/BUILD/compile-ia64-O6 b/BUILD/compile-ia64-O6 deleted file mode 100644 index 8792c0e1479..00000000000 --- a/BUILD/compile-ia64-O6 +++ /dev/null @@ -1,8 +0,0 @@ -make -k clean -/bin/rm -f */.deps/*.P config.cache - -aclocal; autoheader; aclocal; automake; autoconf - -CFLAGS="-O6 -fomit-frame-pointer" CXX=gcc CXXFLAGS="-O6 -fomit-frame-pointer -felide-constructors -fno-exceptions -fno-rtti" ./configure --prefix=/usr/local/mysql --enable-assembler --with-mysqld-ldflags=-all-static --disable-shared --with-extra-charsets=complex -make -strip sql/mysqld diff --git a/Docs/manual.texi b/Docs/manual.texi index 02b9c64dddb..6e5032df3d9 100644 --- a/Docs/manual.texi +++ b/Docs/manual.texi @@ -2393,7 +2393,7 @@ Apart from the following links, you can find and download a lot of Information about the German MySQL mailing list. @item @uref{http://www2.rent-a-database.de/mysql/} -@strong{MySQL} manual in German. +@strong{MySQL} handbook in German. @item @uref{http://www.bitmover.com:8888//home/bk/mysql} Web access to the @strong{MySQL} BitKeeper repository. diff --git a/innobase/configure.in b/innobase/configure.in index b2fa034479b..9d25255b52c 100644 --- a/innobase/configure.in +++ b/innobase/configure.in @@ -10,7 +10,7 @@ AC_PROG_INSTALL AC_CHECK_HEADERS(aio.h sched.h) AC_CHECK_SIZEOF(int, 4) AC_CHECK_FUNCS(sched_yield) -AC_C_INLINE +#AC_C_INLINE Already checked in MySQL AC_C_BIGENDIAN # Build optimized or debug version ? @@ -56,10 +56,13 @@ else fi case "$target_os" in - hp*) AC_DEFINE(UNIV_MUST_NOT_INLINE, 1, - No inlining because gcc broken on HP-UX);; - *sgi-irix*) AC_DEFINE(UNIV_MUST_NOT_INLINE, 1, - No inlining because cc broken on irix);; + hp*) + CFLAGS="$CFLAGS -DUNIV_MUST_NOT_INLINE";; + irix*) + CFLAGS="$CFLAGS -DUNIV_MUST_NOT_INLINE";; + sysv5uw7*) + # Problem when linking on SCO + CFLAGS="$CFLAGS -DUNIV_MUST_NOT_INLINE";; esac AC_OUTPUT(Makefile os/Makefile ut/Makefile btr/Makefile diff --git a/innobase/include/ut0dbg.h b/innobase/include/ut0dbg.h index a36b022e036..751609b244e 100644 --- a/innobase/include/ut0dbg.h +++ b/innobase/include/ut0dbg.h @@ -9,9 +9,9 @@ Created 1/30/1994 Heikki Tuuri #ifndef ut0dbg_h #define ut0dbg_h +#include "univ.i" #include <assert.h> #include <stdlib.h> -#include "univ.i" #include "os0thread.h" extern ulint ut_dbg_zero; /* This is used to eliminate diff --git a/innobase/include/ut0mem.h b/innobase/include/ut0mem.h index 4d266f34c17..fa46514fe16 100644 --- a/innobase/include/ut0mem.h +++ b/innobase/include/ut0mem.h @@ -9,9 +9,9 @@ Created 5/30/1994 Heikki Tuuri #ifndef ut0mem_h #define ut0mem_h +#include "univ.i" #include <string.h> #include <stdlib.h> -#include "univ.i" UNIV_INLINE void* diff --git a/innobase/include/ut0ut.h b/innobase/include/ut0ut.h index 05d4f455c58..f2c4781c167 100644 --- a/innobase/include/ut0ut.h +++ b/innobase/include/ut0ut.h @@ -9,10 +9,9 @@ Created 1/20/1994 Heikki Tuuri #ifndef ut0ut_h #define ut0ut_h -#include <time.h> -#include <ctype.h> - #include "univ.i" +#include <time.h> +#include <m_ctype.h> typedef time_t ib_time_t; diff --git a/innobase/pars/lexyy.c b/innobase/pars/lexyy.c index 6ba8ecfbcb1..64b8963028b 100644 --- a/innobase/pars/lexyy.c +++ b/innobase/pars/lexyy.c @@ -6,6 +6,7 @@ #define FLEX_SCANNER +#include "univ.i" #include <stdio.h> @@ -5850,7 +5851,6 @@ Created 12/14/1997 Heikki Tuuri *******************************************************/ #define YYSTYPE que_node_t* -#include "univ.i" #include "pars0pars.h" #include "pars0grm.h" #include "pars0sym.h" diff --git a/innobase/pars/pars0grm.c b/innobase/pars/pars0grm.c index e7317d1f030..7f629a8fe4c 100644 --- a/innobase/pars/pars0grm.c +++ b/innobase/pars/pars0grm.c @@ -97,9 +97,8 @@ que_node_t */ #define YYSTYPE que_node_t* #define alloca mem_alloc -#include <math.h> - #include "univ.i" +#include <math.h> #include "pars0pars.h" #include "mem0mem.h" #include "que0types.h" diff --git a/innobase/pars/pars0grm.y b/innobase/pars/pars0grm.y index a13aeaac1e2..681454f1d72 100644 --- a/innobase/pars/pars0grm.y +++ b/innobase/pars/pars0grm.y @@ -12,9 +12,8 @@ que_node_t */ #define YYSTYPE que_node_t* #define alloca mem_alloc -#include <math.h> - #include "univ.i" +#include <math.h> #include "pars0pars.h" #include "mem0mem.h" #include "que0types.h" diff --git a/mysql-test/r/rpl000014.result b/mysql-test/r/rpl000014.result index d2cb8ee5436..a47c3c91c1d 100644 --- a/mysql-test/r/rpl000014.result +++ b/mysql-test/r/rpl000014.result @@ -1,13 +1,13 @@ File Position Binlog_do_db Binlog_ignore_db master-bin.001 73 Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter -127.0.0.1 root 9306 1 master-bin.001 73 Yes 0 0 +127.0.0.1 root 9999 1 master-bin.001 73 Yes 0 0 Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter -127.0.0.1 root 9306 1 master-bin.001 73 No 0 0 +127.0.0.1 root 9999 1 master-bin.001 73 No 0 0 Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter -127.0.0.1 root 9306 1 master-bin.001 73 Yes 0 0 +127.0.0.1 root 9999 1 master-bin.001 73 Yes 0 0 Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter -127.0.0.1 root 9306 1 master-bin.001 173 Yes 0 0 +127.0.0.1 root 9999 1 master-bin.001 173 Yes 0 0 File Position Binlog_do_db Binlog_ignore_db master-bin.001 73 n diff --git a/mysql-test/r/rpl000015.result b/mysql-test/r/rpl000015.result index 5899d76c82f..58487af27f8 100644 --- a/mysql-test/r/rpl000015.result +++ b/mysql-test/r/rpl000015.result @@ -3,11 +3,11 @@ master-bin.001 73 Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter 0 0 0 No 0 0 Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter -127.0.0.1 test 3306 60 4 No 0 0 +127.0.0.1 test 9998 60 4 No 0 0 Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter -127.0.0.1 root 9306 60 4 No 0 0 +127.0.0.1 root 9999 60 4 No 0 0 Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter -127.0.0.1 root 9306 60 master-bin.001 73 Yes 0 0 +127.0.0.1 root 9999 60 master-bin.001 73 Yes 0 0 n 10 45 diff --git a/mysql-test/r/rpl000016.result b/mysql-test/r/rpl000016.result index da9dccae9f4..abe4275a124 100644 --- a/mysql-test/r/rpl000016.result +++ b/mysql-test/r/rpl000016.result @@ -1,5 +1,5 @@ Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter -127.0.0.1 root 9306 60 master-bin.001 216 Yes 0 0 +127.0.0.1 root 9999 60 master-bin.001 216 Yes 0 0 s Could not break slave Tried hard @@ -10,7 +10,7 @@ master-bin.003 Log_name master-bin.003 Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter -127.0.0.1 root 9306 60 master-bin.003 184 Yes 0 0 +127.0.0.1 root 9999 60 master-bin.003 184 Yes 0 0 m 34 65 @@ -25,6 +25,6 @@ master-bin.006 File Position Binlog_do_db Binlog_ignore_db master-bin.006 131 Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter -127.0.0.1 root 9306 60 master-bin.006 131 Yes 0 0 +127.0.0.1 root 9999 60 master-bin.006 131 Yes 0 0 count(*) 100 diff --git a/mysql-test/t/rpl000014.test b/mysql-test/t/rpl000014.test index ca83342c41d..b501d63b10e 100644 --- a/mysql-test/t/rpl000014.test +++ b/mysql-test/t/rpl000014.test @@ -4,14 +4,18 @@ show master status; save_master_pos; connection slave; sync_with_master; +--replace_result 9306 9999 3334 9999 3335 9999 show slave status; change master to master_log_pos=73; slave stop; change master to master_log_pos=73; +--replace_result 9306 9999 3334 9999 3335 9999 show slave status; slave start; +--replace_result 9306 9999 3334 9999 3335 9999 show slave status; change master to master_log_pos=173; +--replace_result 9306 9999 3334 9999 3335 9999 show slave status; connection master; show master status; diff --git a/mysql-test/t/rpl000015.test b/mysql-test/t/rpl000015.test index b6e3ceaf419..73a10bed7b3 100644 --- a/mysql-test/t/rpl000015.test +++ b/mysql-test/t/rpl000015.test @@ -8,12 +8,15 @@ connection slave; reset slave; show slave status; change master to master_host='127.0.0.1'; +--replace_result 3306 9998 9306 9999 3334 9999 3335 9999 show slave status; eval change master to master_host='127.0.0.1',master_user='root', master_password='',master_port=$MASTER_MYPORT; +--replace_result 9306 9999 3334 9999 3335 9999 show slave status; slave start; sync_with_master; +--replace_result 9306 9999 3334 9999 3335 9999 show slave status; connection master; drop table if exists t1; diff --git a/mysql-test/t/rpl000016.test b/mysql-test/t/rpl000016.test index b322858f388..7b46bc75498 100644 --- a/mysql-test/t/rpl000016.test +++ b/mysql-test/t/rpl000016.test @@ -22,6 +22,7 @@ insert into t1 values('Could not break slave'),('Tried hard'); save_master_pos; connection slave; sync_with_master; +--replace_result 9306 9999 3334 9999 3335 9999 show slave status; select * from t1; connection master; @@ -67,6 +68,7 @@ insert into t2 values (65); save_master_pos; connection slave; sync_with_master; +--replace_result 9306 9999 3334 9999 3335 9999 show slave status; select * from t2; connection master; @@ -86,6 +88,7 @@ connection slave; slave stop; slave start; sync_with_master; +--replace_result 9306 9999 3334 9999 3335 9999 show slave status; # because of concurrent insert, the table may not be up to date # if we do not lock diff --git a/sql-bench/Results/ATIS-mysql-NT_4.0 b/sql-bench/Results/ATIS-mysql-NT_4.0 index 0b6f896a13b..413a5e512bf 100644 --- a/sql-bench/Results/ATIS-mysql-NT_4.0 +++ b/sql-bench/Results/ATIS-mysql-NT_4.0 @@ -1,20 +1,20 @@ -Testing server 'MySQL 3.23.31' at 2001-01-18 0:38:04 +Testing server 'MySQL 3.23.37' at 2001-04-19 13:49:16 ATIS table test
Creating tables
-Time for create_table (28): 0 wallclock secs ( 0.00 usr 0.01 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for create_table (28): 0 wallclock secs ( 0.02 usr 0.00 sys + 0.00 cusr 0.00 csys = 0.00 CPU) Inserting data
-Time to insert (9768): 5 wallclock secs ( 0.95 usr 1.20 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time to insert (9768): 6 wallclock secs ( 0.81 usr 1.27 sys + 0.00 cusr 0.00 csys = 0.00 CPU) Retrieving data
-Time for select_simple_join (500): 3 wallclock secs ( 1.59 usr 0.67 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for select_join (100): 4 wallclock secs ( 1.39 usr 0.55 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for select_key_prefix_join (100): 19 wallclock secs (12.20 usr 4.53 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for select_distinct (800): 17 wallclock secs ( 4.72 usr 1.55 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for select_group (2800): 20 wallclock secs ( 3.14 usr 0.95 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for select_simple_join (500): 3 wallclock secs ( 1.52 usr 0.66 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for select_join (100): 4 wallclock secs ( 1.41 usr 0.53 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for select_key_prefix_join (100): 18 wallclock secs (12.05 usr 4.75 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for select_distinct (800): 17 wallclock secs ( 4.72 usr 1.78 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for select_group (2800): 21 wallclock secs ( 3.06 usr 1.28 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: 68 wallclock secs (24.02 usr 9.47 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Total time: 69 wallclock secs (23.58 usr 10.26 sys + 0.00 cusr 0.00 csys = 0.00 CPU) diff --git a/sql-bench/Results/RUN-mysql-NT_4.0 b/sql-bench/Results/RUN-mysql-NT_4.0 index 43480bf0fe7..70d6fb2dc0f 100644 --- a/sql-bench/Results/RUN-mysql-NT_4.0 +++ b/sql-bench/Results/RUN-mysql-NT_4.0 @@ -1,96 +1,103 @@ -Benchmark DBD suite: 2.11a -Date of test: 2001-01-17 23:59:27 -Running tests on: Windows NT Version 4.0
-Arguments:
+Benchmark DBD suite: 2.12 +Date of test: 2001-04-19 13:10:13 +Running tests on: Windows NT Version 4.0 +Arguments: Comments: 2x Pentium III XEON 450MHZ, 512M
-Limits from:
-Server version: MySQL 3.23.31 +Limits from: +Server version: MySQL 3.23.37 -alter-table: Total time: 2315 wallclock secs ( 0.78 usr 0.53 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -ATIS: Total time: 68 wallclock secs (24.02 usr 9.47 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -big-tables: Total time: 80 wallclock secs (18.31 usr 19.30 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -connect: Total time: 183 wallclock secs (60.53 usr 49.50 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -create: Total time: 995 wallclock secs (13.64 usr 10.78 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -insert: Total time: 7164 wallclock secs (872.86 usr 441.45 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -select: Total time: 1297 wallclock secs (113.66 usr 43.80 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -wisconsin: Total time: 28 wallclock secs ( 7.94 usr 5.42 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +alter-table: Total time: 2342 wallclock secs ( 0.91 usr 0.59 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +ATIS: Total time: 69 wallclock secs (23.58 usr 10.26 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +big-tables: Total time: 79 wallclock secs (17.44 usr 18.84 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +connect: Total time: 179 wallclock secs (58.89 usr 48.05 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +create: Total time: 897 wallclock secs (15.94 usr 10.42 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +insert: Total time: 6659 wallclock secs (1143.94 usr 544.92 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +select: Total time: 1556 wallclock secs (127.53 usr 47.33 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +wisconsin: Total time: 28 wallclock secs ( 7.95 usr 5.70 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 1225.00 0.47 0.25 0.00 992 -alter_table_drop 1039.00 0.19 0.11 0.00 496 -connect 33.00 11.47 9.97 0.00 10000 -connect+select_1_row 38.00 13.19 12.03 0.00 10000 -connect+select_simple 36.00 12.84 11.23 0.00 10000 -count 35.00 0.06 0.00 0.00 100 -count_distinct 80.00 0.94 0.31 0.00 2000 -count_distinct_big 214.00 23.03 7.88 0.00 120 -count_distinct_group 150.00 3.03 1.20 0.00 1000 -count_distinct_group_on_key 45.00 0.67 0.25 0.00 1000 -count_distinct_group_on_key_parts 150.00 3.31 0.97 0.00 1000 -count_group_on_key_parts 41.00 2.81 0.92 0.00 1000 -count_on_key 377.00 21.58 9.17 0.00 50100 -create+drop 142.00 3.30 2.89 0.00 10000 -create_MANY_tables 245.00 2.73 1.56 0.00 10000 -create_index 25.00 0.00 0.00 0.00 8 -create_key+drop 172.00 5.14 2.92 0.00 10000 -create_table 0.00 0.00 0.01 0.00 31 -delete_all 21.00 0.00 0.02 0.00 12 -delete_all_many_keys 1980.00 0.03 0.03 0.00 1 -delete_big 0.00 0.00 0.00 0.00 1
-delete_big_many_keys 1980.00 0.03 0.03 0.00 128 -delete_key 8.00 0.88 1.34 0.00 10000 -drop_index 25.00 0.00 0.00 0.00 8 -drop_table 0.00 0.00 0.00 0.00 28
-drop_table_when_MANY_tables 187.00 1.08 1.38 0.00 10000 -insert 234.00 35.02 48.52 0.00 350768 -insert_duplicates 59.00 8.92 14.09 0.00 100000 -insert_key 1853.00 13.92 13.81 0.00 100000 -insert_many_fields 22.00 0.64 0.39 0.00 2000 -insert_select_1_key 8.00 0.00 0.00 0.00 1
-insert_select_2_keys 12.00 0.00 0.00 0.00 1 -min_max 18.00 0.05 0.02 0.00 60 -min_max_on_key 193.00 35.67 14.80 0.00 85000 -multiple_value_insert 12.00 2.50 0.19 0.00 100000 -order_by_big 104.00 64.25 25.28 0.00 10 -order_by_big_key 95.00 69.14 26.05 0.00 10 -order_by_big_key2 90.00 63.38 26.20 0.00 10 -order_by_big_key_desc 96.00 68.61 26.58 0.00 10 -order_by_big_key_diff 100.00 65.05 24.69 0.00 10 -order_by_big_key_prefix 89.00 63.73 25.53 0.00 10 -order_by_key2_diff 11.00 5.53 2.23 0.00 500 -order_by_key_prefix 6.00 3.11 1.09 0.00 500 -order_by_range 9.00 3.02 1.25 0.00 500 -outer_join 118.00 0.00 0.00 0.00 10 -outer_join_found 106.00 0.02 0.00 0.00 10 -outer_join_not_found 58.00 0.02 0.00 0.00 500 -outer_join_on_key 41.00 0.03 0.00 0.00 10 -select_1_row 5.00 1.14 1.80 0.00 10000 -select_2_rows 6.00 0.91 2.03 0.00 10000 -select_big 146.00 83.48 34.54 0.00 10080 -select_column+column 6.00 0.88 1.83 0.00 10000 -select_diff_key 122.00 0.45 0.08 0.00 500 -select_distinct 17.00 4.72 1.55 0.00 800 -select_group 56.00 3.17 1.01 0.00 2911 -select_group_when_MANY_tables 249.00 1.39 2.03 0.00 10000 -select_join 4.00 1.39 0.55 0.00 100 -select_key 194.00 90.98 38.86 0.00 200000 -select_key2 202.00 92.78 37.67 0.00 200000 -select_key_prefix 199.00 93.61 38.05 0.00 200000 -select_key_prefix_join 19.00 12.20 4.53 0.00 100 -select_many_fields 55.00 17.65 18.90 0.00 2000 -select_range 187.00 27.39 9.33 0.00 410 -select_range_key2 29.00 10.31 3.64 0.00 25010 -select_range_prefix 28.00 10.05 4.22 0.00 25010 -select_simple 4.00 0.88 1.61 0.00 10000 -select_simple_join 3.00 1.59 0.67 0.00 500 -update_big 60.00 0.00 0.00 0.00 10 -update_of_key 56.00 4.28 7.00 0.00 50000 -update_of_key_big 33.00 0.06 0.08 0.00 501 -update_of_primary_key_many_keys 580.00 0.03 0.05 0.00 256 -update_with_key 188.00 27.97 41.06 0.00 300000 -update_with_key_prefix 59.00 9.42 12.14 0.00 100000 -wisc_benchmark 9.00 5.44 1.66 0.00 114 -TOTALS 14098.00 1111.56 580.08 0.00 2046247 +alter_table_add 1246.00 0.52 0.22 0.00 992 +alter_table_drop 1043.00 0.27 0.06 0.00 496 +connect 33.00 12.13 9.89 0.00 10000 +connect+select_1_row 39.00 12.91 11.73 0.00 10000 +connect+select_simple 37.00 12.36 12.34 0.00 10000 +count 36.00 0.03 0.02 0.00 100 +count_distinct 48.00 0.56 0.20 0.00 1000 +count_distinct_2 52.00 0.45 0.27 0.00 1000 +count_distinct_big 205.00 22.49 8.11 0.00 120 +count_distinct_group 145.00 2.67 1.19 0.00 1000 +count_distinct_group_on_key 48.00 0.58 0.17 0.00 1000 +count_distinct_group_on_key_parts 145.00 3.02 0.94 0.00 1000 +count_distinct_key_prefix 39.00 0.52 0.17 0.00 1000 +count_group_on_key_parts 40.00 2.73 0.83 0.00 1000 +count_on_key 405.00 22.87 8.23 0.00 50100 +create+drop 134.00 3.78 2.89 0.00 10000 +create_MANY_tables 231.00 3.27 1.58 0.00 10000 +create_index 26.00 0.00 0.00 0.00 8 +create_key+drop 167.00 5.98 2.77 0.00 10000 +create_table 0.00 0.02 0.02 0.00 31 +delete_all 19.00 0.00 0.00 0.00 12 +delete_all_many_keys 1431.00 0.00 0.03 0.00 1 +delete_big 0.00 0.00 0.00 0.00 1 +delete_big_many_keys 1431.00 0.00 0.03 0.00 128 +delete_key 7.00 1.14 1.42 0.00 10000 +drop_index 27.00 0.00 0.00 0.00 8 +drop_table 0.00 0.00 0.00 0.00 28 +drop_table_when_MANY_tables 169.00 1.41 1.42 0.00 10000 +insert 235.00 33.44 47.68 0.00 350768 +insert_duplicates 59.00 9.02 12.91 0.00 100000 +insert_key 1440.00 13.86 11.92 0.00 100000 +insert_many_fields 22.00 0.64 0.45 0.00 2000 +insert_select_1_key 8.00 0.00 0.00 0.00 1 +insert_select_2_keys 12.00 0.00 0.00 0.00 1 +min_max 19.00 0.00 0.02 0.00 60 +min_max_on_key 196.00 37.78 15.60 0.00 85000 +multiple_value_insert 9.00 2.53 0.19 0.00 100000 +order_by_big 101.00 61.84 25.81 0.00 10 +order_by_big_key 93.00 66.86 26.16 0.00 10 +order_by_big_key2 88.00 62.99 24.97 0.00 10 +order_by_big_key_desc 94.00 67.34 25.92 0.00 10 +order_by_big_key_diff 98.00 62.45 25.16 0.00 10 +order_by_big_key_prefix 88.00 62.72 25.19 0.00 10 +order_by_key2_diff 11.00 5.53 2.19 0.00 500 +order_by_key_prefix 6.00 2.94 1.08 0.00 500 +order_by_range 9.00 2.92 1.23 0.00 500 +outer_join 120.00 0.00 0.00 0.00 10 +outer_join_found 106.00 0.00 0.00 0.00 10 +outer_join_not_found 56.00 0.03 0.00 0.00 500 +outer_join_on_key 41.00 0.00 0.00 0.00 10 +select_1_row 5.00 1.23 1.69 0.00 10000 +select_2_rows 6.00 1.00 2.20 0.00 10000 +select_big 139.00 80.53 32.12 0.00 10080 +select_column+column 5.00 1.08 1.75 0.00 10000 +select_diff_key 127.00 0.67 0.05 0.00 500 +select_distinct 17.00 4.72 1.78 0.00 800 +select_group 59.00 3.11 1.34 0.00 2911 +select_group_when_MANY_tables 196.00 1.48 1.77 0.00 10000 +select_join 4.00 1.41 0.53 0.00 100 +select_key 196.00 103.61 37.28 0.00 200000 +select_key2 205.00 93.56 39.66 0.00 200000 +select_key2_return_key 198.00 90.06 35.53 0.00 200000 +select_key2_return_prim 203.00 91.61 35.25 0.00 200000 +select_key_prefix 201.00 93.56 39.13 0.00 200000 +select_key_prefix_join 18.00 12.05 4.75 0.00 100 +select_key_return_key 195.00 89.05 37.13 0.00 200000 +select_many_fields 54.00 16.80 18.40 0.00 2000 +select_query_cache 90.00 5.81 1.91 0.00 10000 +select_query_cache2 91.00 5.55 1.86 0.00 10000 +select_range 186.00 27.06 9.17 0.00 410 +select_range_key2 30.00 10.39 3.47 0.00 25010 +select_range_prefix 28.00 10.19 4.06 0.00 25010 +select_simple 4.00 0.80 1.48 0.00 10000 +select_simple_join 3.00 1.52 0.66 0.00 500 +update_big 66.00 0.00 0.00 0.00 10 +update_of_key 56.00 4.66 6.17 0.00 50000 +update_of_key_big 32.00 0.05 0.11 0.00 501 +update_of_primary_key_many_keys 447.00 0.03 0.00 0.00 256 +update_with_key 190.00 27.05 40.97 0.00 300000 +update_with_key_prefix 58.00 9.02 13.19 0.00 100000 +wisc_benchmark 9.00 5.77 1.45 0.00 114 +TOTALS 13232.00 1396.03 685.87 0.00 2667247 diff --git a/sql-bench/Results/alter-table-mysql-NT_4.0 b/sql-bench/Results/alter-table-mysql-NT_4.0 index 3a75bf1a366..98863586928 100644 --- a/sql-bench/Results/alter-table-mysql-NT_4.0 +++ b/sql-bench/Results/alter-table-mysql-NT_4.0 @@ -1,16 +1,16 @@ -Testing server 'MySQL 3.23.31' at 2001-01-17 23:59:28 +Testing server 'MySQL 3.23.37' at 2001-04-19 13:10:14 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.13 usr 0.17 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for insert (1000) 0 wallclock secs ( 0.13 usr 0.31 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for alter_table_add (992): 1225 wallclock secs ( 0.47 usr 0.25 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for alter_table_add (992): 1246 wallclock secs ( 0.52 usr 0.22 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for create_index (8): 25 wallclock secs ( 0.00 usr 0.00 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for create_index (8): 26 wallclock secs ( 0.00 usr 0.00 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for drop_index (8): 25 wallclock secs ( 0.00 usr 0.00 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for drop_index (8): 27 wallclock secs ( 0.00 usr 0.00 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for alter_table_drop (496): 1039 wallclock secs ( 0.19 usr 0.11 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for alter_table_drop (496): 1043 wallclock secs ( 0.27 usr 0.06 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Total time: 2315 wallclock secs ( 0.78 usr 0.53 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Total time: 2342 wallclock secs ( 0.91 usr 0.59 sys + 0.00 cusr 0.00 csys = 0.00 CPU) diff --git a/sql-bench/Results/big-tables-mysql-NT_4.0 b/sql-bench/Results/big-tables-mysql-NT_4.0 index 8654e5711dd..7f3510f396c 100644 --- a/sql-bench/Results/big-tables-mysql-NT_4.0 +++ b/sql-bench/Results/big-tables-mysql-NT_4.0 @@ -1,19 +1,19 @@ -Testing server 'MySQL 3.23.31' at 2001-01-18 0:39:12 +Testing server 'MySQL 3.23.37' at 2001-04-19 13:50:25 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): 20 wallclock secs ( 8.56 usr 9.42 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time to select_many_fields(1000): 19 wallclock secs ( 8.02 usr 9.49 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): 35 wallclock secs ( 9.09 usr 9.48 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time to select_many_fields(1000): 35 wallclock secs ( 8.78 usr 8.91 sys + 0.00 cusr 0.00 csys = 0.00 CPU) Testing insert VALUES()
-Time to insert_many_fields(1000): 4 wallclock secs ( 0.47 usr 0.14 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time to insert_many_fields(1000): 3 wallclock secs ( 0.48 usr 0.14 sys + 0.00 cusr 0.00 csys = 0.00 CPU) Testing insert (all_fields) VALUES()
-Time to insert_many_fields(1000): 18 wallclock secs ( 0.17 usr 0.25 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time to insert_many_fields(1000): 19 wallclock secs ( 0.16 usr 0.31 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Total time: 80 wallclock secs (18.31 usr 19.30 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Total time: 79 wallclock secs (17.44 usr 18.84 sys + 0.00 cusr 0.00 csys = 0.00 CPU) diff --git a/sql-bench/Results/connect-mysql-NT_4.0 b/sql-bench/Results/connect-mysql-NT_4.0 index cf366c0f547..3c3bfa1e112 100644 --- a/sql-bench/Results/connect-mysql-NT_4.0 +++ b/sql-bench/Results/connect-mysql-NT_4.0 @@ -1,30 +1,30 @@ -Testing server 'MySQL 3.23.31' at 2001-01-18 0:40:33 +Testing server 'MySQL 3.23.37' at 2001-04-19 13:51:45 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): 33 wallclock secs (11.47 usr 9.97 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time to connect (10000): 33 wallclock secs (12.13 usr 9.89 sys + 0.00 cusr 0.00 csys = 0.00 CPU) Test connect/simple select/disconnect
-Time for connect+select_simple (10000): 36 wallclock secs (12.84 usr 11.23 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for connect+select_simple (10000): 37 wallclock secs (12.36 usr 12.34 sys + 0.00 cusr 0.00 csys = 0.00 CPU) Test simple select
-Time for select_simple (10000): 4 wallclock secs ( 0.88 usr 1.61 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for select_simple (10000): 4 wallclock secs ( 0.80 usr 1.48 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): 38 wallclock secs (13.19 usr 12.03 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time to connect+select_1_row (10000): 39 wallclock secs (12.91 usr 11.73 sys + 0.00 cusr 0.00 csys = 0.00 CPU) Testing select 1 row from table
-Time to select_1_row (10000): 5 wallclock secs ( 1.14 usr 1.80 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time to select_1_row (10000): 5 wallclock secs ( 1.23 usr 1.69 sys + 0.00 cusr 0.00 csys = 0.00 CPU) Testing select 2 rows from table
-Time to select_2_rows (10000): 6 wallclock secs ( 0.91 usr 2.03 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time to select_2_rows (10000): 6 wallclock secs ( 1.00 usr 2.20 sys + 0.00 cusr 0.00 csys = 0.00 CPU) Test select with aritmetic (+)
-Time for select_column+column (10000): 6 wallclock secs ( 0.88 usr 1.83 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for select_column+column (10000): 5 wallclock secs ( 1.08 usr 1.75 sys + 0.00 cusr 0.00 csys = 0.00 CPU) Testing retrieval of big records (65000 bytes)
-Time to select_big (10000): 55 wallclock secs (19.23 usr 8.98 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time to select_big (10000): 50 wallclock secs (17.36 usr 6.95 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Total time: 183 wallclock secs (60.53 usr 49.50 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Total time: 179 wallclock secs (58.89 usr 48.05 sys + 0.00 cusr 0.00 csys = 0.00 CPU) diff --git a/sql-bench/Results/create-mysql-NT_4.0 b/sql-bench/Results/create-mysql-NT_4.0 index 326148f9bbd..2191f28735a 100644 --- a/sql-bench/Results/create-mysql-NT_4.0 +++ b/sql-bench/Results/create-mysql-NT_4.0 @@ -1,18 +1,18 @@ -Testing server 'MySQL 3.23.31' at 2001-01-18 0:43:36 +Testing server 'MySQL 3.23.37' at 2001-04-19 13:54:45 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): 245 wallclock secs ( 2.73 usr 1.56 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for create_MANY_tables (10000): 231 wallclock secs ( 3.27 usr 1.58 sys + 0.00 cusr 0.00 csys = 0.00 CPU) Accessing tables
-Time to select_group_when_MANY_tables (10000): 249 wallclock secs ( 1.39 usr 2.03 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time to select_group_when_MANY_tables (10000): 196 wallclock secs ( 1.48 usr 1.77 sys + 0.00 cusr 0.00 csys = 0.00 CPU) Testing drop
-Time for drop_table_when_MANY_tables (10000): 187 wallclock secs ( 1.08 usr 1.38 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for drop_table_when_MANY_tables (10000): 169 wallclock secs ( 1.41 usr 1.42 sys + 0.00 cusr 0.00 csys = 0.00 CPU) Testing create+drop
-Time for create+drop (10000): 142 wallclock secs ( 3.30 usr 2.89 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for create_key+drop (10000): 172 wallclock secs ( 5.14 usr 2.92 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Total time: 995 wallclock secs (13.64 usr 10.78 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for create+drop (10000): 134 wallclock secs ( 3.78 usr 2.89 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for create_key+drop (10000): 167 wallclock secs ( 5.98 usr 2.77 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Total time: 897 wallclock secs (15.94 usr 10.42 sys + 0.00 cusr 0.00 csys = 0.00 CPU) diff --git a/sql-bench/Results/insert-mysql-NT_4.0 b/sql-bench/Results/insert-mysql-NT_4.0 index 1e5e47b994e..dddbf6d4c19 100644 --- a/sql-bench/Results/insert-mysql-NT_4.0 +++ b/sql-bench/Results/insert-mysql-NT_4.0 @@ -1,4 +1,4 @@ -Testing server 'MySQL 3.23.31' at 2001-01-18 1:00:12 +Testing server 'MySQL 3.23.37' at 2001-04-19 14:09:43 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,55 +8,58 @@ Creating tables Inserting 100000 rows in order
Inserting 100000 rows in reverse order
Inserting 100000 rows in random order
-Time for insert (300000): 203 wallclock secs (30.27 usr 42.14 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for insert (300000): 203 wallclock secs (29.19 usr 40.84 sys + 0.00 cusr 0.00 csys = 0.00 CPU) Testing insert of duplicates
-Time for insert_duplicates (100000): 59 wallclock secs ( 8.92 usr 14.09 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for insert_duplicates (100000): 59 wallclock secs ( 9.02 usr 12.91 sys + 0.00 cusr 0.00 csys = 0.00 CPU) Retrieving data from the table
-Time for select_big (10:3000000): 90 wallclock secs (63.84 usr 25.47 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for order_by_big_key (10:3000000): 95 wallclock secs (69.14 usr 26.05 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for order_by_big_key_desc (10:3000000): 96 wallclock secs (68.61 usr 26.58 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for order_by_big_key_prefix (10:3000000): 89 wallclock secs (63.73 usr 25.53 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for order_by_big_key2 (10:3000000): 90 wallclock secs (63.38 usr 26.20 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for order_by_big_key_diff (10:3000000): 100 wallclock secs (65.05 usr 24.69 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for order_by_big (10:3000000): 104 wallclock secs (64.25 usr 25.28 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for order_by_range (500:125750): 9 wallclock secs ( 3.02 usr 1.25 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for order_by_key_prefix (500:125750): 6 wallclock secs ( 3.11 usr 1.09 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for order_by_key2_diff (500:250500): 11 wallclock secs ( 5.53 usr 2.23 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for select_diff_key (500:1000): 122 wallclock secs ( 0.45 usr 0.08 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for select_range_prefix (5010:42084): 15 wallclock secs ( 4.52 usr 1.78 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for select_range_key2 (5010:42084): 16 wallclock secs ( 4.67 usr 1.61 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for select_key_prefix (200000): 199 wallclock secs (93.61 usr 38.05 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for select_key (200000): 194 wallclock secs (90.98 usr 38.86 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for select_key2 (200000): 202 wallclock secs (92.78 usr 37.67 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for select_big (10:3000000): 88 wallclock secs (62.84 usr 25.00 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for order_by_big_key (10:3000000): 93 wallclock secs (66.86 usr 26.16 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for order_by_big_key_desc (10:3000000): 94 wallclock secs (67.34 usr 25.92 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for order_by_big_key_prefix (10:3000000): 88 wallclock secs (62.72 usr 25.19 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for order_by_big_key2 (10:3000000): 88 wallclock secs (62.99 usr 24.97 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for order_by_big_key_diff (10:3000000): 98 wallclock secs (62.45 usr 25.16 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for order_by_big (10:3000000): 101 wallclock secs (61.84 usr 25.81 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for order_by_range (500:125750): 9 wallclock secs ( 2.92 usr 1.23 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for order_by_key_prefix (500:125750): 6 wallclock secs ( 2.94 usr 1.08 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for order_by_key2_diff (500:250500): 11 wallclock secs ( 5.53 usr 2.19 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for select_diff_key (500:1000): 127 wallclock secs ( 0.67 usr 0.05 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for select_range_prefix (5010:42084): 15 wallclock secs ( 4.69 usr 1.61 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for select_range_key2 (5010:42084): 16 wallclock secs ( 4.70 usr 1.42 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for select_key_prefix (200000): 201 wallclock secs (93.56 usr 39.13 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for select_key (200000): 196 wallclock secs (103.61 usr 37.28 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for select_key_return_key (200000): 195 wallclock secs (89.05 usr 37.13 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for select_key2 (200000): 205 wallclock secs (93.56 usr 39.66 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for select_key2_return_key (200000): 198 wallclock secs (90.06 usr 35.53 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for select_key2_return_prim (200000): 203 wallclock secs (91.61 usr 35.25 sys + 0.00 cusr 0.00 csys = 0.00 CPU) Test of compares with simple ranges
-Time for select_range_prefix (20000:43500): 13 wallclock secs ( 5.53 usr 2.44 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for select_range_key2 (20000:43500): 13 wallclock secs ( 5.64 usr 2.03 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for select_group (111): 36 wallclock secs ( 0.03 usr 0.06 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for min_max_on_key (15000): 14 wallclock secs ( 6.42 usr 2.50 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for min_max (60): 18 wallclock secs ( 0.05 usr 0.02 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for count_on_key (100): 31 wallclock secs ( 0.06 usr 0.03 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for count (100): 35 wallclock secs ( 0.06 usr 0.00 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for count_distinct_big (20): 103 wallclock secs ( 0.00 usr 0.00 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for select_range_prefix (20000:43500): 13 wallclock secs ( 5.50 usr 2.45 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for select_range_key2 (20000:43500): 14 wallclock secs ( 5.69 usr 2.05 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for select_group (111): 38 wallclock secs ( 0.05 usr 0.06 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for min_max_on_key (15000): 14 wallclock secs ( 6.08 usr 2.83 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for min_max (60): 19 wallclock secs ( 0.00 usr 0.02 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for count_on_key (100): 37 wallclock secs ( 0.06 usr 0.00 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for count (100): 36 wallclock secs ( 0.03 usr 0.02 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for count_distinct_big (20): 91 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): 56 wallclock secs ( 4.28 usr 7.00 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for update_of_key_big (501): 33 wallclock secs ( 0.06 usr 0.08 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for update_of_key (50000): 56 wallclock secs ( 4.66 usr 6.17 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for update_of_key_big (501): 32 wallclock secs ( 0.05 usr 0.11 sys + 0.00 cusr 0.00 csys = 0.00 CPU) Testing update with key
-Time for update_with_key (300000): 188 wallclock secs (27.97 usr 41.06 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for update_with_key_prefix (100000): 59 wallclock secs ( 9.42 usr 12.14 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for update_with_key (300000): 190 wallclock secs (27.05 usr 40.97 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for update_with_key_prefix (100000): 58 wallclock secs ( 9.02 usr 13.19 sys + 0.00 cusr 0.00 csys = 0.00 CPU) Testing update of all rows
-Time for update_big (10): 60 wallclock secs ( 0.00 usr 0.00 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for update_big (10): 66 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): 41 wallclock secs ( 0.03 usr 0.00 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for outer_join (10:10): 118 wallclock secs ( 0.00 usr 0.00 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for outer_join_found (10:10): 106 wallclock secs ( 0.02 usr 0.00 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for outer_join_not_found (500:10): 58 wallclock secs ( 0.02 usr 0.00 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for outer_join_on_key (10:10): 41 wallclock secs ( 0.00 usr 0.00 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for outer_join (10:10): 120 wallclock secs ( 0.00 usr 0.00 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for outer_join_found (10:10): 106 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): 56 wallclock secs ( 0.03 usr 0.00 sys + 0.00 cusr 0.00 csys = 0.00 CPU) Testing INSERT INTO ... SELECT
Time for insert_select_1_key (1): 8 wallclock secs ( 0.00 usr 0.00 sys + 0.00 cusr 0.00 csys = 0.00 CPU)
@@ -64,24 +67,24 @@ Time for insert_select_2_keys (1): 12 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): 8 wallclock secs ( 0.88 usr 1.34 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for delete_all (12): 21 wallclock secs ( 0.00 usr 0.02 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for delete_key (10000): 7 wallclock secs ( 1.14 usr 1.42 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for delete_all (12): 19 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): 1853 wallclock secs (13.92 usr 13.81 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for insert_key (100000): 1440 wallclock secs (13.86 usr 11.92 sys + 0.00 cusr 0.00 csys = 0.00 CPU) Testing update of keys
-Time for update_of_primary_key_many_keys (256): 580 wallclock secs ( 0.03 usr 0.05 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for update_of_primary_key_many_keys (256): 447 wallclock secs ( 0.03 usr 0.00 sys + 0.00 cusr 0.00 csys = 0.00 CPU) Deleting rows from the table
-Time for delete_big_many_keys (128): 1980 wallclock secs ( 0.03 usr 0.03 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for delete_big_many_keys (128): 1431 wallclock secs ( 0.00 usr 0.03 sys + 0.00 cusr 0.00 csys = 0.00 CPU) Deleting everything from table
-Time for delete_all_many_keys (1): 1980 wallclock secs ( 0.03 usr 0.03 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for delete_all_many_keys (1): 1431 wallclock secs ( 0.00 usr 0.03 sys + 0.00 cusr 0.00 csys = 0.00 CPU) Inserting 100000 rows with multiple values
-Time for multiple_value_insert (100000): 12 wallclock secs ( 2.50 usr 0.19 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for multiple_value_insert (100000): 9 wallclock secs ( 2.53 usr 0.19 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: 7164 wallclock secs (872.86 usr 441.45 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Total time: 6659 wallclock secs (1143.94 usr 544.92 sys + 0.00 cusr 0.00 csys = 0.00 CPU) diff --git a/sql-bench/Results/select-mysql-NT_4.0 b/sql-bench/Results/select-mysql-NT_4.0 index a32f7063a25..d560ccddb99 100644 --- a/sql-bench/Results/select-mysql-NT_4.0 +++ b/sql-bench/Results/select-mysql-NT_4.0 @@ -1,23 +1,30 @@ -Testing server 'MySQL 3.23.31' at 2001-01-18 2:59:37 +Testing server 'MySQL 3.23.37' at 2001-04-19 16:00:44 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): 7 wallclock secs ( 1.30 usr 1.41 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time to insert (10000): 7 wallclock secs ( 1.27 usr 1.34 sys + 0.00 cusr 0.00 csys = 0.00 CPU) + +Test if the database has a query cache +Time for select_query_cache (10000): 90 wallclock secs ( 5.81 usr 1.91 sys + 0.00 cusr 0.00 csys = 0.00 CPU) + +Time for select_query_cache2 (10000): 91 wallclock secs ( 5.55 usr 1.86 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.41 usr 0.09 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for select_range (410:1057904): 187 wallclock secs (27.39 usr 9.33 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for min_max_on_key (70000): 179 wallclock secs (29.25 usr 12.30 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for count_on_key (50000): 346 wallclock secs (21.52 usr 9.14 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for select_big (70:17207): 1 wallclock secs ( 0.33 usr 0.17 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for select_range (410:1057904): 186 wallclock secs (27.06 usr 9.17 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for min_max_on_key (70000): 182 wallclock secs (31.70 usr 12.77 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for count_on_key (50000): 368 wallclock secs (22.81 usr 8.23 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for count_group_on_key_parts (1000:100000): 41 wallclock secs ( 2.81 usr 0.92 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for count_group_on_key_parts (1000:100000): 40 wallclock secs ( 2.73 usr 0.83 sys + 0.00 cusr 0.00 csys = 0.00 CPU) Testing count(distinct) on the table
-Time for count_distinct (2000:2000): 80 wallclock secs ( 0.94 usr 0.31 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for count_distinct_group_on_key (1000:6000): 45 wallclock secs ( 0.67 usr 0.25 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for count_distinct_group_on_key_parts (1000:100000): 150 wallclock secs ( 3.31 usr 0.97 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for count_distinct_group (1000:100000): 150 wallclock secs ( 3.03 usr 1.20 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Time for count_distinct_big (100:1000000): 111 wallclock secs (23.03 usr 7.88 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Total time: 1297 wallclock secs (113.66 usr 43.80 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for count_distinct_key_prefix (1000:1000): 39 wallclock secs ( 0.52 usr 0.17 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for count_distinct (1000:1000): 48 wallclock secs ( 0.56 usr 0.20 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for count_distinct_2 (1000:1000): 52 wallclock secs ( 0.45 usr 0.27 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for count_distinct_group_on_key (1000:6000): 48 wallclock secs ( 0.58 usr 0.17 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for count_distinct_group_on_key_parts (1000:100000): 145 wallclock secs ( 3.02 usr 0.94 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for count_distinct_group (1000:100000): 145 wallclock secs ( 2.67 usr 1.19 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for count_distinct_big (100:1000000): 114 wallclock secs (22.47 usr 8.11 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Total time: 1556 wallclock secs (127.53 usr 47.33 sys + 0.00 cusr 0.00 csys = 0.00 CPU) diff --git a/sql-bench/Results/wisconsin-mysql-NT_4.0 b/sql-bench/Results/wisconsin-mysql-NT_4.0 index f4ed2847ff7..0ef69aa9272 100644 --- a/sql-bench/Results/wisconsin-mysql-NT_4.0 +++ b/sql-bench/Results/wisconsin-mysql-NT_4.0 @@ -1,14 +1,14 @@ -Testing server 'MySQL 3.23.31' at 2001-01-18 3:21:15 +Testing server 'MySQL 3.23.37' at 2001-04-19 16:26:40 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)
+Time for create_table (3): 0 wallclock secs ( 0.00 usr 0.02 sys + 0.00 cusr 0.00 csys = 0.00 CPU) Inserting data
-Time to insert (31000): 19 wallclock secs ( 2.50 usr 3.77 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time to insert (31000): 19 wallclock secs ( 2.17 usr 4.23 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): 9 wallclock secs ( 5.44 usr 1.66 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Time for wisc_benchmark (114): 9 wallclock secs ( 5.77 usr 1.45 sys + 0.00 cusr 0.00 csys = 0.00 CPU) -Total time: 28 wallclock secs ( 7.94 usr 5.42 sys + 0.00 cusr 0.00 csys = 0.00 CPU) +Total time: 28 wallclock secs ( 7.95 usr 5.70 sys + 0.00 cusr 0.00 csys = 0.00 CPU) diff --git a/sql/slave.cc b/sql/slave.cc index 0220f574112..aded6d558fc 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -1191,7 +1191,7 @@ pthread_handler_decl(handle_slave,arg __attribute__((unused))) pthread_cond_broadcast(&COND_slave_start); pthread_mutex_unlock(&LOCK_slave); - int error = 1; + // int error = 1; bool retried_once = 0; ulonglong last_failed_pos = 0; @@ -1369,7 +1369,7 @@ the slave thread with \"mysqladmin start-slave\". We stopped at log \ } } - error = 0; + // error = 0; err: // print the current replication position sql_print_error("Slave thread exiting, replication stopped in log '%s' at \ |