diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2001-08-18 15:29:21 +0300 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2001-08-18 15:29:21 +0300 |
| commit | e3a9e7e40e63e8bed554cfbceacf29490df1a14a (patch) | |
| tree | 35de6d990347d36ed98c291f451de3d5c41dc151 /sql/share | |
| parent | 12d4a5efe938688ef935818d22880137c95c2bfc (diff) | |
| download | mariadb-git-e3a9e7e40e63e8bed554cfbceacf29490df1a14a.tar.gz | |
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
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/english/errmsg.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt index 8a9e246c3e2..b2b298d62a8 100644 --- a/sql/share/english/errmsg.txt +++ b/sql/share/english/errmsg.txt @@ -219,3 +219,4 @@ "Wrong usage of %s and %s", "The used SELECT statements have a different number of columns", "Can't execute the query because you have a conflicting read lock", +"Mixing transactional and non-transactional tables disabled by option",
\ No newline at end of file |