- Committer: Stewart Smith
- Date: 2010-10-12 05:42:16 UTC
- mto: (1843.1.3 build) (2021.1.2 build) (1953.1.1 build) (1819.7.43 update-innobase)
- Revision ID: stewart@flamingspork.com-20101012054216-ixlaxebmifmxsug1
[patch 109/129] Merge patch for revision 1921 from InnoDB SVN:
revno: 1921
revision-id: svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6160
parent: svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6159
committer: vasil
timestamp: Wed 2009-11-11 13:33:49 +0000
message:
branches/zip: Merge r6152:6159 from branches/5.1:
(r6158 was skipped as an equivallent change has already been merged from MySQL)
------------------------------------------------------------------------
r6154 | calvin | 2009-11-11 02:51:17 +0200 (Wed, 11 Nov 2009) | 17 lines
Changed paths:
M /branches/5.1/include/os0file.h
M /branches/5.1/os/os0file.c
branches/5.1: fix bug#3139: Mysql crashes: 'windows error 995'
after several selects on a large DB
During stress environment, Windows AIO may fail with error code
ERROR_OPERATION_ABORTED. InnoDB does not handle the error, rather
crashes. The cause of the error is unknown, but likely due to
faulty hardware or driver.
This patch introduces a new error code OS_FILE_OPERATION_ABORTED,
which maps to Windows ERROR_OPERATION_ABORTED (995). When the error
is detected during AIO, the InnoDB will issue a synchronous retry
(read/write).
This patch has been extensively tested by MySQL support.
Approved by: Marko
rb://196
------------------------------------------------------------------------
r6158 | vasil | 2009-11-11 14:52:14 +0200 (Wed, 11 Nov 2009) | 37 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/handler/ha_innodb.h
branches/5.1:
Merge a change from MySQL:
(this has been reviewed by Calvin and Marko, and Calvin says Luis has
incorporated Marko's suggestions)
------------------------------------------------------------
revno: 3092.5.1
committer: Luis Soares <luis.soares@sun.com>
branch nick: mysql-5.1-bugteam
timestamp: Thu 2009-09-24 15:52:52 +0100
message:
BUG#42829: binlogging enabled for all schemas regardless of
binlog-db-db / binlog-ignore-db
InnoDB will return an error if statement based replication is used
along with transaction isolation level READ-COMMITTED (or weaker),
even if the statement in question is filtered out according to the
binlog-do-db rules set. In this case, an error should not be printed.
This patch addresses this issue by extending the existing check in
external_lock to take into account the filter rules before deciding to
print an error. Furthermore, it also changes decide_logging_format to
take into consideration whether the statement is filtered out from
binlog before decision is made.
added:
mysql-test/suite/binlog/r/binlog_stm_do_db.result
mysql-test/suite/binlog/t/binlog_stm_do_db-master.opt
mysql-test/suite/binlog/t/binlog_stm_do_db.test
modified:
sql/sql_base.cc
sql/sql_class.cc
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/ha_innodb.h
storage/innodb_plugin/handler/ha_innodb.cc
storage/innodb_plugin/handler/ha_innodb.h
------------------------------------------------------------------------
modified:
include/os0file.h 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Finclude%2Fos0file.h
os/os0file.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fos%2Fos0file.c
diff:
=== modified file 'include/os0file.h'
revno: 1921
revision-id: svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6160
parent: svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6159
committer: vasil
timestamp: Wed 2009-11-11 13:33:49 +0000
message:
branches/zip: Merge r6152:6159 from branches/5.1:
(r6158 was skipped as an equivallent change has already been merged from MySQL)
------------------------------------------------------------------------
r6154 | calvin | 2009-11-11 02:51:17 +0200 (Wed, 11 Nov 2009) | 17 lines
Changed paths:
M /branches/5.1/include/os0file.h
M /branches/5.1/os/os0file.c
branches/5.1: fix bug#3139: Mysql crashes: 'windows error 995'
after several selects on a large DB
During stress environment, Windows AIO may fail with error code
ERROR_OPERATION_ABORTED. InnoDB does not handle the error, rather
crashes. The cause of the error is unknown, but likely due to
faulty hardware or driver.
This patch introduces a new error code OS_FILE_OPERATION_ABORTED,
which maps to Windows ERROR_OPERATION_ABORTED (995). When the error
is detected during AIO, the InnoDB will issue a synchronous retry
(read/write).
This patch has been extensively tested by MySQL support.
Approved by: Marko
rb://196
------------------------------------------------------------------------
r6158 | vasil | 2009-11-11 14:52:14 +0200 (Wed, 11 Nov 2009) | 37 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/handler/ha_innodb.h
branches/5.1:
Merge a change from MySQL:
(this has been reviewed by Calvin and Marko, and Calvin says Luis has
incorporated Marko's suggestions)
------------------------------------------------------------
revno: 3092.5.1
committer: Luis Soares <luis.soares@sun.com>
branch nick: mysql-5.1-bugteam
timestamp: Thu 2009-09-24 15:52:52 +0100
message:
BUG#42829: binlogging enabled for all schemas regardless of
binlog-db-db / binlog-ignore-db
InnoDB will return an error if statement based replication is used
along with transaction isolation level READ-COMMITTED (or weaker),
even if the statement in question is filtered out according to the
binlog-do-db rules set. In this case, an error should not be printed.
This patch addresses this issue by extending the existing check in
external_lock to take into account the filter rules before deciding to
print an error. Furthermore, it also changes decide_logging_format to
take into consideration whether the statement is filtered out from
binlog before decision is made.
added:
mysql-test/suite/binlog/r/binlog_stm_do_db.result
mysql-test/suite/binlog/t/binlog_stm_do_db-master.opt
mysql-test/suite/binlog/t/binlog_stm_do_db.test
modified:
sql/sql_base.cc
sql/sql_class.cc
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/ha_innodb.h
storage/innodb_plugin/handler/ha_innodb.cc
storage/innodb_plugin/handler/ha_innodb.h
------------------------------------------------------------------------
modified:
include/os0file.h 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Finclude%2Fos0file.h
os/os0file.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fos%2Fos0file.c
diff:
=== modified file 'include/os0file.h'
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
column.c |
1799.2.3 | 14 years ago | Monty Taylor | Reference root BSD copying file. | 24 KB |
|
|
|
column.h |
1799.2.3 | 14 years ago | Monty Taylor | Reference root BSD copying file. | 3.1 KB |
|
|
|
column_client.h |
1799.2.3 | 14 years ago | Monty Taylor | Reference root BSD copying file. | 2 KB |
|
|
|
column_server.h |
1799.2.3 | 14 years ago | Monty Taylor | Reference root BSD copying file. | 2.7 KB |
|
|
|
command.c |
1799.2.3 | 14 years ago | Monty Taylor | Reference root BSD copying file. | 5.4 KB |
|
|
|
command_client.h |
1799.2.3 | 14 years ago | Monty Taylor | Reference root BSD copying file. | 784 bytes |
|
|
|
command_server.h |
1799.2.3 | 14 years ago | Monty Taylor | Reference root BSD copying file. | 695 bytes |
|
|
|
common.h |
1799.2.3 | 14 years ago | Monty Taylor | Reference root BSD copying file. | 807 bytes |
|
|
|
conn.c |
1799.2.3 | 14 years ago | Monty Taylor | Reference root BSD copying file. | 31.9 KB |
|
|
|
conn.h |
1799.2.3 | 14 years ago | Monty Taylor | Reference root BSD copying file. | 12.5 KB |
|
|
|
conn_client.h |
1799.2.3 | 14 years ago | Monty Taylor | Reference root BSD copying file. | 5.5 KB |
|
|
|
conn_local.h |
1799.2.3 | 14 years ago | Monty Taylor | Reference root BSD copying file. | 2.3 KB |
|
|
|
conn_server.h |
1799.2.3 | 14 years ago | Monty Taylor | Reference root BSD copying file. | 6.3 KB |
|
|
|
conn_uds.c |
1799.2.3 | 14 years ago | Monty Taylor | Reference root BSD copying file. | 1.3 KB |
|
|
|
constants.h |
1799.2.3 | 14 years ago | Monty Taylor | Reference root BSD copying file. | 16.6 KB |
|
|
|
drizzle.c |
1799.2.3 | 14 years ago | Monty Taylor | Reference root BSD copying file. | 15.8 KB |
|
|
|
drizzle.h |
1799.2.3 | 14 years ago | Monty Taylor | Reference root BSD copying file. | 11.7 KB |
|
|
|
drizzle_client.h |
1799.2.3 | 14 years ago | Monty Taylor | Reference root BSD copying file. | 2.9 KB |
|
|
|
drizzle_local.h |
1799.2.3 | 14 years ago | Monty Taylor | Reference root BSD copying file. | 3.2 KB |
|
|
|
drizzle_server.h |
1799.2.3 | 14 years ago | Monty Taylor | Reference root BSD copying file. | 3.5 KB |
|
|
|
field.c |
1799.2.3 | 14 years ago | Monty Taylor | Reference root BSD copying file. | 8.8 KB |
|
|
|
field_client.h |
1799.2.3 | 14 years ago | Monty Taylor | Reference root BSD copying file. | 1.4 KB |
|
|
|
field_server.h |
1799.2.3 | 14 years ago | Monty Taylor | Reference root BSD copying file. | 893 bytes |
|
|
|
handshake.c |
1799.2.3 | 14 years ago | Monty Taylor | Reference root BSD copying file. | 15 KB |
|
|
|
handshake_client.h |
1799.2.3 | 14 years ago | Monty Taylor | Reference root BSD copying file. | 1.4 KB |
|
|
|
handshake_server.h |
1799.2.3 | 14 years ago | Monty Taylor | Reference root BSD copying file. | 1.3 KB |
|
|
|
include.am |
1799.2.3 | 14 years ago | Monty Taylor | Reference root BSD copying file. | 2.6 KB |
|
|
|
pack.c |
1799.2.3 | 14 years ago | Monty Taylor | Reference root BSD copying file. | 5.6 KB |
|
|
|
pack.h |
1799.2.3 | 14 years ago | Monty Taylor | Reference root BSD copying file. | 1.4 KB |
|
|
|
query.c |
1799.2.3 | 14 years ago | Monty Taylor | Reference root BSD copying file. | 9.5 KB |
|
|
|
query.h |
1799.2.3 | 14 years ago | Monty Taylor | Reference root BSD copying file. | 5.8 KB |
|
|
|
result.c |
1799.2.3 | 14 years ago | Monty Taylor | Reference root BSD copying file. | 13.9 KB |
|
|
|
result.h |
1799.2.3 | 14 years ago | Monty Taylor | Reference root BSD copying file. | 2.6 KB |
|
|
|
result_client.h |
1799.2.3 | 14 years ago | Monty Taylor | Reference root BSD copying file. | 1.1 KB |
|
|
|
result_server.h |
1799.2.3 | 14 years ago | Monty Taylor | Reference root BSD copying file. | 2.7 KB |
|
|
|
row.c |
1799.2.3 | 14 years ago | Monty Taylor | Reference root BSD copying file. | 4.9 KB |
|
|
|
row_client.h |
1799.2.3 | 14 years ago | Monty Taylor | Reference root BSD copying file. | 2.4 KB |
|
|
|
row_server.h |
1799.2.3 | 14 years ago | Monty Taylor | Reference root BSD copying file. | 784 bytes |
|
|
|
sha1.c |
1712.1.1 | 14 years ago | Monty Taylor | Merged libdrizzle directly into tree. | 5 KB |
|
|
|
sha1.h |
1712.1.1 | 14 years ago | Monty Taylor | Merged libdrizzle directly into tree. | 758 bytes |
|
|
|
state.c |
1799.2.3 | 14 years ago | Monty Taylor | Reference root BSD copying file. | 1.5 KB |
|
|
|
state.h |
1799.2.3 | 14 years ago | Monty Taylor | Reference root BSD copying file. | 2.6 KB |
|
|
|
structs.h |
1799.2.3 | 14 years ago | Monty Taylor | Reference root BSD copying file. | 4.5 KB |
|
|
|
visibility.h |
1799.2.3 | 14 years ago | Monty Taylor | Reference root BSD copying file. | 1.4 KB |
|
|