From 29bde8a0ce07d5d82a8892b0742200d5fa5ac5a6 Mon Sep 17 00:00:00 2001 From: Jimmy Yang Date: Tue, 13 Jul 2010 02:58:39 -0700 Subject: [PATCH] Fix Bug #55095 innodb_file_format_check: no warning for illegal value rb://397 approved by Sunny Bains --- mysql-test/suite/rpl/t/rpl_sync-slave.opt | 2 +- storage/innobase/handler/ha_innodb.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mysql-test/suite/rpl/t/rpl_sync-slave.opt b/mysql-test/suite/rpl/t/rpl_sync-slave.opt index 972f9ef8af9..9d8c2c80711 100644 --- a/mysql-test/suite/rpl/t/rpl_sync-slave.opt +++ b/mysql-test/suite/rpl/t/rpl_sync-slave.opt @@ -1 +1 @@ ---sync-relay-log-info=1 --relay-log-recovery=1 --innodb_file_format_check='ON' +--sync-relay-log-info=1 --relay-log-recovery=1 --innodb_file_format_check=1 diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index 3bb2fc778cc..3fc9865ffbf 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -10833,7 +10833,7 @@ by the server. Can be set during server startup at command line or configure file, and a read only variable after server startup */ static MYSQL_SYSVAR_BOOL(file_format_check, innobase_file_format_check, - PLUGIN_VAR_OPCMDARG | PLUGIN_VAR_READONLY, + PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_READONLY, "Whether to perform system file format check.", NULL, NULL, TRUE);