Commit 75d834a3 authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


mysql-test/mysql-test-run.pl:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
parents 28f61575 456959cf

mysql-test/mysql-test-run.pl

+2 −1
Original line number Diff line number Diff line
@@ -1417,7 +1417,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");

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

		    "$path_share/mysql_fix_privilege_tables.sql");



  if ( ! $opt_skip_ndbcluster and executable_setup_ndb())

  {