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-wisconsin.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-wisconsin.sh')
| -rwxr-xr-x | sql-bench/test-wisconsin.sh | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/sql-bench/test-wisconsin.sh b/sql-bench/test-wisconsin.sh index 00b0e933c4d..f54e5ef5a75 100755 --- a/sql-bench/test-wisconsin.sh +++ b/sql-bench/test-wisconsin.sh @@ -65,10 +65,10 @@ if (!$opt_skip_create) print "Time for create_table ($#tables): " . 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); + } #### @@ -124,6 +124,10 @@ else } close(DATA); } +if ($opt_lock_tables) +{ + do_query($dbh,"UNLOCK TABLES"); +} $end_time=new Benchmark; print "Time to insert ($row_count): " . timestr(timediff($end_time, $loop_time),"all") . "\n"; @@ -138,7 +142,14 @@ if ($server->small_rollback_segment()) if ($opt_fast && defined($server->{vacuum})) { - $server->vacuum(0,\$dbh); + $server->vacuum(0,\$dbh,@table_names); +} + +if ($opt_lock_tables) +{ + @tmp=@table_names; push(@tmp,@extra_names); + $sth = $dbh->do("LOCK TABLES " . join(" WRITE,", @tmp) . " WRITE") || + die $DBI::errstr; } $loop_time= $end_time; |