Commit a4f853e2 authored by serg@serg.mysql.com's avatar serg@serg.mysql.com
Browse files

Merge

parents b4974dac f1e8696a

mysql-test/r/ft0000001.a.result

0 → 100644
+3 −0
Original line number Diff line number Diff line 
a	MATCH (message) AGAINST ('steve')	

4	0.90587321329654	

7	0.89568988462614

mysql-test/r/ft0000001.b.result

0 → 100644
+3 −0
Original line number Diff line number Diff line 
a	MATCH (message) AGAINST ('steve')	

4	0.90587321329654	

7	0.89568988462614

mysql-test/r/ft0000001.c.result

0 → 100644
+3 −0
Original line number Diff line number Diff line 
a	MATCH (message) AGAINST ('steve')	

7	0.89568988462614	

4	0.90587321329654

mysql-test/r/ft0000001.d.result

0 → 100644
+2 −0
Original line number Diff line number Diff line 
a	MATCH (message) AGAINST ('steve')	

7	0.89568988462614

mysql-test/r/sel000004.result

+2 −4
Original line number Diff line number Diff line 
id	elt(two.val,'one','two')	

1	one	

2	one	

4	two	
1+1	1-1	1+1*2	8/5	8%5	MOD(8,5)	MOD(8,5)|0	-(1+1)*-2	SIGN(-5)	

2	0	3	1.60	3	3	3	4	-1