1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

workaround for a bug removed

Browse Source 
mysys/my_mmap.c:
  cleanup
sql/ha_innodb.cc:
  don's start a transaction in prepare().
  restore disabled code for ibbackup
This commit is contained in:
unknown 2005-03-02 15:29:46 +01:00
parent f508a6ca80
commit 6186690913
2 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mysys/my_mmap.c
View File

@ -28,8 +28,7 @@ int my_msync(int fd, void *addr, size_t len, int flags)
return my_sync(fd, MYF(0)); return my_sync(fd, MYF(0));
} }
#else #elif defined(__WIN__)
#ifdef __WIN__
static SECURITY_ATTRIBUTES mmap_security_attributes= static SECURITY_ATTRIBUTES mmap_security_attributes=
{sizeof(SECURITY_ATTRIBUTES), 0, TRUE}; {sizeof(SECURITY_ATTRIBUTES), 0, TRUE};
@ -83,11 +82,7 @@ int my_msync(int fd, void *addr, size_t len, int flags)
return FlushViewOfFile(addr, len) ? 0 : -1; return FlushViewOfFile(addr, len) ? 0 : -1;
} }
#endif #else
#ifndef __WIN__
#warning "no mmap!" #warning "no mmap!"
#endif #endif
#endif

18
sql/ha_innodb.cc
View File

@ -1351,10 +1351,10 @@ innobase_commit_low(
return; return;
} }
/* The following will be enabled later when we put the 4.1 functionality back #ifdef HAVE_REPLICATION
to 5.0. */ THD *thd=current_thd;
#ifdef DISABLE_HAVE_REPLICATION
if (current_thd->slave_thread) { if (thd && thd->slave_thread) {
/* Update the replication position info inside InnoDB */ /* Update the replication position info inside InnoDB */
trx->mysql_master_log_file_name trx->mysql_master_log_file_name
@ -6328,13 +6328,7 @@ innobase_xa_prepare(
/* We were instructed to prepare the whole transaction, or /* We were instructed to prepare the whole transaction, or
this is an SQL statement end and autocommit is on */ this is an SQL statement end and autocommit is on */
/* If there is no active InnoDB transaction, ut_ad(trx->active_trans);
trx_prepare_for_mysql() will (temporarily) start one */
if (trx->active_trans == 0) {
trx->active_trans = 1;
}
error = trx_prepare_for_mysql(trx); error = trx_prepare_for_mysql(trx);
} else { } else {
@ -6344,7 +6338,7 @@ innobase_xa_prepare(
if (trx->auto_inc_lock) { if (trx->auto_inc_lock) {
/* If we had reserved the auto-inc lock for some /* If we had reserved the auto-inc lock for some
table in this SQL statement we release it now */ table in this SQL statement we release it now */
row_unlock_table_autoinc_for_mysql(trx); row_unlock_table_autoinc_for_mysql(trx);
} }
/* Store the current undo_no of the transaction so that we /* Store the current undo_no of the transaction so that we