database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

New startup options and some cleanups

Browse Source 
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
This commit is contained in:
unknown
2001-08-18 15:29:21 +03:00
parent 12d4a5efe9
commit e3a9e7e40e
8 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/sql_base.cc
View File

@ -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);
}