mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-22 08:15:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

Removed duplicated index_init() calls that causes problems with BDB

Browse source 
tables.
Merged maxsql.spec with mysql.spec


mysql-test/r/innobase.result:
  Almost up to date test results
mysql-test/t/innobase.test:
  Added testing of error codes
sql-bench/test-insert.sh:
  Added testing of key-only-read
sql/ha_berkeley.cc:
  Added DBUG_PRINT
sql/sql_select.cc:
  Removed duplicated index_init() calls
support-files/maxsql.spec.sh:
  Merge with mysql.spec.  Take into account that BDB and Innobase is
  in the MySQL source tree
support-files/mysql.spec.sh:
  Removed usage of innobase in standard RPM
This commit is contained in:
unknown 2001-03-07 14:06:39 +02:00
commit 9b8ddd1a6d
7 changed files with 114 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

14
sql-bench/test-insert.sh
View file

@ -487,7 +487,7 @@ check_select_key2("*","id","id2","select_key");
check_select_key2("id,id2","id","id2","select_key_return_key");
check_select_key("*","id3","select_key2");
check_select_key("id3","id3","select_key2_return_key");
check_select_key("id1,id2","id3","select_key2_return_prim");
check_select_key("id,id2","id3","select_key2_return_prim");
####
#### A lot of simple selects on ranges
@ -1443,7 +1443,7 @@ end_benchmark($start_time);
sub check_select_key
{
my ($column,$check)= @_;
my ($sel_columns,$column,$check)= @_;
my ($loop_time,$end_time,$i,$tmp_var,$tmp,$count,$row_count,$estimated);
$estimated=0;
@ -1454,10 +1454,10 @@ sub check_select_key
$count+=2;
$tmpvar^= ((($tmpvar + 63) + $i)*3 % $opt_loop_count);
$tmp=$tmpvar % ($total_rows);
fetch_all_rows($dbh,"select * from bench1 where $column=$tmp")
fetch_all_rows($dbh,"select $sel_columns from bench1 where $column=$tmp")
or die $DBI::errstr;
$tmp+=$total_rows;
defined($row_count=fetch_all_rows($dbh,"select * from bench1 where $column=$tmp")) or die $DBI::errstr;
defined($row_count=fetch_all_rows($dbh,"select $sel_columns from bench1 where $column=$tmp")) or die $DBI::errstr;
die "Found $row_count rows on impossible id: $tmp\n" if ($row_count);
$end_time=new Benchmark;
last if ($estimated=predict_query_time($loop_time,$end_time,\$count,$i,
@ -1475,7 +1475,7 @@ sub check_select_key
sub check_select_key2
{
my ($column,$column2,$check)= @_;
my ($sel_columns,$column,$column2,$check)= @_;
my ($loop_time,$end_time,$i,$tmp_var,$tmp,$count,$row_count,$estimated);
$estimated=0;
@ -1486,10 +1486,10 @@ sub check_select_key2
$count+=2;
$tmpvar^= ((($tmpvar + 63) + $i)*3 % $opt_loop_count);
$tmp=$tmpvar % ($total_rows);
fetch_all_rows($dbh,"select * from bench1 where $column=$tmp and $column2=$tmp")
fetch_all_rows($dbh,"select $sel_columns from bench1 where $column=$tmp and $column2=$tmp")
or die $DBI::errstr;
$tmp+=$total_rows;
defined($row_count=fetch_all_rows($dbh,"select * from bench1 where $column=$tmp and $column2=$tmp")) or die $DBI::errstr;
defined($row_count=fetch_all_rows($dbh,"select $sel_columns from bench1 where $column=$tmp and $column2=$tmp")) or die $DBI::errstr;
die "Found $row_count rows on impossible id: $tmp\n" if ($row_count);
$end_time=new Benchmark;
last if ($estimated=predict_query_time($loop_time,$end_time,\$count,$i,