New startup options and some cleanups

BitKeeper/etc/ignore:
  Added =6 to the ignore list
include/mysqld_error.h:
  Error message for no-mixing of table types..
sql/mysql_priv.h:
  New option
sql/mysqld.cc:
  New option
sql/share/english/errmsg.txt:
  Error message for no-mixing of table types..
sql/sql_base.cc:
  Checking of the mixing of table types
sql/sql_parse.cc:
  some fixes

1 files changed, 12 insertions, 0 deletions

diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index 2a9043cc0d7..0198f0ce176 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -1368,6 +1368,18 @@ int open_tables(THD *thd,TABLE_LIST *start)
       tables->table->reginfo.lock_type=tables->lock_type;
     tables->table->grant= tables->grant;
   }
+  if (opt_no_mix_types && start)
+  {
+    bool checking; TABLE_LIST *tl;
+    for (tl=start, checking = tl->table->file->has_transactions(), tl=tl->next; tl ; tl=tl->next)
+    { 
+      if (((tl->table->file->has_transactions()) ^ checking))
+      {
+	send_error(&thd->net,ER_MIXING_NOT_ALLOWED);
+	DBUG_RETURN(-1);
+      }
+    }
+  }
   thd->proc_info=0;
   DBUG_RETURN(result);
 }