database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Applying InnoDB Plugin 1.0.6 snapshot, part 5.

Browse Source 
applied revisions: r6161, r6162, r6163

Detailed revision comments:

r6161 | vasil | 2009-11-11 15:36:16 +0200 (Wed, 11 Nov 2009) | 4 lines
branches/zip:

Add changelog entry for r6160.

r6162 | vasil | 2009-11-11 16:00:12 +0200 (Wed, 11 Nov 2009) | 4 lines
branches/zip:

Add ChangeLog for r6157.

r6163 | calvin | 2009-11-11 17:53:20 +0200 (Wed, 11 Nov 2009) | 8 lines
branches/zip: Exclude thd_binlog_filter_ok() when building
with older version of MySQL.

thd_binlog_filter_ok() is introduced in MySQL 5.1.41. But the
plugin can be built with MySQL prior to 5.1.41.

Approved by Heikki (on IM).
This commit is contained in:
Satya B
2009-11-30 17:41:36 +05:30
parent 0278748ed8
commit f77d7aaebb
3 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
storage/innodb_plugin/ChangeLog
View File

@@ -1,3 +1,16 @@
2009-11-11 The InnoDB Team
* handler/ha_innodb.cc, mysql-test/innodb_bug47167.result,
mysql-test/innodb_bug47167.test, mysql-test/innodb_file_format.result:
Fix Bug#47167 "set global innodb_file_format_check" cannot set value
by User-Defined Variable
2009-11-11 The InnoDB Team
* include/os0file.h, os/os0file.c:
Fix Bug#3139 Mysql crashes: 'windows error 995' after several selects
on a large DB
2009-11-04 The InnoDB Team 2009-11-04 The InnoDB Team
* handler/ha_innodb.cc: * handler/ha_innodb.cc:

5
storage/innodb_plugin/handler/ha_innodb.cc
View File

@@ -7912,7 +7912,10 @@ ha_innobase::external_lock(
ulong const tx_isolation = thd_tx_isolation(ha_thd()); ulong const tx_isolation = thd_tx_isolation(ha_thd());
if (tx_isolation <= ISO_READ_COMMITTED if (tx_isolation <= ISO_READ_COMMITTED
&& binlog_format == BINLOG_FORMAT_STMT && binlog_format == BINLOG_FORMAT_STMT
&& thd_binlog_filter_ok(thd)) #if MYSQL_VERSION_ID > 50140
&& thd_binlog_filter_ok(thd)
#endif /* MYSQL_VERSION_ID > 50140 */
)
{ {
char buf[256]; char buf[256];
my_snprintf(buf, sizeof(buf), my_snprintf(buf, sizeof(buf),

2
storage/innodb_plugin/handler/ha_innodb.h
View File

@@ -258,12 +258,14 @@ int thd_binlog_format(const MYSQL_THD thd);
*/ */
void thd_mark_transaction_to_rollback(MYSQL_THD thd, bool all); void thd_mark_transaction_to_rollback(MYSQL_THD thd, bool all);
#if MYSQL_VERSION_ID > 50140
/** /**
Check if binary logging is filtered for thread's current db. Check if binary logging is filtered for thread's current db.
@param thd Thread handle @param thd Thread handle
@retval 1 the query is not filtered, 0 otherwise. @retval 1 the query is not filtered, 0 otherwise.
*/ */
bool thd_binlog_filter_ok(const MYSQL_THD thd); bool thd_binlog_filter_ok(const MYSQL_THD thd);
#endif /* MYSQL_VERSION_ID > 50140 */
} }
typedef struct trx_struct trx_t; typedef struct trx_struct trx_t;