diff options
author | unknown <mikef@nslinux.bedford.progress.com> | 2001-05-29 09:29:08 -0400 |
---|---|---|
committer | unknown <mikef@nslinux.bedford.progress.com> | 2001-05-29 09:29:08 -0400 |
commit | 9d52381348a5ff15e856d3efc2004bbe36bb39bd (patch) | |
tree | 4f346bd1140daed312c2399909b0061ca3c6155d /sql/handler.cc | |
parent | f2c0436616634fc55613114a65e38eec1bfcc010 (diff) | |
download | mariadb-git-9d52381348a5ff15e856d3efc2004bbe36bb39bd.tar.gz |
Pushing all the Gemini changes above the table handler.
BUILD/FINISH.sh:
Add Gemini to configure
Docs/manual.texi:
Added Gemini content to the manual.
acinclude.m4:
Add Gemini to configure
configure.in:
Add Gemini to configure
include/my_base.h:
transaction isolation level READ UNCOMMITTED does not allow updates
include/mysqld_error.h:
Added new messages for Lock related failures
sql/field.cc:
Gemini BLOB support -
sql/field.h:
Gemini BLOB Support
sql/ha_gemini.cc:
Gemini Table handler
sql/ha_gemini.h:
Gemini Table handler
sql/handler.cc:
Added new messages for Lock related failures
Provide the ability to turn off recovery for operations like
REPAIR TABLE ans ALTER TABLE
sql/handler.h:
Add a bit to have full text indexes as an option
and define the prototype to optionally turn on and off logging
sql/lock.cc:
Added new messages for Lock related failures
sql/share/czech/errmsg.txt:
Added new messages for Lock related failures
sql/share/danish/errmsg.txt:
Added new messages for Lock related failures
sql/share/dutch/errmsg.txt:
Added new messages for Lock related failures
sql/share/english/errmsg.txt:
Added new messages for Lock related failures
sql/share/estonian/errmsg.txt:
Added new messages for Lock related failures
sql/share/french/errmsg.txt:
Added new messages for Lock related failures
sql/share/german/errmsg.txt:
Added new messages for Lock related failures
sql/share/greek/errmsg.txt:
Added new messages for Lock related failures
sql/share/hungarian/errmsg.txt:
Added new messages for Lock related failures
sql/share/italian/errmsg.txt:
Added new messages for Lock related failures
sql/share/japanese/errmsg.txt:
Added new messages for Lock related failures
sql/share/korean/errmsg.txt:
Added new messages for Lock related failures
sql/share/norwegian-ny/errmsg.txt:
Added new messages for Lock related failures
sql/share/norwegian/errmsg.txt:
Added new messages for Lock related failures
sql/share/polish/errmsg.txt:
Added new messages for Lock related failures
sql/share/portuguese/errmsg.txt:
Added new messages for Lock related failures
sql/share/romanian/errmsg.txt:
Added new messages for Lock related failures
sql/share/russian/errmsg.txt:
Added new messages for Lock related failures
sql/share/slovak/errmsg.txt:
Added new messages for Lock related failures
sql/share/spanish/errmsg.txt:
Added new messages for Lock related failures
sql/share/swedish/errmsg.txt:
Added new messages for Lock related failures
sql/sql_base.cc:
Avoidlock table overflow issues when doing an alter table on Windows.
This is Gemini specific.
sql/sql_table.cc:
Add a bit to have full text indexes as an option
and define the prototype to optionally turn on and off logging
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'sql/handler.cc')
-rw-r--r-- | sql/handler.cc | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index 212fcea11ae..7720e9ca671 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -694,6 +694,15 @@ void handler::print_error(int error, myf errflag) case HA_ERR_RECORD_FILE_FULL: textno=ER_RECORD_FILE_FULL; break; + case HA_ERR_LOCK_WAIT_TIMEOUT: + textno=ER_LOCK_WAIT_TIMEOUT; + break; + case HA_ERR_LOCK_TABLE_FULL: + textno=ER_LOCK_TABLE_FULL; + break; + case HA_ERR_READ_ONLY_TRANSACTION: + textno=ER_READ_ONLY_TRANSACTION; + break; default: { my_error(ER_GET_ERRNO,errflag,error); @@ -757,6 +766,25 @@ int ha_commit_rename(THD *thd) return error; } +/* Tell the handler to turn on or off logging to the handler's + recovery log +*/ +int ha_recovery_logging(THD *thd, bool on) +{ + int error=0; + + DBUG_ENTER("ha_recovery_logging"); +#ifdef USING_TRANSACTIONS + if (opt_using_transactions) + { +#ifdef HAVE_GEMINI_DB + error = gemini_recovery_logging(thd, on); + } +#endif +#endif + DBUG_RETURN(error); +} + int handler::index_next_same(byte *buf, const byte *key, uint keylen) { int error; |