Bug #19498327 : M_I_DB FAILS WHEN BUILDING IN A SOURCE DIRECTORY

  Merge of cset 8786 from trunk

Author: bjornmu

mysql-test/include/m_i_db_startsvr.inc

@@ -9,7 +9,7 @@ rmtree([ "$DDIR" ]);
 EOF
 
 --echo # Execution of mysql_install_db starts............
---exec $MYSQL_INSTALL_DB --no-defaults --datadir=$DDIR --basedir=$BASEDIR --extra-sql-file=$MYSQL_TEST_DIR/t/m_i_db_createschema.sql --defaults-file=$MYSQL_TEST_DIR/t/m_i_db_config.cnf $midparam
+--exec $MYSQL_INSTALL_DB --no-defaults --mysqld-file=$MYSQLD --datadir=$DDIR --basedir=$BASEDIR --lc_messages_dir=$MYSQL_SHAREDIR --extra-sql-file=$MYSQL_TEST_DIR/t/m_i_db_createschema.sql --defaults-file=$MYSQL_TEST_DIR/t/m_i_db_config.cnf $midparam
 --echo # Execution of mysql_install_db ends..............
 --exec echo "restart:--datadir=$DDIR " > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
 --enable_reconnect

mysql-test/t/disabled.def

@@ -16,4 +16,3 @@ archive-big              : Bug#11817185 2011-03-10 Anitha Disabled since this le
 ds_mrr-big @solaris      : Bug#14168107 2012-04-03 Hemant disabled new test added by Olav Sandstå,since this leads to timeout on Solaris on slow sparc servers
 mysql_embedded_client_test	: Bug#13964673 2012-04-16 amitbha since most of the test cases are failing
 mysql_client_test_embedded : Bug#16084066 2013-01-08 Disabled since this test is failing
-m_i_db : Bug#19498327 2014-09-03 prabprad Disabled till the test issue is fixed

mysql-test/t/m_i_db.test

@@ -4,8 +4,8 @@
 #############################################################
 
 # This test takes around 300 seconds. So let us run it only in --big-test mode
-#--source include/big_test.inc
--- source include/not_embedded.inc
+--source include/big_test.inc
+--source include/not_embedded.inc
 --source include/not_windows.inc
 
 --echo # Basic cases related to mysql_install_db
@@ -61,8 +61,8 @@ EOF
 --echo # Check the behavior of the option --login-path when passed with --login-file
 let adminuser=test_user2;
 let MYSQL_TEST_LOGIN_FILE=$MYSQL_TMP_DIR/m_i_db1.cnf;
---exec $BASEDIR/bin/mysql_config_editor set --login-path=credential1 --user=$adminuser --host=localhost
---exec $BASEDIR/bin/mysql_config_editor set --login-path=credential2 --user=test_user3 --host=127.0.0.1
+--exec $MYSQL_CONFIG_EDITOR set --login-path=credential1 --user=$adminuser --host=localhost
+--exec $MYSQL_CONFIG_EDITOR set --login-path=credential2 --user=test_user3 --host=127.0.0.1
 
 let midparam=--admin-user=test_user1 --login-file=$MYSQL_TMP_DIR/m_i_db1.cnf --login-path=credential1 --insecure;
 --source include/m_i_db_startsvr.inc
@@ -72,8 +72,8 @@ disconnect conn_root;
 --echo # Check the behavior when login-path is not passed, but only --login-file
 let adminuser=test_user2;
 let MYSQL_TEST_LOGIN_FILE=$MYSQL_TMP_DIR/m_i_db2.cnf;
---exec $BASEDIR/bin/mysql_config_editor set --login-path=client --user=$adminuser --host=localhost
---exec $BASEDIR/bin/mysql_config_editor set --login-path=credential2 --user=test_user3 --host=127.0.0.1
+--exec $MYSQL_CONFIG_EDITOR set --login-path=client --user=$adminuser --host=localhost
+--exec $MYSQL_CONFIG_EDITOR set --login-path=credential2 --user=test_user3 --host=127.0.0.1
 
 let midparam=--admin-user=test_user1 --login-file=$MYSQL_TMP_DIR/m_i_db2.cnf --insecure;
 --source include/m_i_db_startsvr.inc
@@ -121,7 +121,7 @@ disconnect conn_root;
 let adminuser=root;
 let adminhost=localhost;
 let MYSQL_TEST_LOGIN_FILE=$MYSQL_TMP_DIR/m_i_db3.cnf;
---exec $BASEDIR/bin/mysql_config_editor set --login-path=credential1 --host=$adminhost
+--exec $MYSQL_CONFIG_EDITOR set --login-path=credential1 --host=$adminhost
 let midparam=--admin-host=invalidhost --login-file=$MYSQL_TMP_DIR/m_i_db3.cnf --login-path=credential1 --insecure;
 --source include/m_i_db_startsvr.inc
 disconnect conn_root;