From d5964ba20ca4c00a443c185186def44bb90831b3 Mon Sep 17 00:00:00 2001
From: unknown <monty@donna.mysql.com>
Date: Thu, 14 Sep 2000 02:39:07 +0300
Subject: Fixes for MERGE TABLES and HEAP tables

Docs/manual.texi:
  Updated MERGE table stuff + more
extra/perror.c:
  Added missing error messages
include/myisammrg.h:
  Fixes for MERGE TABLE
include/queues.h:
  Fixes for MERGE TABLE
isam/isamlog.c:
  Fixed hard bug
myisam/mi_log.c:
  cleanup
myisam/mi_open.c:
  Fixed file name format in myisam log
myisam/myisamlog.c:
  Bug fixes
myisammrg/mymrgdef.h:
  Fixes for MERGE TABLE
myisammrg/myrg_create.c:
  Fixes for MERGE TABLE
myisammrg/myrg_open.c:
  Fixes for MERGE TABLE
myisammrg/myrg_queue.c:
  Fixes for MERGE TABLE
myisammrg/myrg_rfirst.c:
  Fixes for MERGE TABLE
myisammrg/myrg_rkey.c:
  Fixes for MERGE TABLE
myisammrg/myrg_rlast.c:
  Fixes for MERGE TABLE
myisammrg/myrg_rnext.c:
  Fixes for MERGE TABLE
myisammrg/myrg_rprev.c:
  Fixes for MERGE TABLE
myisammrg/myrg_rrnd.c:
  Fixes for MERGE TABLE
mysql.proj:
  update
mysys/queues.c:
  Fixed bug when using reverse queues
sql-bench/test-insert.sh:
  Separated some things to get better timings
sql/ha_heap.cc:
  Fixed heap table bug
sql/ha_heap.h:
  Fixed heap table bug
sql/ha_myisam.h:
  Fixed wrong max_keys
sql/ha_myisammrg.cc:
  Fixed MERGE TABLES
sql/ha_myisammrg.h:
  Fixed MERGE TABLES
sql/handler.h:
  Fix for MERGE TABLES and HEAP tables
sql/lex.h:
  Fixed MERGE TABLES
sql/mysql_priv.h:
  Cleanup of code
sql/sql_acl.cc:
  Fixed that privilege tables are flushed at start
sql/sql_lex.h:
  Fixed MERGE TABLES
sql/sql_parse.cc:
  Fixed MERGE TABLES
sql/sql_select.cc:
  Fixes for HEAP tables
sql/sql_table.cc:
  Cleanup
sql/sql_yacc.yy:
  Fixed MERGE TABLES
---
 sql-bench/test-insert.sh | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

(limited to 'sql-bench/test-insert.sh')

diff --git a/sql-bench/test-insert.sh b/sql-bench/test-insert.sh
index e1674f3e18d..427a42aea35 100755
--- a/sql-bench/test-insert.sh
+++ b/sql-bench/test-insert.sh
@@ -348,12 +348,12 @@ print " for select_diff_key ($count:$rows): " .
 # Test select that is very popular when using ODBC
 
 check_or_range("id","select_range_prefix");
-check_or_range("id3","select_range");
+check_or_range("id3","select_range_key2");
 
 # Check reading on direct key on id and id3
 
 check_select_key("id","select_key_prefix");
-check_select_key("id3","select_key");
+check_select_key("id3","select_key_key2");
 
 ####
 #### A lot of simple selects on ranges
@@ -403,7 +403,7 @@ check_select_key("id3","select_key");
 
 print "\nTest of compares with simple ranges\n";
 check_select_range("id","select_range_prefix");
-check_select_range("id3","select_range");
+check_select_range("id3","select_range_key2");
 
 ####
 #### Some group queries
@@ -1107,20 +1107,28 @@ if ($server->small_rollback_segment())
 # Delete everything from table
 #
 
-print "Deleting everything from table\n";
+print "Deleting rows from the table\n";
 $loop_time=new Benchmark;
 $count=0;
+
+for ($i=0 ; $i < 128 ; $i++)
+{
+  $dbh->do("delete from bench1 where field1 = $i") or die $DBI::errstr;
+}
+
+$end_time=new Benchmark;
+print "Time for delete_big_many_keys ($count): " .
+timestr(timediff($end_time, $loop_time),"all") . "\n\n";
+
+print "Deleting everything from table\n";
+$count=1;
 if ($opt_fast)
 {
-  $dbh->do("delete from bench1 where field1 = 0") or die $DBI::errstr;
   $dbh->do("delete from bench1") or die $DBI::errstr;
-  $count+=2;
 }
 else
 {
-  $dbh->do("delete from bench1 where field1 = 0") or die $DBI::errstr;
   $dbh->do("delete from bench1 where field1 > 0") or die $DBI::errstr;
-  $count+=2;
 }
 
 if ($opt_lock_tables)
@@ -1129,7 +1137,7 @@ if ($opt_lock_tables)
 }
 
 $end_time=new Benchmark;
-print "Time for delete_big_many_keys ($count): " .
+print "Time for delete_all_many_keys ($count): " .
   timestr(timediff($end_time, $loop_time),"all") . "\n\n";
 
 $sth = $dbh->do("drop table bench1") or die $DBI::errstr;
-- 
cgit v1.2.1