Commit 3568bba8 authored by unknown's avatar unknown
Browse files

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 

into mysql.com:/usr/home/ram/work/mysql-5.0
parents 8dd1be2d 20eaad0e

mysql-test/r/select.result

+3 −0
Original line number Diff line number Diff line
@@ -2699,3 +2699,6 @@ id select_type table type possible_keys key key_len ref rows Extra 
1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	3	

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	5	Using where

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

mysql-test/t/select.test

+5 −0
Original line number Diff line number Diff line
@@ -2271,3 +2271,8 @@ EXPLAIN SELECT t1.a FROM t1 INNER JOIN t2 ON t1.a=t2.a; 


DROP TABLE t1,t2;



#

# Bug #10650

#



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

mysys/charset.c

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ static my_bool init_state_maps(CHARSET_INFO *cs) 


  /* Special handling of hex and binary strings */

  state_map[(uchar)'x']= state_map[(uchar)'X']= (uchar) MY_LEX_IDENT_OR_HEX;

  state_map[(uchar)'b']= state_map[(uchar)'b']= (uchar) MY_LEX_IDENT_OR_BIN;

  state_map[(uchar)'b']= state_map[(uchar)'B']= (uchar) MY_LEX_IDENT_OR_BIN;

  state_map[(uchar)'n']= state_map[(uchar)'N']= (uchar) MY_LEX_IDENT_OR_NCHAR;

  return 0;

}