Commit 9935110b authored by unknown's avatar unknown
Browse files

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
parent 00ff1f60

client/mysqltest.c

+20 −13
Original line number Diff line number Diff line
@@ -861,18 +861,22 @@ int do_exec(struct st_query* q) 
  char buf[1024];

  FILE *res_file;

  char *cmd= q->first_argument;

  DBUG_ENTER("do_exec");



  while (*cmd && my_isspace(charset_info, *cmd))

    cmd++;

  if (!*cmd)

    die("Missing argument in exec\n");



  if (disable_result_log)

  {

  DBUG_PRINT("info", ("Executing '%s'", cmd));



  if (!(res_file= popen(cmd, "r")) && q->abort_on_error)

    die("popen() failed\n");

    while (fgets(buf, sizeof(buf), res_file));

    pclose(res_file);



  if (disable_result_log)

  {

    while (fgets(buf, sizeof(buf), res_file))

    {}

  }

  else

  {
@@ -884,11 +888,8 @@ int do_exec(struct st_query* q) 
    else

      ds= &ds_res;



    if (!(res_file= popen(cmd, "r")) && q->abort_on_error)

      die("popen() failed\n");

    while (fgets(buf, sizeof(buf), res_file))

      replace_dynstr_append_mem(ds, buf, strlen(buf));

    pclose(res_file);

  

    if (glob_replace)

      free_replace();
@@ -907,8 +908,9 @@ int do_exec(struct st_query* q) 
    if (ds == &ds_tmp)

      dynstr_free(&ds_tmp);

  }

  pclose(res_file);

  

  return error;

  DBUG_RETURN(error);

}



int var_query_set(VAR* v, const char* p, const char** p_end)
@@ -1043,7 +1045,7 @@ int do_system(struct st_query* q) 
  eval_expr(&v, p, 0); /* NULL terminated */

  if (v.str_val_len)

  {

    char expr_buf[512];

    char expr_buf[1024];

    if ((uint)v.str_val_len > sizeof(expr_buf) - 1)

      v.str_val_len = sizeof(expr_buf) - 1;

    memcpy(expr_buf, v.str_val, v.str_val_len);
@@ -1774,11 +1776,12 @@ int read_query(struct st_query** q_ptr) 
  char *p = read_query_buf, * p1 ;

  int expected_errno;

  struct st_query* q;

  DBUG_ENTER("read_query_buf");



  if (parser.current_line < parser.read_lines)

  {

    get_dynamic(&q_lines, (gptr) q_ptr, parser.current_line) ;

    return 0;

    DBUG_RETURN(0);

  }

  if (!(*q_ptr=q=(struct st_query*) my_malloc(sizeof(*q), MYF(MY_WME))) ||

      insert_dynamic(&q_lines, (gptr) &q))
@@ -1797,7 +1800,7 @@ int read_query(struct st_query** q_ptr) 
  q->type = Q_UNKNOWN;

  q->query_buf=q->query=0;

  if (read_line(read_query_buf, sizeof(read_query_buf)))

    return 1;

    DBUG_RETURN(1);



  if (*p == '#')

  {
@@ -1851,7 +1854,7 @@ int read_query(struct st_query** q_ptr) 
  q->first_argument=p;

  q->end = strend(q->query);

  parser.read_lines++;

  return 0;

  DBUG_RETURN(0);

}
@@ -2306,10 +2309,12 @@ void get_query_type(struct st_query* q) 
{

  char save;

  uint type;

  DBUG_ENTER("get_query_type");



  if (*q->query == '}')

  {

    q->type = Q_END_BLOCK;

    return;

    DBUG_VOID_RETURN;

  }

  if (q->type != Q_COMMENT_WITH_COMMAND)

    q->type = Q_QUERY;
@@ -2320,8 +2325,10 @@ void get_query_type(struct st_query* q) 
  q->query[q->first_word_len]=save;

  if (type > 0)

    q->type=(enum enum_commands) type;		/* Found command */

  DBUG_VOID_RETURN;

}





static byte *get_var_key(const byte* var, uint* len,

			 my_bool __attribute__((unused)) t)

{

innobase/que/que0que.c

+4 −4
Original line number Diff line number Diff line
@@ -668,15 +668,15 @@ does nothing! */ 
void

que_thr_handle_error(

/*=================*/

	que_thr_t*	thr __attribute((unused)),

	que_thr_t*	thr __attribute__((unused)),

				/* in: query thread */

	ulint		err_no __attribute((unused)),

	ulint		err_no __attribute__((unused)),

				/* in: error number */

	byte*		err_str __attribute((unused)),

	byte*		err_str __attribute__((unused)),

				/* in, own: error string or NULL; NOTE: the

				function will take care of freeing of the

				string! */

	ulint		err_len __attribute((unused)))

	ulint		err_len __attribute__((unused)))

				/* in: error string length */	

{

	/* Does nothing */

mysql-test/mysql-test-run.sh

+24 −25
Original line number Diff line number Diff line
@@ -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

mysql-test/t/system_mysql_db_refs.test

+5 −6
Original line number Diff line number Diff line
@@ -87,4 +87,3 @@ drop table test_func; 
drop table test_host;

drop table test_user;

drop table test_db;

scripts/mysql_fix_privilege_tables.sh

+13 −2
Original line number Diff line number Diff line
@@ -32,13 +32,23 @@ 
#   --password=<password>

#   --database=<database>



root_password="$1"

root_password=""

host="localhost"

user="root"

port=""

socket=""

comment=""

database="mysql"

bindir="@bindir@"



# Old format where there is only one argument and it's the password

if test "$#" == 1

then

  case "$1" in

  --*) ;;

  *) root_password="$1" ; shift ;;

  esac

fi



# read all the options

parse_arguments()
@@ -52,6 +62,7 @@ parse_arguments() 
      --socket=*) socket=`echo "$arg" | sed -e "s;--socket=;;"` ;;

      --password=*) root_password=`echo "$arg" | sed -e "s;--password=;;"` ;;

      --database=*) database=`echo "$arg" | sed -e "s;--database=;;"` ;;

      --bindir=*) bindir=`echo "$arg" | sed -e "s;--bindir=;;"` ;;

      *)

        echo "Unknown argument '$arg'"

        exit 1
@@ -63,7 +74,7 @@ parse_arguments() 
parse_arguments "$@"



if test -z "$cmd"; then

  cmd="@bindir@/mysql -f --user=$user --host=$host"

  cmd="$bindir/mysql -f --user=$user --host=$host"

  if test ! -z "$root_password"; then

    cmd="$cmd --password=$root_password"

  fi

mysql-test/t/system_mysql_db_fix.test

+4 −4

File changed.

Contains only whitespace changes.