Commit c2b83beb authored by unknown's avatar unknown
Browse files

Merge abarkov@bk-internal:/home/bk/mysql-5.0 

into  mysql.com:/usr/home/bar/mysql-5.0.b12371
parents 06164d5d 6e2f09ee

client/mysql.cc

+2 −0
Original line number Diff line number Diff line
@@ -1010,10 +1010,12 @@ static int read_and_execute(bool interactive) 
#elif defined(__WIN__)

      if (!tmpbuf.is_alloced())

        tmpbuf.alloc(65535);

      tmpbuf.length(0);

      buffer.length(0);

      unsigned long clen;

      do

      {

	line= my_cgets((char*)tmpbuf.ptr(), tmpbuf.alloced_length()-1, &clen);

        buffer.append(line, clen);

        /* 

           if we got buffer fully filled than there is a chance that

configure.in

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc) 
AC_CANONICAL_SYSTEM

# The Docs Makefile.am parses this line!

# remember to also change ndb version below and update version.c in ndb

AM_INIT_AUTOMAKE(mysql, 5.0.15)

AM_INIT_AUTOMAKE(mysql, 5.0.16)

AM_CONFIG_HEADER(config.h)



PROTOCOL_VERSION=10
@@ -18,7 +18,7 @@ SHARED_LIB_VERSION=15:0:0 
# ndb version

NDB_VERSION_MAJOR=5

NDB_VERSION_MINOR=0

NDB_VERSION_BUILD=15

NDB_VERSION_BUILD=16

NDB_VERSION_STATUS=""



# Set all version vars based on $VERSION. How do we do this more elegant ?

mysql-test/mysql-test-run.pl

+1 −1
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ our $opt_sleep_time_after_restart= 1; 
our $opt_sleep_time_for_delete=    10;

our $opt_testcase_timeout;

our $opt_suite_timeout;

my  $default_testcase_timeout=     10; # 10 min max

my  $default_testcase_timeout=     15; # 15 min max

my  $default_suite_timeout=       120; # 2 hours max



our $opt_socket;

mysql-test/r/im_life_cycle.result

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ instance_name status version 
mysqld2	online	VERSION

SHOW VARIABLES LIKE 'port';

Variable_name	Value

port	9312

port	IM_MYSQLD1_PORT

STOP INSTANCE mysqld2;

SHOW INSTANCES;

instance_name	status

mysql-test/r/select.result

+57 −0
Original line number Diff line number Diff line
@@ -2965,6 +2965,63 @@ NULL 
SELECT IFNULL(NULL, NULL);

IFNULL(NULL, NULL)

NULL

SET @OLD_SQL_MODE12595=@@SQL_MODE, @@SQL_MODE='';

SHOW LOCAL VARIABLES LIKE 'SQL_MODE';

Variable_name	Value

sql_mode	

CREATE TABLE BUG_12595(a varchar(100));

INSERT INTO BUG_12595 VALUES ('hakan%'), ('hakank'), ("ha%an");

SELECT * FROM BUG_12595 WHERE a LIKE 'hakan\%';

a

hakan%

SELECT * FROM BUG_12595 WHERE a LIKE 'hakan*%' ESCAPE '*';

a

hakan%

SELECT * FROM BUG_12595 WHERE a LIKE 'hakan**%' ESCAPE '**';

ERROR HY000: Incorrect arguments to ESCAPE

SELECT * FROM BUG_12595 WHERE a LIKE 'hakan%' ESCAPE '';

a

hakan%

hakank

SELECT * FROM BUG_12595 WHERE a LIKE 'hakan\%' ESCAPE '';

a

SELECT * FROM BUG_12595 WHERE a LIKE 'ha\%an' ESCAPE 0x5c;

a

ha%an

SELECT * FROM BUG_12595 WHERE a LIKE 'ha%%an' ESCAPE '%';

a

ha%an

SELECT * FROM BUG_12595 WHERE a LIKE 'ha\%an' ESCAPE '\\';

a

ha%an

SELECT * FROM BUG_12595 WHERE a LIKE 'ha|%an' ESCAPE '|';

a

ha%an

SET @@SQL_MODE='NO_BACKSLASH_ESCAPES';

SHOW LOCAL VARIABLES LIKE 'SQL_MODE';

Variable_name	Value

sql_mode	NO_BACKSLASH_ESCAPES

SELECT * FROM BUG_12595 WHERE a LIKE 'hakan\%';

a

SELECT * FROM BUG_12595 WHERE a LIKE 'hakan*%' ESCAPE '*';

a

hakan%

SELECT * FROM BUG_12595 WHERE a LIKE 'hakan**%' ESCAPE '**';

ERROR HY000: Incorrect arguments to ESCAPE

SELECT * FROM BUG_12595 WHERE a LIKE 'hakan\%' ESCAPE '\\';

ERROR HY000: Incorrect arguments to ESCAPE

SELECT * FROM BUG_12595 WHERE a LIKE 'hakan%' ESCAPE '';

ERROR HY000: Incorrect arguments to ESCAPE

SELECT * FROM BUG_12595 WHERE a LIKE 'ha\%an' ESCAPE 0x5c;

a

ha%an

SELECT * FROM BUG_12595 WHERE a LIKE 'ha|%an' ESCAPE '|';

a

ha%an

SELECT * FROM BUG_12595 WHERE a LIKE 'hakan\n%' ESCAPE '\n';

ERROR HY000: Incorrect arguments to ESCAPE

SET @@SQL_MODE=@OLD_SQL_MODE12595;

DROP TABLE BUG_12595;

create table t1 (a char(1));

create table t2 (a char(1));

insert into t1 values ('a'),('b'),('c');