Portability fixes

Removed \r from new tests
Fixes to get new sustem_mysql_db... tests to work


client/mysqltest.c:
  More debug information
innobase/que/que0que.c:
  Fixed wrong usage of __attribute
mysql-test/mysql-test-run.sh:
  Portability fix; Added CLIENT_BINDIR
mysql-test/t/system_mysql_db_fix.test:
  Removed \r
mysql-test/t/system_mysql_db_refs.test:
  Removed \r
scripts/mysql_fix_privilege_tables.sh:
  Don't set root password from first option
  Added --bindir option

3 files changed, 33 insertions, 35 deletions

diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index a606a492058..4b171fafc06 100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -10,7 +10,7 @@
 # Access Definitions
 #--
 DB=test
-DBPASSWD=
+DBPASSWD=""
 VERBOSE=""
 USE_MANAGER=0
 MY_TZ=GMT-3
@@ -461,12 +461,13 @@ if [ x$SOURCE_DIST = x1 ] ; then
   MYSQL_TEST="strace -o $MYSQL_TEST_DIR/var/log/mysqltest.strace $MYSQL_TEST"
  fi
 
- MYSQLADMIN="$BASEDIR/client/mysqladmin"
+ CLIENT_BINDIR="$BASEDIR/client"
+ MYSQLADMIN="$CLIENT_BINDIR/mysqladmin"
  WAIT_PID="$BASEDIR/extra/mysql_waitpid"
- MYSQL_MANAGER_CLIENT="$BASEDIR/client/mysqlmanagerc"
+ MYSQL_MANAGER_CLIENT="$CLIENT_BINDIR/mysqlmanagerc"
  MYSQL_MANAGER="$BASEDIR/tools/mysqlmanager"
- MYSQL_MANAGER_PWGEN="$BASEDIR/client/mysqlmanager-pwgen"
- MYSQL="$BASEDIR/client/mysql"
+ MYSQL_MANAGER_PWGEN="$CLIENT_BINDIR/mysqlmanager-pwgen"
+ MYSQL="$CLIENT_BINDIR/mysql"
  LANGUAGE="$BASEDIR/sql/share/english/"
  CHARSETSDIR="$BASEDIR/sql/share/charsets"
  INSTALL_DB="./install_test_db"
@@ -478,17 +479,18 @@ else
  else
    MYSQLD="$VALGRIND $BASEDIR/bin/mysqld"
  fi
- MYSQL_TEST="$BASEDIR/bin/mysqltest"
- MYSQL_DUMP="$BASEDIR/bin/mysqldump"
- MYSQL_BINLOG="$BASEDIR/bin/mysqlbinlog"
- MYSQLADMIN="$BASEDIR/bin/mysqladmin"
- WAIT_PID="$BASEDIR/bin/mysql_waitpid"
- MYSQL_MANAGER="$BASEDIR/bin/mysqlmanager"
- MYSQL_MANAGER_CLIENT="$BASEDIR/bin/mysqlmanagerc"
- MYSQL_MANAGER_PWGEN="$BASEDIR/bin/mysqlmanager-pwgen"
- MYSQL="$BASEDIR/bin/mysql"
+ CLIENT_BINDIR="$BASEDIR/bin"
+ MYSQL_TEST="$CLIENT_BINDIR/mysqltest"
+ MYSQL_DUMP="$CLIENT_BINDIR/mysqldump"
+ MYSQL_BINLOG="$CLIENT_BINDIR/mysqlbinlog"
+ MYSQLADMIN="$CLIENT_BINDIR/mysqladmin"
+ WAIT_PID="$CLIENT_BINDIR/mysql_waitpid"
+ MYSQL_MANAGER="$CLIENT_BINDIR/mysqlmanager"
+ MYSQL_MANAGER_CLIENT="$CLIENT_BINDIR/mysqlmanagerc"
+ MYSQL_MANAGER_PWGEN="$CLIENT_BINDIR/mysqlmanager-pwgen"
+ MYSQL="$CLIENT_BINDIR/mysql"
  INSTALL_DB="./install_test_db --bin"
- MYSQL_FIX_SYSTEM_TABLES="$BASEDIR/bin/mysql_fix_privilege_tables"
+ MYSQL_FIX_SYSTEM_TABLES="$CLIENT_BINDIR/mysql_fix_privilege_tables"
  if test -d "$BASEDIR/share/mysql/english"
  then
    LANGUAGE="$BASEDIR/share/mysql/english/"
@@ -499,14 +501,11 @@ else
   fi
 fi
 
-MYSQL_DUMP="$MYSQL_DUMP --no-defaults -uroot --socket=$MASTER_MYSOCK"
+MYSQL_DUMP="$MYSQL_DUMP --no-defaults -uroot --socket=$MASTER_MYSOCK --password=$DBPASSWD"
 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
