1
0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00

Fixes for bugs in the usage of IO_CACHE

Docs/manual.texi:
  Fixed the TRUNCATE syntax + Changelog
include/my_sys.h:
  Added my_b_vprintf
mysys/mf_iocache2.c:
  Added my_b_vprintf
mysys/my_vsnprintf.c:
  Fixed fatal (new) bug
mysys/thr_lock.c:
  Cleanup
readline/bind.c:
  cleanup
scripts/Makefile.am:
  Added mysqldumpslow
sql-bench/crash-me.sh:
  Fixed TRUNCATE
sql/log.cc:
  bug fix
sql/log_event.cc:
  Removed compiler warnings
sql/log_event.h:
  Fixed non portable header in binary dump
sql/mf_iocache.cc:
  cleanup
sql/mysqld.cc:
  Fixed loop problem on NT
sql/slave.cc:
  cleanup
sql/sql_class.cc:
  Fixed typos
sql/sql_parse.cc:
  cleanup
sql/sql_select.cc:
  bugfix
sql/sql_table.cc:
  cleanup
sql/sql_yacc.yy:
  Changed ALTER TABLE ... ORDER BY to get fewer warnings
sql/unireg.cc:
  cleanup
sql/unireg.h:
  Added missing define
This commit is contained in:
unknown
2000-11-17 02:36:46 +02:00
parent 24137ef261
commit 8f906f7790
21 changed files with 104 additions and 84 deletions

View File

@@ -78,7 +78,7 @@ static inline bool end_active_trans(THD *thd)
{
if (ha_commit(thd))
return 1;
thd->options&= ~OPTION_BEGIN;
thd->options&= ~(ulong) (OPTION_BEGIN);
thd->server_status&= ~SERVER_STATUS_IN_TRANS;
}
return 0;
@@ -1562,7 +1562,7 @@ mysql_execute_command(void)
if (!org_options & OPTION_AUTO_COMMIT)
{
/* We changed to auto_commit mode */
thd->options&= ~OPTION_BEGIN;
thd->options&= ~(ulong) (OPTION_BEGIN);
thd->server_status|= SERVER_STATUS_AUTOCOMMIT;
if (ha_commit(thd))
{
@@ -1747,7 +1747,7 @@ mysql_execute_command(void)
even if there is a problem with the OPTION_AUTO_COMMIT flag
(Which of course should never happen...)
*/
thd->options&= ~OPTION_BEGIN;
thd->options&= ~(ulong) (OPTION_BEGIN);
thd->server_status&= ~SERVER_STATUS_IN_TRANS;
if (!ha_commit(thd))
send_ok(&thd->net);
@@ -1755,7 +1755,7 @@ mysql_execute_command(void)
res= -1;
break;
case SQLCOM_ROLLBACK:
thd->options&= ~OPTION_BEGIN;
thd->options&= ~(ulong) (OPTION_BEGIN);
thd->server_status&= ~SERVER_STATUS_IN_TRANS;
if (!ha_rollback(thd))
send_ok(&thd->net);