Commit a166d8ca authored by unknown's avatar unknown
Browse files

Manual merge

parents 619b4b0f 88a7d01e

include/my_global.h

+17 −1
Original line number Diff line number Diff line
@@ -927,7 +927,17 @@ typedef char bool; /* Ordinary boolean values 0 1 */ 


#ifndef set_timespec

#ifdef HAVE_TIMESPEC_TS_SEC

#define set_timespec(ABSTIME,SEC) { (ABSTIME).ts_sec=time(0) + (time_t) (SEC); (ABSTIME).ts_nsec=0; }

#define set_timespec(ABSTIME,SEC) \

{ \

  (ABSTIME).ts_sec=time(0) + (time_t) (SEC); \

  (ABSTIME).ts_nsec=0; \

}

#define set_timespec_nsec(ABSTIME,NSEC) \

{\

  ulonglong now= my_getsystime(); \

  (ABSTIME).ts_sec= (now / ULL(10000000)) + (NSEC / ULL(1000000000)); \

  (ABSTIME).ts_nsec= (now % ULL(10000000)) * 100 + (NSEC % ULL(1000000000)); \

}

#else

#define set_timespec(ABSTIME,SEC) \

{\
@@ -936,6 +946,12 @@ typedef char bool; /* Ordinary boolean values 0 1 */ 
  (ABSTIME).tv_sec=tv.tv_sec+(time_t) (SEC);\

  (ABSTIME).tv_nsec=tv.tv_usec*1000;\

}

#define set_timespec_nsec(ABSTIME,NSEC) \

{\

  ulonglong now= my_getsystime(); \

  (ABSTIME).tv_sec= (now / ULL(10000000)) + (NSEC / ULL(1000000000)); \

  (ABSTIME).tv_nsec= (now % ULL(10000000)) * 100 + (NSEC % ULL(1000000000)); \

}

#endif /* HAVE_TIMESPEC_TS_SEC */

#endif /* set_timespec */

mysql-test/r/select.result

+0 −11
Original line number Diff line number Diff line
@@ -2756,14 +2756,3 @@ DROP TABLE t1,t2; 
select x'10' + 0, X'10' + 0, b'10' + 0, B'10' + 0;

x'10' + 0	X'10' + 0	b'10' + 0	B'10' + 0

16	16	2	2
 
CREATE TABLE BUG_12595(a varchar(100));

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

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 'ha%%an' ESCAPE '%';

a

ha%an

DROP TABLE BUG_12595;

mysql-test/r/view.result

+12 −0
Original line number Diff line number Diff line
@@ -2097,6 +2097,18 @@ select * from v1; 
f1

1

drop view v1;

create table t1 (f1 int);

create table t2 (f1 int);

insert into t1 values (1);

insert into t2 values (2);

create view v1 as select * from t1 union select * from t2 union all select * from t2;

select * from v1;

f1

1

2

2

drop view v1;

drop table t1,t2;

CREATE TEMPORARY TABLE t1 (a int);

CREATE FUNCTION f1 () RETURNS int RETURN (SELECT COUNT(*) FROM t1);

CREATE VIEW v1 AS SELECT f1();

mysql-test/t/select.test

+0 −11
Original line number Diff line number Diff line
@@ -2348,14 +2348,3 @@ DROP TABLE t1,t2; 
#



select x'10' + 0, X'10' + 0, b'10' + 0, B'10' + 0;
 


#

# BUG #12595

#

CREATE TABLE BUG_12595(a varchar(100));

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

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

-- error 1210

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

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

DROP TABLE BUG_12595;

sql/item_cmpfunc.cc

+0 −6
Original line number Diff line number Diff line
@@ -2792,12 +2792,6 @@ bool Item_func_like::fix_fields(THD *thd, Item **ref) 
  {

    /* If we are on execution stage */

    String *escape_str= escape_item->val_str(&tmp_value1);

    /* ESCAPE must be 1 char in length.*/

    if (escape_str && escape_str->numchars() != 1)

    {

      my_error(ER_WRONG_ARGUMENTS,MYF(0),"ESCAPE");

      return TRUE;

    }

    escape= escape_str ? *(escape_str->ptr()) : '\\';



    /*