diff options
| author | unknown <sanja@montyprogram.com> | 2013-11-11 23:40:53 +0200 |
|---|---|---|
| committer | unknown <sanja@montyprogram.com> | 2013-11-11 23:40:53 +0200 |
| commit | 55de9b0468c65b7277b7ca6978f4e01c01af1206 (patch) | |
| tree | a98623574e326aea7b4b16d768947ac24dc80962 /storage | |
| parent | 383de0fd1f7b855276f5bec37f38de6dbf70e938 (diff) | |
| parent | 3a75900b91ffb4d49396d8f83e0b55b392e83a2a (diff) | |
| download | mariadb-git-55de9b0468c65b7277b7ca6978f4e01c01af1206.tar.gz | |
merge 10-base->10.0
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/myisam/mysql-test/mtr2/overlay.inc | 2 | ||||
| -rw-r--r-- | storage/myisam/mysql-test/mtr2/single.rdiff | 12 | ||||
| -rw-r--r-- | storage/xtradb/handler/ha_innodb.cc | 2 |
3 files changed, 15 insertions, 1 deletions
diff --git a/storage/myisam/mysql-test/mtr2/overlay.inc b/storage/myisam/mysql-test/mtr2/overlay.inc new file mode 100644 index 00000000000..4113a306496 --- /dev/null +++ b/storage/myisam/mysql-test/mtr2/overlay.inc @@ -0,0 +1,2 @@ +select 3; + diff --git a/storage/myisam/mysql-test/mtr2/single.rdiff b/storage/myisam/mysql-test/mtr2/single.rdiff new file mode 100644 index 00000000000..fd590d53d4a --- /dev/null +++ b/storage/myisam/mysql-test/mtr2/single.rdiff @@ -0,0 +1,12 @@ +--- suite/mtr2/single.result 2013-11-10 03:58:37.000000000 +0400 ++++ suite/mtr2/single.reject 2013-11-10 03:59:08.000000000 +0400 +@@ -1,6 +1,6 @@ + select 1; + 1 + 1 +-select 2; +-2 +-2 ++select 3; ++3 ++3 diff --git a/storage/xtradb/handler/ha_innodb.cc b/storage/xtradb/handler/ha_innodb.cc index f458b564b19..f4dedea8a2d 100644 --- a/storage/xtradb/handler/ha_innodb.cc +++ b/storage/xtradb/handler/ha_innodb.cc @@ -12794,7 +12794,7 @@ innodb_buffer_pool_evict_update( mutex_enter(&block->mutex); buf_LRU_free_block(&block->page, - FALSE, FALSE); + FALSE, TRUE); mutex_exit(&block->mutex); block = prev_block; } |