fixed BUG #2874 "Grant table bug" and

added tests for testing structure of mysql db


client/mysqltest.c:
  extend "replace" to column names
  extend "disable_result_log" to output of --exec commad
mysql-test/install_test_db.sh:
  corrected wrong column definitions (as a result of tests)
mysql-test/mysql-test-run.sh:
  export MYSQL and MYSQL_FIX_SYSTEM_TABLES + 
  added option --result-file for *.opt files
scripts/mysql_fix_privilege_tables.sh:
  added new options to using in tests + 
  added new alters (as a result of new tests)
scripts/mysql_fix_privilege_tables.sql:
  added new alters (as a result of new tests)
scripts/mysql_install_db.sh:
  corrected definition of tables_priv.Table_name

1 files changed, 14 insertions, 2 deletions

diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index 5b39b167d7d..6fc699da9dd 100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -461,6 +461,7 @@ if [ x$SOURCE_DIST = x1 ] ; then
  LANGUAGE="$BASEDIR/sql/share/english/"
  CHARSETSDIR="$BASEDIR/sql/share/charsets"
  INSTALL_DB="./install_test_db"
+ MYSQL_FIX_SYSTEM_TABLES="$BASEDIR/scripts/mysql_fix_privilege_tables"
 else
  if test -x "$BASEDIR/libexec/mysqld"
  then
@@ -478,6 +479,7 @@ else
  MYSQL_MANAGER_PWGEN="$BASEDIR/bin/mysqlmanager-pwgen"
  MYSQL="$BASEDIR/bin/mysql"
  INSTALL_DB="./install_test_db -bin"
+ MYSQL_FIX_SYSTEM_TABLES="$BASEDIR/bin/mysql_fix_privilege_tables"
  if test -d "$BASEDIR/share/mysql/english"
  then
    LANGUAGE="$BASEDIR/share/mysql/english/"
@@ -490,8 +492,12 @@ fi
 
 MYSQL_DUMP="$MYSQL_DUMP --no-defaults -uroot --socket=$MASTER_MYSOCK"
 MYSQL_BINLOG="$MYSQL_BINLOG --no-defaults --local-load=$MYSQL_TMP_DIR"
+MYSQL_FIX_SYSTEM_TABLES="$MYSQL_FIX_SYSTEM_TABLES --host=localhost --port=$MASTER_MYPORT --socket=$MASTER_MYSOCK --user=root --password="
+MYSQL="$MYSQL --host=localhost --port=$MASTER_MYPORT --socket=$MASTER_MYSOCK --user=root --password="
+export MYSQL
 export MYSQL_DUMP
 export MYSQL_BINLOG
+export MYSQL_FIX_SYSTEM_TABLES
 
 if [ -z "$MASTER_MYSQLD" ]
 then
@@ -1168,6 +1174,7 @@ run_testcase ()
  master_init_script=$TESTDIR/$tname-master.sh
  slave_init_script=$TESTDIR/$tname-slave.sh
  slave_master_info_file=$TESTDIR/$tname.slave-mi
+ result_file=$tname
  echo $tname > $CURRENT_TEST
  SKIP_SLAVE=`$EXPR \( $tname : rpl \) = 0`
  if [ $USE_MANAGER = 1 ] ; then
@@ -1217,6 +1224,11 @@ run_testcase ()
 	 # Note that this must be set to space, not "" for test-reset to work
 	 EXTRA_MASTER_OPT=" "
 	 ;;
+       --result-file=*)
+         result_file=`$ECHO "$EXTRA_MASTER_OPT" | $SED -e "s;--result-file=;;"`
+	 # Note that this must be set to space, not "" for test-reset to work
+	 EXTRA_MASTER_OPT=" "
+         ;;
      esac
      stop_master
      echo "CURRENT_TEST: $tname" >> $MASTER_MYERR
@@ -1274,7 +1286,7 @@ run_testcase ()
 
  if [ -f $tf ] ; then
     $RM -f r/$tname.*reject
-    mysql_test_args="-R r/$tname.result $EXTRA_MYSQL_TEST_OPT"
+    mysql_test_args="-R r/$result_file.result $EXTRA_MYSQL_TEST_OPT"
     if [ -z "$DO_CLIENT_GDB" ] ; then
       `$MYSQL_TEST  $mysql_test_args < $tf 2> $TIMEFILE`;
     else
@@ -1306,7 +1318,7 @@ run_testcase ()
 	$ECHO "$RES$RES_SPACE [ fail ]"
         $ECHO
 	error_is
-	show_failed_diff $tname
+	show_failed_diff $result_file
 	$ECHO
 	if [ x$FORCE != x1 ] ; then
 	 $ECHO "Aborting. To continue, re-run with '--force'."