+MYSQL_FIX_SYSTEM_TABLES="$MYSQL_FIX_SYSTEM_TABLES --host=localhost --port=$MASTER_MYPORT --socket=$MASTER_MYSOCK --user=root --password=$DBPASSWD --bindir=$CLIENT_BINDIR"
+MYSQL="$MYSQL --host=localhost --port=$MASTER_MYPORT --socket=$MASTER_MYSOCK --user=root --password=$DBPASSWD"
+export MYSQL MYSQL_DUMP MYSQL_BINLOG MYSQL_FIX_SYSTEM_TABLES CLIENT_BINDIR
 
 if [ -z "$MASTER_MYSQLD" ]
 then
@@ -534,9 +533,9 @@ fi
 
 if [ -w / ]
 then
-    # We are running as root;  We need to add the --root argument
-    EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT --user=root"
-    EXTRA_SLAVE_MYSQLD_OPT="$EXTRA_SLAVE_MYSQLD_OPT --user=root"
+  # We are running as root;  We need to add the --root argument
+  EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT --user=root"
+  EXTRA_SLAVE_MYSQLD_OPT="$EXTRA_SLAVE_MYSQLD_OPT --user=root"
 fi
 
 
diff --git a/mysql-test/t/system_mysql_db_fix.test b/mysql-test/t/system_mysql_db_fix.test
index 3cb5d93e2f6..6f3979bf66e 100644
--- a/mysql-test/t/system_mysql_db_fix.test
+++ b/mysql-test/t/system_mysql_db_fix.test
@@ -23,10 +23,10 @@ CREATE TABLE db (
   KEY User (User)

 )

 type=ISAM;

-		      

+
 INSERT INTO db VALUES ('%','test',   '','Y','Y','Y','Y','Y','Y');

 INSERT INTO db VALUES ('%','test\_%','','Y','Y','Y','Y','Y','Y');

-		      

+
 CREATE TABLE host (

   Host char(60) binary DEFAULT '' NOT NULL,

   Db char(32) binary DEFAULT '' NOT NULL,

@@ -39,7 +39,7 @@ CREATE TABLE host (
   PRIMARY KEY Host (Host,Db)

 )

 type=ISAM;

-					

+
 CREATE TABLE user (

   Host char(60) binary DEFAULT '' NOT NULL,

   User char(16) binary DEFAULT '' NOT NULL,

@@ -56,7 +56,7 @@ CREATE TABLE user (
   PRIMARY KEY Host (Host,User)

 )

 type=ISAM;

-								    

+
 INSERT INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y');

 INSERT INTO user VALUES ('localhost','',    '','N','N','N','N','N','N','N','N','N');

 

diff --git a/mysql-test/t/system_mysql_db_refs.test b/mysql-test/t/system_mysql_db_refs.test
index be47f1ba5bf..49d6f198b32 100644
--- a/mysql-test/t/system_mysql_db_refs.test
+++ b/mysql-test/t/system_mysql_db_refs.test
@@ -34,13 +34,13 @@ insert into test_columns_priv (Host,Db,User,Table_name,Column_name) values (@nam
 

 # 'Host' field must be the same for all the tables:

 

-select 

+select
  if(isnull(test_db.Host),'WRONG!!!','ok') as test_db_Host,

  if(isnull(test_host.Host),'WRONG!!!','ok') as test_host_Host,

  if(isnull(test_user.Host),'WRONG!!!','ok') as test_user_Host,

  if(isnull(test_tables_priv.Host),'WRONG!!!','ok') as test_tables_priv_Host,

  if(isnull(test_columns_priv.Host),'WRONG!!!','ok') as test_columns_priv_Host

- 

+
 from      test_db

 left join test_host         on test_db.Host=test_host.Host

 left join test_user         on test_db.Host=test_user.Host

@@ -49,12 +49,12 @@ left join test_columns_priv on test_db.Host=test_columns_priv.Host;
 

 # 'Db' field must be the same for all the tables:

 

-select 

+select
  if(isnull(test_db.Db),'WRONG!!!','ok') as test_db_Db,

  if(isnull(test_host.Db),'WRONG!!!','ok') as test_host_Db,

  if(isnull(test_tables_priv.Db),'WRONG!!!','ok') as test_tables_priv_Db,

  if(isnull(test_columns_priv.Db),'WRONG!!!','ok') as est_columns_priv_Db

- 

+
 from      test_db

 left join test_host         on test_db.Db=test_host.Db

 left join test_tables_priv  on test_db.Db=test_tables_priv.Db

@@ -67,7 +67,7 @@ select
  if(isnull(test_user.User),'WRONG!!!','ok') as test_user_User,

  if(isnull(test_tables_priv.User),'WRONG!!!','ok') as test_tables_priv_User,

  if(isnull(test_columns_priv.User),'WRONG!!!','ok') as test_columns_priv_User

- 

+
 from      test_db

 left join test_user         on test_db.User=test_user.User

 left join test_tables_priv  on test_db.User=test_tables_priv.User

@@ -87,4 +87,3 @@ drop table test_func;
 drop table test_host;

 drop table test_user;

 drop table test_db;

-