susumu.yata
null+****@clear*****
Thu May 15 13:21:37 JST 2014
susumu.yata 2014-05-15 13:21:37 +0900 (Thu, 15 May 2014) New Revision: 6fe0c7c8e20983e32925f933db25ea65c173184e https://github.com/mroonga/mroonga/commit/6fe0c7c8e20983e32925f933db25ea65c173184e Message: Apply a patch that fixes a test for MariaDB 10.0.11 Redmine: fixes #2552 Redmine: ref #2385 MariaDB 10.0.11 shows an int system variable mroonga_lock_timeout as a signed integer. Note that MySQL and MariaDB 10.0.x (x < 11) show it as an unsigned integer, for example, SHOW GLOBAL VARIABLES LIKE "mroonga_lock_timeout"; shows 4294967295 if mroonga_lock_timeout = -1. The patch is written by Toshihisa Tashiro. Thanks!!! Modified files: mysql-test/mroonga/storage/variable/lock_timeout/r/disable.result mysql-test/mroonga/storage/variable/lock_timeout/r/invalid.result mysql-test/mroonga/storage/variable/lock_timeout/t/disable.test mysql-test/mroonga/storage/variable/lock_timeout/t/invalid.test Modified: mysql-test/mroonga/storage/variable/lock_timeout/r/disable.result (+1 -1) =================================================================== --- mysql-test/mroonga/storage/variable/lock_timeout/r/disable.result 2014-05-15 10:26:04 +0900 (f219db0) +++ mysql-test/mroonga/storage/variable/lock_timeout/r/disable.result 2014-05-15 13:21:37 +0900 (789316d) @@ -1,4 +1,4 @@ SET GLOBAL mroonga_lock_timeout = -1; SHOW GLOBAL VARIABLES LIKE "mroonga_lock_timeout"; Variable_name Value -mroonga_lock_timeout 4294967295 +mroonga_lock_timeout -1 Modified: mysql-test/mroonga/storage/variable/lock_timeout/r/invalid.result (+1 -1) =================================================================== --- mysql-test/mroonga/storage/variable/lock_timeout/r/invalid.result 2014-05-15 10:26:04 +0900 (4216826) +++ mysql-test/mroonga/storage/variable/lock_timeout/r/invalid.result 2014-05-15 13:21:37 +0900 (029b1ab) @@ -3,4 +3,4 @@ Warnings: Warning 1292 Truncated incorrect mroonga_lock_timeout value: '-2' SHOW GLOBAL VARIABLES LIKE "mroonga_lock_timeout"; Variable_name Value -mroonga_lock_timeout 4294967295 +mroonga_lock_timeout -1 Modified: mysql-test/mroonga/storage/variable/lock_timeout/t/disable.test (+1 -1) =================================================================== --- mysql-test/mroonga/storage/variable/lock_timeout/t/disable.test 2014-05-15 10:26:04 +0900 (4334431) +++ mysql-test/mroonga/storage/variable/lock_timeout/t/disable.test 2014-05-15 13:21:37 +0900 (756ff2b) @@ -14,7 +14,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ---source ../../../../include/mroonga/have_version_56_or_later.inc +--source ../../../../include/mroonga/have_version_100_or_later.inc --source ../../../../include/mroonga/have_mroonga.inc SET GLOBAL mroonga_lock_timeout = -1; Modified: mysql-test/mroonga/storage/variable/lock_timeout/t/invalid.test (+1 -0) =================================================================== --- mysql-test/mroonga/storage/variable/lock_timeout/t/invalid.test 2014-05-15 10:26:04 +0900 (26569b6) +++ mysql-test/mroonga/storage/variable/lock_timeout/t/invalid.test 2014-05-15 13:21:37 +0900 (ece3502) @@ -14,6 +14,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +--source ../../../../include/mroonga/have_version_100_or_later.inc --source ../../../../include/mroonga/have_mroonga.inc SET GLOBAL mroonga_lock_timeout = -2; -------------- next part -------------- HTML����������������������������...ダウンロード
