diff options
author | unknown <monty@donna.mysql.com> | 2000-09-13 01:08:34 +0300 |
---|---|---|
committer | unknown <monty@donna.mysql.com> | 2000-09-13 01:08:34 +0300 |
commit | 1040f1ac8ec95fcd2f42bc3b4d74d5ee01584e8f (patch) | |
tree | 42c131dcc09b3b264d33b14120eaae7687ab2425 /sql-bench/test-insert.sh | |
parent | de04a97b613356f19bfbe67856cda64774865832 (diff) | |
download | mariadb-git-1040f1ac8ec95fcd2f42bc3b4d74d5ee01584e8f.tar.gz |
Fixes for FULLTEXT and TIME type
Docs/manual.texi:
Update of Linux notes and mysql_install_db
include/my_tree.h:
new tree function
myisam/ft_parser.c:
Fix free() bug
myisam/ft_search.c:
Fix free() bug
myisam/ft_update.c:
Fix free() bug
scripts/safe_mysqld.sh:
Check if we run as root
sql-bench/Results-linux/ATIS-mysql-Linux_2.2.13_SMP_alpha:
***MISSING WEAVE***
sql-bench/Results-linux/ATIS-mysql_fast-Linux_2.2.13_SMP_alpha:
***MISSING WEAVE***
sql-bench/Results-linux/RUN-mysql-Linux_2.2.13_SMP_alpha:
***MISSING WEAVE***
sql-bench/Results-linux/RUN-mysql_fast-Linux_2.2.13_SMP_alpha:
***MISSING WEAVE***
sql-bench/Results-linux/alter-table-mysql-Linux_2.2.13_SMP_alpha:
***MISSING WEAVE***
sql-bench/Results-linux/alter-table-mysql_fast-Linux_2.2.13_SMP_alpha:
***MISSING WEAVE***
sql-bench/Results-linux/big-tables-mysql-Linux_2.2.13_SMP_alpha:
***MISSING WEAVE***
sql-bench/Results-linux/big-tables-mysql_fast-Linux_2.2.13_SMP_alpha:
***MISSING WEAVE***
sql-bench/Results-linux/connect-mysql-Linux_2.2.13_SMP_alpha:
***MISSING WEAVE***
sql-bench/Results-linux/connect-mysql_fast-Linux_2.2.13_SMP_alpha:
***MISSING WEAVE***
sql-bench/Results-linux/create-mysql-Linux_2.2.13_SMP_alpha:
***MISSING WEAVE***
sql-bench/Results-linux/create-mysql_fast-Linux_2.2.13_SMP_alpha:
***MISSING WEAVE***
sql-bench/Results-linux/insert-mysql-Linux_2.2.13_SMP_alpha:
***MISSING WEAVE***
sql-bench/Results-linux/insert-mysql_fast-Linux_2.2.13_SMP_alpha:
***MISSING WEAVE***
sql-bench/Results-linux/select-mysql-Linux_2.2.13_SMP_alpha:
***MISSING WEAVE***
sql-bench/Results-linux/select-mysql_fast-Linux_2.2.13_SMP_alpha:
***MISSING WEAVE***
sql-bench/Results-linux/wisconsin-mysql-Linux_2.2.13_SMP_alpha:
***MISSING WEAVE***
sql-bench/Results-linux/wisconsin-mysql_fast-Linux_2.2.13_SMP_alpha:
***MISSING WEAVE***
sql-bench/server-cfg.sh:
Added use of OPTIMIZE TABLE
sql-bench/test-ATIS.sh:
Added use of OPTIMIZE TABLE
sql-bench/test-insert.sh:
Added use of OPTIMIZE TABLE
sql-bench/test-select.sh:
Added use of OPTIMIZE TABLE
sql-bench/test-wisconsin.sh:
Added use of OPTIMIZE TABLE
sql/field.cc:
Fix TIME type
sql/item_func.h:
Fixed Free bug
Diffstat (limited to 'sql-bench/test-insert.sh')
-rwxr-xr-x | sql-bench/test-insert.sh | 60 |
1 files changed, 50 insertions, 10 deletions
diff --git a/sql-bench/test-insert.sh b/sql-bench/test-insert.sh index af5569510c7..e1674f3e18d 100755 --- a/sql-bench/test-insert.sh +++ b/sql-bench/test-insert.sh @@ -206,9 +206,17 @@ $end_time=new Benchmark; print "Time for insert (" . ($total_rows) . "): " . timestr(timediff($end_time, $loop_time),"all") . "\n\n"; +if ($opt_lock_tables) +{ + $sth = $dbh->do("UNLOCK TABLES") || die $DBI::errstr; +} if ($opt_fast && defined($server->{vacuum})) { - $server->vacuum(1,\$dbh); + $server->vacuum(1,\$dbh,"bench1"); +} +if ($opt_lock_tables) +{ + $sth = $dbh->do("LOCK TABLES bench1 WRITE") || die $DBI::errstr; } #### @@ -235,10 +243,10 @@ $end_time=new Benchmark; print "Time for insert_duplicates (" . ($total_rows) . "): " . timestr(timediff($end_time, $loop_time),"all") . "\n\n"; -if ($opt_fast && defined($server->{vacuum})) -{ - $server->vacuum(1,\$dbh); -} +#if ($opt_fast && defined($server->{vacuum})) +#{ +# $server->vacuum(1,\$dbh); +#} #### #### Do some selects on the table @@ -605,9 +613,17 @@ if ($limits->{'functions'}) print "Time for update_of_key ($range_loop_count): " . timestr(timediff($end_time, $loop_time),"all") . "\n"; + if ($opt_lock_tables) + { + do_query($dbh,"UNLOCK TABLES"); + } if ($opt_fast && defined($server->{vacuum})) { - $server->vacuum(1,\$dbh); + $server->vacuum(1,\$dbh,"bench1"); + } + if ($opt_lock_tables) + { + $sth = $dbh->do("LOCK TABLES bench1 WRITE") || die $DBI::errstr; } if ($server->small_rollback_segment()) @@ -735,7 +751,15 @@ else if ($opt_fast && defined($server->{vacuum})) { - $server->vacuum(1,\$dbh); + if ($opt_lock_tables) + { + do_query($dbh,"UNLOCK TABLES"); + } + $server->vacuum(1,\$dbh,"bench1"); + if ($opt_lock_tables) + { + $sth = $dbh->do("LOCK TABLES bench1 WRITE") || die $DBI::errstr; + } } # @@ -902,7 +926,7 @@ if (!$opt_skip_delete) if ($opt_lock_tables) { - $sth = $dbh->do("UNLOCK TABLES ") || die $DBI::errstr; + $sth = $dbh->do("UNLOCK TABLES") || die $DBI::errstr; } $sth = $dbh->do("drop table bench1") or die $DBI::errstr; } @@ -1029,7 +1053,15 @@ if ($server->small_rollback_segment()) } if ($opt_fast && defined($server->{vacuum})) { - $server->vacuum(1,\$dbh); + if ($opt_lock_tables) + { + do_query($dbh,"UNLOCK TABLES"); + } + $server->vacuum(1,\$dbh,"bench1"); + if ($opt_lock_tables) + { + $sth = $dbh->do("LOCK TABLES bench1 WRITE") || die $DBI::errstr; + } } # @@ -1054,7 +1086,15 @@ if ($server->small_rollback_segment()) } if ($opt_fast && defined($server->{vacuum})) { - $server->vacuum(1,\$dbh); + if ($opt_lock_tables) + { + do_query($dbh,"UNLOCK TABLES"); + } + $server->vacuum(1,\$dbh,"bench1"); + if ($opt_lock_tables) + { + $sth = $dbh->do("LOCK TABLES bench1 WRITE") || die $DBI::errstr; + } } if ($server->small_rollback_segment()) |