Commit 7077d5aa authored by Daniel Fischer's avatar Daniel Fischer
Browse files

test case fix

parent b034f042

mysql-test/mysql-test-run.pl

+3 −2
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ our $opt_sleep; 
our $opt_testcase_timeout;

our $opt_suite_timeout;

my  $default_testcase_timeout=     15; # 15 min max

my  $default_suite_timeout=       180; # 3 hours max

my  $default_suite_timeout=       300; # 5 hours max



our $opt_start_and_exit;

our $opt_start_dirty;
@@ -1684,7 +1684,8 @@ sub executable_setup () { 
    # Look for mysql_fix_privilege_tables.sql script

    $file_mysql_fix_privilege_tables=

      mtr_file_exists("$glob_basedir/scripts/mysql_fix_privilege_tables.sql",

  		    "$glob_basedir/share/mysql_fix_privilege_tables.sql");

  		    "$glob_basedir/share/mysql_fix_privilege_tables.sql",

  		    "$glob_basedir/share/mysql/mysql_fix_privilege_tables.sql");



    if ( ! $opt_skip_ndbcluster and executable_setup_ndb())

    {

mysql-test/t/system_mysql_db_fix50030.test

+7 −0
Original line number Diff line number Diff line 
# Embedded server doesn't support external clients

--source include/not_embedded.inc



# Don't run this test if $MYSQL_FIX_PRIVILEGE_TABLES isn't set

# to the location of mysql_fix_privilege_tables.sql

if (`SELECT LENGTH("$MYSQL_FIX_PRIVILEGE_TABLES") <= 0`)

{

  skip Test needs MYSQL_FIX_PRIVILEGE_TABLES;

}



#

# This is the test for mysql_fix_privilege_tables

# It checks that a system tables from mysql 5.0.30

mysql-test/t/system_mysql_db_fix50117.test

+7 −0
Original line number Diff line number Diff line 
# Embedded server doesn't support external clients

--source include/not_embedded.inc



# Don't run this test if $MYSQL_FIX_PRIVILEGE_TABLES isn't set

# to the location of mysql_fix_privilege_tables.sql

if (`SELECT LENGTH("$MYSQL_FIX_PRIVILEGE_TABLES") <= 0`)

{

  skip Test needs MYSQL_FIX_PRIVILEGE_TABLES;

}



#

# This is the test for mysql_fix_privilege_tables

# It checks that a system tables from mysql 5.1.17