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, 5 insertions, 2 deletions

diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
index 25ca7d76e03..b1ae918a791 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -222,7 +222,7 @@ int mysql_insert(THD *thd,TABLE_LIST *table_list, List<Item> &fields,
 	break;
       }
     }
-    if (lock_type == TL_WRITE_DELAYED)
+    if (lock_type == TL_WRITE_DELAYED && ! table->file->has_transactions())
     {
       error=write_delayed(thd,table,duplic,query, thd->query_length, log_on);
       query=0;
@@ -262,6 +262,8 @@ int mysql_insert(THD *thd,TABLE_LIST *table_list, List<Item> &fields,
 	Query_log_event qinfo(thd, thd->query);
 	mysql_bin_log.write(&qinfo);
       }
+      if (!table->file->has_transactions())
+	thd->options|=OPTION_STATUS_NO_TRANS_UPDATE;
     }
     error=ha_autocommit_or_rollback(thd,error);
     if (thd->lock)
@@ -282,7 +284,8 @@ int mysql_insert(THD *thd,TABLE_LIST *table_list, List<Item> &fields,
   if (values_list.elements == 1 && (!(thd->options & OPTION_WARNINGS) ||
 				    !thd->cuted_fields))
     send_ok(&thd->net,info.copied+info.deleted,id);
-  else {
+  else
+  {
     char buff[160];
     if (duplic == DUP_IGNORE)
       sprintf(buff,ER(ER_INSERT_INFO),info.records,info.records-info.copied,