All statements are now run in a sub transaction

Give warning if we are using non transactional tables and do ROLLBACK
Porting of crash-me and benchmarks to FrontBase


Docs/manual.texi:
  Updates for 3.23.29
include/mysqld_error.h:
  New error messages
sql-bench/Data/ATIS/fconnection.txt:
  Name change because 'connection' was a reserved word in FrontBase
sql-bench/bench-init.pl.sh:
  Port to FrontBase
sql-bench/crash-me.sh:
  Port to FrontBase
sql-bench/server-cfg.sh:
  Port to FrontBase
sql-bench/test-ATIS.sh:
  Port to FrontBase
sql-bench/test-alter-table.sh:
  Port to FrontBase
sql-bench/test-big-tables.sh:
  Port to FrontBase
sql-bench/test-connect.sh:
  Port to FrontBase
sql-bench/test-create.sh:
  Port to FrontBase
sql-bench/test-insert.sh:
  Port to FrontBase
sql-bench/test-select.sh:
  Port to FrontBase
sql-bench/test-wisconsin.sh:
  Port to FrontBase
sql/ha_berkeley.cc:
  All statements are now run in a sub transaction
sql/ha_berkeley.h:
  All statements are now run in a sub transaction
sql/handler.cc:
  All statements are now run in a sub transaction
sql/handler.h:
  All statements are now run in a sub transaction
sql/mysql_priv.h:
  Moved QUERY_NO.. flags to unique numbers
sql/mysqld.cc:
  All statements are now run in a sub transaction
sql/net_pkg.cc:
  Added send_warning
sql/share/czech/errmsg.sys:
  New error messages
sql/share/czech/errmsg.txt:
  New error messages
sql/share/danish/errmsg.sys:
  New error messages
sql/share/danish/errmsg.txt:
  New error messages
sql/share/dutch/errmsg.sys:
  New error messages
sql/share/dutch/errmsg.txt:
  New error messages
sql/share/english/errmsg.sys:
  New error messages
sql/share/english/errmsg.txt:
  New error messages
sql/share/estonian/errmsg.sys:
  New error messages
sql/share/estonian/errmsg.txt:
  New error messages
sql/share/french/errmsg.sys:
  New error messages
sql/share/french/errmsg.txt:
  New error messages
sql/share/german/errmsg.sys:
  New error messages
sql/share/german/errmsg.txt:
  New error messages
sql/share/greek/errmsg.sys:
  New error messages
sql/share/greek/errmsg.txt:
  New error messages
sql/share/hungarian/errmsg.sys:
  New error messages
sql/share/hungarian/errmsg.txt:
  New error messages
sql/share/italian/errmsg.sys:
  New error messages
sql/share/italian/errmsg.txt:
  New error messages
sql/share/japanese/errmsg.sys:
  New error messages
sql/share/japanese/errmsg.txt:
  New error messages
sql/share/korean/errmsg.sys:
  New error messages
sql/share/korean/errmsg.txt:
  New error messages
sql/share/norwegian-ny/errmsg.txt:
  New error messages
sql/share/norwegian/errmsg.txt:
  New error messages
sql/share/polish/errmsg.sys:
  New error messages
sql/share/polish/errmsg.txt:
  New error messages
sql/share/portuguese/errmsg.sys:
  New error messages
sql/share/portuguese/errmsg.txt:
  New error messages
sql/share/romanian/errmsg.txt:
  New error messages
sql/share/russian/errmsg.sys:
  New error messages
sql/share/russian/errmsg.txt:
  New error messages
sql/share/slovak/errmsg.sys:
  New error messages
sql/share/slovak/errmsg.txt:
  New error messages
sql/share/spanish/errmsg.sys:
  New error messages
sql/share/spanish/errmsg.txt:
  New error messages
sql/share/swedish/errmsg.OLD:
  New error messages
sql/share/swedish/errmsg.sys:
  New error messages
sql/share/swedish/errmsg.txt:
  New error messages
sql/slave.cc:
  All statements are now run in a sub transaction
sql/sql_class.cc:
  All statements are now run in a sub transaction
sql/sql_class.h:
  All statements are now run in a sub transaction
sql/sql_delete.cc:
  Remember if we are using a non transactional table
sql/sql_insert.cc:
  Remember if we are using a non transactional table
sql/sql_load.cc:
  Remember if we are using a non transactional table
sql/sql_parse.cc:
  All statements are now run in a sub transaction
sql/sql_select.cc:
  Remember if we are using a non transactional table
sql/sql_table.cc:
  All statements are now run in a sub transaction
sql/sql_update.cc:
  All statements are now run in a sub transaction
sql/sql_yacc.yy:
  All statements are now run in a sub transaction

1 files changed, 9 insertions, 4 deletions

diff --git a/sql-bench/test-select.sh b/sql-bench/test-select.sh
index ef76c027380..e75ee26fff8 100755
--- a/sql-bench/test-select.sh
+++ b/sql-bench/test-select.sh
@@ -61,7 +61,7 @@ $start_time=new Benchmark;
 goto select_test if ($opt_skip_create);
 
 print "Creating table\n";
-$dbh->do("drop table bench1");
+$dbh->do("drop table bench1" . $server->{'drop_attr'});
 
 do_many($dbh,$server->create("bench1",
 			     ["region char(1) NOT NULL",
@@ -213,7 +213,7 @@ print " for select_range ($count:$rows): " .
 # Testing MIN() and MAX() on keys
 #
 
-if ($limits->{'group_functions'})
+if ($limits->{'group_functions'} && $limits->{'order_by_unused'})
 {
   $loop_time=new Benchmark;
   $count=0;
@@ -230,6 +230,7 @@ if ($limits->{'group_functions'})
       fetch_all_rows($dbh,"select min(region),max(region) from bench1");
     }
     fetch_all_rows($dbh,"select min(rev_idn) from bench1 where region='$region'");
+
     fetch_all_rows($dbh,"select max(grp) from bench1 where region='$region'");
     fetch_all_rows($dbh,"select max(idn) from bench1 where region='$region' and grp=$grp");
     if ($limits->{'group_func_sql_min_str'})
@@ -265,6 +266,10 @@ if ($limits->{'group_functions'})
   print " for count_on_key ($count): " .
     timestr(timediff($end_time, $loop_time),"all") . "\n\n";
   
+}
+
+if ($limits->{'group_functions'})
+{
   $loop_time=new Benchmark;
   $rows=0;
   for ($i=0 ; $i < $opt_medium_loop_count ; $i++)
@@ -276,7 +281,7 @@ if ($limits->{'group_functions'})
     timestr(timediff($end_time, $loop_time),"all") . "\n";
 }
 
-if ($limits->{'group_functions'})
+if ($limits->{'group_distinct_functions'})
 {
   print "Testing count(distinct) on the table\n";
   $loop_time=new Benchmark;
@@ -362,7 +367,7 @@ if ($opt_lock_tables)
 }
 if (!$opt_skip_delete)
 {
-  do_query($dbh,"drop table bench1");
+  do_query($dbh,"drop table bench1" . $server->{'drop_attr'});
 }
 
 if ($opt_fast && defined($server->{vacuum}))