Commit d9f2d135 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/5.0.b16511
parents 79112423 5b9cdaa4

mysql-test/r/fulltext.result

+11 −0
Original line number Diff line number Diff line
@@ -445,3 +445,14 @@ t1 CREATE TABLE `t1` ( 
  FULLTEXT KEY `a` (`a`)

) ENGINE=MyISAM DEFAULT CHARSET=latin1

DROP TABLE t1;

CREATE TABLE t1 (a TEXT, FULLTEXT KEY(a));

INSERT INTO t1 VALUES('test'),('test1'),('test');

PREPARE stmt from "SELECT a, MATCH(a) AGAINST('test1 test') FROM t1 WHERE MATCH(a) AGAINST('test1 test')";

EXECUTE stmt;

a	MATCH(a) AGAINST('test1 test')

test1	0.68526661396027

EXECUTE stmt;

a	MATCH(a) AGAINST('test1 test')

test1	0.68526661396027

DEALLOCATE PREPARE stmt;

DROP TABLE t1;

mysql-test/r/func_math.result

+15 −0
Original line number Diff line number Diff line
@@ -203,3 +203,18 @@ NULL 
Warnings:

Error	1365	Division by 0

set sql_mode='';

select round(111,-10);

round(111,-10)

0

select round(-5000111000111000155,-1);

round(-5000111000111000155,-1)

-5000111000111000160

select round(15000111000111000155,-1);

round(15000111000111000155,-1)

15000111000111000160

select truncate(-5000111000111000155,-1);

truncate(-5000111000111000155,-1)

-5000111000111000150

select truncate(15000111000111000155,-1);

truncate(15000111000111000155,-1)

15000111000111000150

mysql-test/r/ndb_index_unique.result

+9 −0
Original line number Diff line number Diff line
@@ -626,3 +626,12 @@ select * from t1 where code = '12' and month = 4 and year = 2004 ; 
id	month	year	code

1	4	2004	12

drop table t1;

create table t1 (a int primary key, b varchar(1000) not null, unique key (b))

engine=ndb charset=utf8;

insert into t1 values (1, repeat(_utf8 0xe288ab6474, 200));

insert into t1 values (2, repeat(_utf8 0xe288ab6474, 200));

ERROR 23000: Duplicate entry '2' for key 1

select a, sha1(b) from t1;

a	sha1(b)

1	08f5d02c8b8bc244f275bdfc22c42c5cab0d9d7d

drop table t1;

mysql-test/r/ndb_load.result

0 → 100644
+80 −0
Original line number Diff line number Diff line 
DROP TABLE IF EXISTS t1;

CREATE TABLE t1 (word CHAR(20) NOT NULL PRIMARY KEY) ENGINE=NDB;

LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE t1 ;

ERROR 23000: Can't write; duplicate key in table 't1'

DROP TABLE t1;

CREATE TABLE t1 (word CHAR(20) NOT NULL) ENGINE=NDB;

LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE t1 ;

SELECT * FROM t1 ORDER BY word;

word

Aarhus

Aarhus

Aaron

Aaron

Ababa

Ababa

aback

aback

abaft

abaft

abandon

abandon

abandoned

abandoned

abandoning

abandoning

abandonment

abandonment

abandons

abandons

abase

abased

abasement

abasements

abases

abash

abashed

abashes

abashing

abasing

abate

abated

abatement

abatements

abater

abates

abating

Abba

abbe

abbey

abbeys

abbot

abbots

Abbott

abbreviate

abbreviated

abbreviates

abbreviating

abbreviation

abbreviations

Abby

abdomen

abdomens

abdominal

abduct

abducted

abduction

abductions

abductor

abductors

abducts

Abe

abed

Abel

Abelian

Abelson

Aberdeen

Abernathy

aberrant

aberration

DROP TABLE t1;

mysql-test/t/fulltext.test

+12 −0
Original line number Diff line number Diff line
@@ -365,4 +365,16 @@ CREATE TABLE t1 (a VARCHAR(10000), FULLTEXT(a)); 
SHOW CREATE TABLE t1;

DROP TABLE t1;



#

# BUG#14496: Crash or strange results with prepared statement,

#            MATCH and FULLTEXT

#

CREATE TABLE t1 (a TEXT, FULLTEXT KEY(a));

INSERT INTO t1 VALUES('test'),('test1'),('test');

PREPARE stmt from "SELECT a, MATCH(a) AGAINST('test1 test') FROM t1 WHERE MATCH(a) AGAINST('test1 test')";

EXECUTE stmt;

EXECUTE stmt;

DEALLOCATE PREPARE stmt;

DROP TABLE t1;



# End of 4.1 tests