Commit 6cc28909 authored by gkodinov/kgeorge@magare.gmz's avatar gkodinov/kgeorge@magare.gmz
Browse files

Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam 

into  magare.gmz:/home/kgeorge/mysql/autopush/B36041-5.1-bugteam
parents 79a709bd c9428af6

client/mysqltest.c

+1 −31
Original line number Diff line number Diff line
@@ -8094,8 +8094,6 @@ uint replace_len(char * str) 
  uint len=0;

  while (*str)

  {

    if (str[0] == '\\' && str[1])

      str++;

    str++;

    len++;

  }
@@ -8194,34 +8192,6 @@ REPLACE *init_replace(char * *from, char * *to,uint count, 
    }

    for (pos=from[i], len=0; *pos ; pos++)

    {

      if (*pos == '\\' && *(pos+1))

      {

	pos++;

	switch (*pos) {

	case 'b':

	  follow_ptr->chr = SPACE_CHAR;

	  break;

	case '^':

	  follow_ptr->chr = START_OF_LINE;

	  break;

	case '$':

	  follow_ptr->chr = END_OF_LINE;

	  break;

	case 'r':

	  follow_ptr->chr = '\r';

	  break;

	case 't':

	  follow_ptr->chr = '\t';

	  break;

	case 'v':

	  follow_ptr->chr = '\v';

	  break;

	default:

	  follow_ptr->chr = (uchar) *pos;

	  break;

	}

      }

      else

      follow_ptr->chr= (uchar) *pos;

      follow_ptr->table_offset=i;

      follow_ptr->len= ++len;

mysql-test/r/mysqltest.result

+3 −0
Original line number Diff line number Diff line
@@ -725,4 +725,7 @@ drop table t1; 
mysqltest: At line 1: change user failed: Unknown database 'inexistent'

mysqltest: At line 1: change user failed: Access denied for user 'inexistent'@'localhost' (using password: NO)

mysqltest: At line 1: change user failed: Access denied for user 'root'@'localhost' (using password: YES)

SELECT 'c:\\a.txt' AS col;

col

z

End of tests

mysql-test/t/mysqltest.test

+7 −0
Original line number Diff line number Diff line
@@ -2123,6 +2123,13 @@ rmdir $MYSQLTEST_VARDIR/tmp/testdir; 
remove_file $MYSQLTEST_VARDIR/tmp/testdir/file1.txt;

rmdir $MYSQLTEST_VARDIR/tmp/testdir;



#

# Bug #36041: mysql-test-run doesn't seem to string match 100% effectively

# on Windows

#



--replace_result c:\\a.txt z

SELECT 'c:\\a.txt' AS col;



--echo End of tests