2000-12-15 09:58:17 +01:00
|
|
|
# Description
|
|
|
|
# -----------
|
|
|
|
# Testing string functions
|
|
|
|
|
2003-01-06 00:48:59 +01:00
|
|
|
--disable_warnings
|
2005-04-01 14:04:50 +02:00
|
|
|
drop table if exists t1,t2;
|
2003-01-06 00:48:59 +01:00
|
|
|
--enable_warnings
|
2001-03-23 19:38:42 +01:00
|
|
|
|
2003-07-03 14:00:01 +02:00
|
|
|
set names latin1;
|
|
|
|
|
2000-12-15 09:58:17 +01:00
|
|
|
select 'hello',"'hello'",'""hello""','''h''e''l''l''o''',"hel""lo",'hel\'lo';
|
|
|
|
select 'hello' 'monty';
|
|
|
|
select length('\n\t\r\b\0\_\%\\');
|
2002-01-03 20:47:14 +01:00
|
|
|
select bit_length('\n\t\r\b\0\_\%\\');
|
2003-10-30 11:57:26 +01:00
|
|
|
select char_length('\n\t\r\b\0\_\%\\');
|
|
|
|
select length(_latin1'\n\t\n\b\0\\_\\%\\');
|
|
|
|
select concat('monty',' was here ','again'),length('hello'),char(ascii('h')),ord('h');
|
2005-10-11 23:58:22 +02:00
|
|
|
select hex(char(256));
|
2000-12-15 09:58:17 +01:00
|
|
|
select locate('he','hello'),locate('he','hello',2),locate('lo','hello',2) ;
|
2001-11-22 12:50:50 +01:00
|
|
|
select instr('hello','HE'), instr('hello',binary 'HE'), instr(binary 'hello','HE');
|
|
|
|
select position(binary 'll' in 'hello'),position('a' in binary 'hello');
|
2006-07-07 14:06:30 +02:00
|
|
|
#
|
|
|
|
# Bug#11728 string function LEFT,
|
|
|
|
# strange undocumented behaviour, strict mode
|
|
|
|
#
|
|
|
|
select left('hello',null), right('hello',null);
|
2000-12-15 09:58:17 +01:00
|
|
|
select left('hello',2),right('hello',2),substring('hello',2,2),mid('hello',1,5) ;
|
|
|
|
select concat('',left(right(concat('what ',concat('is ','happening')),9),4),'',substring('monty',5,1)) ;
|
|
|
|
select substring_index('www.tcx.se','.',-2),substring_index('www.tcx.se','.',1);
|
|
|
|
select substring_index('www.tcx.se','tcx',1),substring_index('www.tcx.se','tcx',-1);
|
|
|
|
select substring_index('.tcx.se','.',-2),substring_index('.tcx.se','.tcx',-1);
|
item_strfunc.cc:
BUG #11104
Took out the offset-=delimiter_length-1 out of the for loop. It was causing
basically this:
select substring_index('the king of the the hill', 'the', -2) to not work.
The first iteration, offset would be initialised to 24, then strstr would
point at 'the king of the the* hill' ('*'means right before the
character following), returning a offset of 16. The for loop would then
decrement offset by two (3 - 1), to 14, now pointing at
"the king of th*e the hill", _skipping_ past the 'e' in the second to last
'the', and therefore strstr would never have a chance of matching the
second to last 'the', then moving on to the 'the' at the begginning of the
string!
In a nutshell, offset was being decremented by too great a value, preventing
the second to last 'the' from being ever found, hence the result of
'king of the the hill' from the query that is reported in the bug report
func_str.test:
BUG #11104
Added tests to make sure fix addresses issues in original bug report
func_str.result:
BUG #11104
New results for new tests
mysql-test/r/func_str.result:
BUG #11104
New results for new tests
mysql-test/t/func_str.test:
BUG #11104
Added tests to make sure fix addresses issues in original bug report
sql/item_strfunc.cc:
BUG #11104
Took out the offset-=delimiter_length-1 out of the for loop. It was causing
basically this:
select substring_index('the king of the the hill', 'the', -2) to not work.
The first iteration, offset would be initialised to 24, then strstr would
point at 'the king of the the* hill' ('*'means right before the
character following), returning a offset of 16. The for loop would then
decrement offset by two (3 - 1), to 14, now pointing at
"the king of th*e the hill", _skipping_ past the 'e' in the second to last
'the', and therefore strstr would never have a chance of matching the
second to last 'the', then moving on to the 'the' at the begginning of the
string!
In a nutshell, offset was being decremented by too great a value, preventing
the second to last 'the' from being ever found, hence the result of
'king of the the hill' from the query that is reported in the bug report
2005-08-08 22:46:13 +02:00
|
|
|
select substring_index('aaaaaaaaa1','a',1);
|
|
|
|
select substring_index('aaaaaaaaa1','aa',1);
|
|
|
|
select substring_index('aaaaaaaaa1','aa',2);
|
|
|
|
select substring_index('aaaaaaaaa1','aa',3);
|
|
|
|
select substring_index('aaaaaaaaa1','aa',4);
|
|
|
|
select substring_index('aaaaaaaaa1','aa',5);
|
|
|
|
select substring_index('aaaaaaaaa1','aaa',1);
|
|
|
|
select substring_index('aaaaaaaaa1','aaa',2);
|
|
|
|
select substring_index('aaaaaaaaa1','aaa',3);
|
|
|
|
select substring_index('aaaaaaaaa1','aaa',4);
|
|
|
|
select substring_index('aaaaaaaaa1','aaaa',1);
|
|
|
|
select substring_index('aaaaaaaaa1','aaaa',2);
|
|
|
|
select substring_index('aaaaaaaaa1','1',1);
|
|
|
|
select substring_index('aaaaaaaaa1','a',-1);
|
|
|
|
select substring_index('aaaaaaaaa1','aa',-1);
|
|
|
|
select substring_index('aaaaaaaaa1','aa',-2);
|
|
|
|
select substring_index('aaaaaaaaa1','aa',-3);
|
|
|
|
select substring_index('aaaaaaaaa1','aa',-4);
|
|
|
|
select substring_index('aaaaaaaaa1','aa',-5);
|
|
|
|
select substring_index('aaaaaaaaa1','aaa',-1);
|
|
|
|
select substring_index('aaaaaaaaa1','aaa',-2);
|
|
|
|
select substring_index('aaaaaaaaa1','aaa',-3);
|
|
|
|
select substring_index('aaaaaaaaa1','aaa',-4);
|
|
|
|
select substring_index('the king of thethe hill','the',-2);
|
|
|
|
select substring_index('the king of the the hill','the',-2);
|
|
|
|
select substring_index('the king of the the hill','the',-2);
|
|
|
|
select substring_index('the king of the the hill',' the ',-1);
|
|
|
|
select substring_index('the king of the the hill',' the ',-2);
|
|
|
|
select substring_index('the king of the the hill',' ',-1);
|
|
|
|
select substring_index('the king of the the hill',' ',-2);
|
|
|
|
select substring_index('the king of the the hill',' ',-3);
|
|
|
|
select substring_index('the king of the the hill',' ',-4);
|
|
|
|
select substring_index('the king of the the hill',' ',-5);
|
|
|
|
select substring_index('the king of the.the hill','the',-2);
|
|
|
|
select substring_index('the king of thethethe.the hill','the',-3);
|
|
|
|
select substring_index('the king of thethethe.the hill','the',-1);
|
|
|
|
select substring_index('the king of the the hill','the',1);
|
|
|
|
select substring_index('the king of the the hill','the',2);
|
|
|
|
select substring_index('the king of the the hill','the',3);
|
2000-12-15 09:58:17 +01:00
|
|
|
|
|
|
|
select concat(':',ltrim(' left '),':',rtrim(' right '),':');
|
2005-01-02 22:31:37 +01:00
|
|
|
select concat(':',trim(leading from ' left '),':',trim(trailing from ' right '),':');
|
2000-12-15 09:58:17 +01:00
|
|
|
select concat(':',trim(LEADING FROM ' left'),':',trim(TRAILING FROM ' right '),':');
|
|
|
|
select concat(':',trim(' m '),':',trim(BOTH FROM ' y '),':',trim('*' FROM '*s*'),':');
|
|
|
|
select concat(':',trim(BOTH 'ab' FROM 'ababmyabab'),':',trim(BOTH '*' FROM '***sql'),':');
|
|
|
|
select concat(':',trim(LEADING '.*' FROM '.*my'),':',trim(TRAILING '.*' FROM 'sql.*.*'),':');
|
2001-01-19 03:57:29 +01:00
|
|
|
select TRIM("foo" FROM "foo"), TRIM("foo" FROM "foook"), TRIM("foo" FROM "okfoo");
|
2000-12-15 09:58:17 +01:00
|
|
|
|
2001-03-23 19:38:42 +01:00
|
|
|
select concat_ws(', ','monty','was here','again');
|
|
|
|
select concat_ws(NULL,'a'),concat_ws(',',NULL,'');
|
|
|
|
select concat_ws(',','',NULL,'a');
|
|
|
|
SELECT CONCAT('"',CONCAT_WS('";"',repeat('a',60),repeat('b',60),repeat('c',60),repeat('d',100)), '"');
|
|
|
|
|
2000-12-15 09:58:17 +01:00
|
|
|
select insert('txs',2,1,'hi'),insert('is ',4,0,'a'),insert('txxxxt',2,4,'es');
|
|
|
|
select replace('aaaa','a','b'),replace('aaaa','aa','b'),replace('aaaa','a','bb'),replace('aaaa','','b'),replace('bbbb','a','c');
|
|
|
|
select replace(concat(lcase(concat('THIS',' ','IS',' ','A',' ')),ucase('false'),' ','test'),'FALSE','REAL') ;
|
2004-04-28 14:19:02 +02:00
|
|
|
select soundex(''),soundex('he'),soundex('hello all folks'),soundex('#3556 in bugdb');
|
2002-12-13 23:18:14 +01:00
|
|
|
select 'mood' sounds like 'mud';
|
|
|
|
select 'Glazgo' sounds like 'Liverpool';
|
|
|
|
select null sounds like 'null';
|
|
|
|
select 'null' sounds like null;
|
|
|
|
select null sounds like null;
|
2000-12-15 09:58:17 +01:00
|
|
|
select md5('hello');
|
2003-10-30 11:57:26 +01:00
|
|
|
select crc32("123");
|
2002-06-11 11:37:48 +02:00
|
|
|
select sha('abc');
|
|
|
|
select sha1('abc');
|
|
|
|
select aes_decrypt(aes_encrypt('abc','1'),'1');
|
|
|
|
select aes_decrypt(aes_encrypt('abc','1'),1);
|
|
|
|
select aes_encrypt(NULL,"a");
|
|
|
|
select aes_encrypt("a",NULL);
|
|
|
|
select aes_decrypt(NULL,"a");
|
|
|
|
select aes_decrypt("a",NULL);
|
|
|
|
select aes_decrypt("a","a");
|
|
|
|
select aes_decrypt(aes_encrypt("","a"),"a");
|
2000-12-15 09:58:17 +01:00
|
|
|
select repeat('monty',5),concat('*',space(5),'*');
|
|
|
|
select reverse('abc'),reverse('abcd');
|
2003-12-04 11:12:01 +01:00
|
|
|
select rpad('a',4,'1'),rpad('a',4,'12'),rpad('abcd',3,'12'), rpad(11, 10 , 22), rpad("ab", 10, 22);
|
|
|
|
select lpad('a',4,'1'),lpad('a',4,'12'),lpad('abcd',3,'12'), lpad(11, 10 , 22);
|
2000-12-15 09:58:17 +01:00
|
|
|
select rpad(741653838,17,'0'),lpad(741653838,17,'0');
|
|
|
|
select rpad('abcd',7,'ab'),lpad('abcd',7,'ab');
|
|
|
|
select rpad('abcd',1,'ab'),lpad('abcd',1,'ab');
|
2003-12-04 11:12:01 +01:00
|
|
|
select rpad('STRING', 20, CONCAT('p','a','d') );
|
|
|
|
select lpad('STRING', 20, CONCAT('p','a','d') );
|
2000-12-15 09:58:17 +01:00
|
|
|
|
|
|
|
select LEAST(NULL,'HARRY','HARRIOT',NULL,'HAROLD'),GREATEST(NULL,'HARRY','HARRIOT',NULL,'HAROLD');
|
2000-12-28 02:56:38 +01:00
|
|
|
select least(1,2,3) | greatest(16,32,8), least(5,4)*1,greatest(-1.0,1.0)*1,least(3,2,1)*1.0,greatest(1,1.1,1.0),least("10",9),greatest("A","B","0");
|
|
|
|
|
|
|
|
select decode(encode(repeat("a",100000),"monty"),"monty")=repeat("a",100000);
|
|
|
|
select decode(encode("abcdef","monty"),"monty")="abcdef";
|
|
|
|
|
2002-08-09 14:58:30 +02:00
|
|
|
select quote('\'\"\\test');
|
|
|
|
select quote(concat('abc\'', '\\cba'));
|
2002-08-12 02:33:46 +02:00
|
|
|
select quote(1/0), quote('\0\Z');
|
2003-01-03 16:46:15 +01:00
|
|
|
select length(quote(concat(char(0),"test")));
|
2003-12-12 21:26:58 +01:00
|
|
|
select hex(quote(concat(char(224),char(227),char(230),char(231),char(232),char(234),char(235))));
|
2004-07-07 23:49:03 +02:00
|
|
|
select unhex(hex("foobar")), hex(unhex("1234567890ABCDEF")), unhex("345678"), unhex(NULL);
|
2004-03-04 23:18:54 +01:00
|
|
|
select hex(unhex("1")), hex(unhex("12")), hex(unhex("123")), hex(unhex("1234")), hex(unhex("12345")), hex(unhex("123456"));
|
|
|
|
select length(unhex(md5("abrakadabra")));
|
2002-08-09 14:58:30 +02:00
|
|
|
|
2004-11-11 15:20:40 +01:00
|
|
|
#
|
|
|
|
# Bug #6564: QUOTE(NULL
|
|
|
|
#
|
|
|
|
|
|
|
|
select concat('a', quote(NULL));
|
|
|
|
|
2000-12-28 02:56:38 +01:00
|
|
|
#
|
|
|
|
# Wrong usage of functions
|
|
|
|
#
|
|
|
|
|
|
|
|
select reverse("");
|
|
|
|
select insert("aa",100,1,"b"),insert("aa",1,3,"b"),left("aa",-1),substring("a",1,2);
|
|
|
|
select elt(2,1),field(NULL,"a","b","c"),reverse("");
|
|
|
|
select locate("a","b",2),locate("","a",1);
|
|
|
|
select ltrim("a"),rtrim("a"),trim(BOTH "" from "a"),trim(BOTH " " from "a");
|
|
|
|
select concat("1","2")|0,concat("1",".5")+0.0;
|
|
|
|
select substring_index("www.tcx.se","",3);
|
|
|
|
select length(repeat("a",100000000)),length(repeat("a",1000*64));
|
|
|
|
select position("0" in "baaa" in (1)),position("0" in "1" in (1,2,3)),position("sql" in ("mysql"));
|
|
|
|
select position(("1" in (1,2,3)) in "01");
|
|
|
|
select length(repeat("a",65500)),length(concat(repeat("a",32000),repeat("a",32000))),length(replace("aaaaa","a",concat(repeat("a",10000)))),length(insert(repeat("a",40000),1,30000,repeat("b",50000)));
|
|
|
|
select length(repeat("a",1000000)),length(concat(repeat("a",32000),repeat("a",32000),repeat("a",32000))),length(replace("aaaaa","a",concat(repeat("a",32000)))),length(insert(repeat("a",48000),1,1000,repeat("a",48000)));
|
|
|
|
|
|
|
|
#
|
|
|
|
# Problem med concat
|
|
|
|
#
|
|
|
|
|
|
|
|
create table t1 ( domain char(50) );
|
|
|
|
insert into t1 VALUES ("hello.de" ), ("test.de" );
|
|
|
|
select domain from t1 where concat('@', trim(leading '.' from concat('.', domain))) = '@hello.de';
|
|
|
|
select domain from t1 where concat('@', trim(leading '.' from concat('.', domain))) = '@test.de';
|
|
|
|
drop table t1;
|
2001-03-23 19:38:42 +01:00
|
|
|
|
|
|
|
#
|
|
|
|
# Test bug in concat_ws
|
|
|
|
#
|
|
|
|
|
|
|
|
CREATE TABLE t1 (
|
|
|
|
id int(10) unsigned NOT NULL,
|
|
|
|
title varchar(255) default NULL,
|
|
|
|
prio int(10) unsigned default NULL,
|
|
|
|
category int(10) unsigned default NULL,
|
|
|
|
program int(10) unsigned default NULL,
|
|
|
|
bugdesc text,
|
|
|
|
created datetime default NULL,
|
bug#10466: Datatype "timestamp" displays "YYYYMMDDHHMMSS" irrespective of display sizes.
- Print warning that says display width is not supported for datatype TIMESTAMP, if user tries to create a TIMESTAMP column with display width.
- Use display width for TIMESTAMP only in type_timestamp test to make sure warning is displayed correctly.
mysql-test/include/ps_create.inc:
Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/r/alias.result:
Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/r/func_date_add.result:
Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/r/func_str.result:
Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/r/func_time.result:
Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/r/group_by.result:
Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/r/innodb.result:
Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/r/ps.result:
Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/r/ps_1general.result:
Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/r/ps_2myisam.result:
Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/r/ps_3innodb.result:
Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/r/ps_4heap.result:
Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/r/ps_5merge.result:
Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/r/ps_6bdb.result:
Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/r/ps_7ndb.result:
Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/r/select.result:
Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/r/type_timestamp.result:
When display width is used for a TIMESTAMP column a warning is printed that the display width will be ignored.
mysql-test/r/update.result:
Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/t/alias.test:
Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/t/func_date_add.test:
Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/t/func_str.test:
Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/t/func_time.test:
Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/t/group_by.test:
Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/t/innodb.test:
Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/t/ps.test:
Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/t/ps_4heap.test:
Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/t/ps_5merge.test:
Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/t/select.test:
Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/t/update.test:
Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
sql/share/errmsg.txt:
Correct swedish error message
sql/sql_parse.cc:
Print warning if datatype is TIMESTAMP and display width is used.
2005-06-20 12:09:00 +02:00
|
|
|
modified timestamp NOT NULL,
|
2001-03-23 19:38:42 +01:00
|
|
|
bugstatus int(10) unsigned default NULL,
|
|
|
|
submitter int(10) unsigned default NULL
|
2003-12-10 05:31:42 +01:00
|
|
|
) ENGINE=MyISAM;
|
2001-03-23 19:38:42 +01:00
|
|
|
|
|
|
|
INSERT INTO t1 VALUES (1,'Link',1,1,1,'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa','2001-02-28 08:40:16',20010228084016,0,4);
|
2002-12-14 16:43:01 +01:00
|
|
|
SELECT CONCAT('"',CONCAT_WS('";"',title,prio,category,program,bugdesc,created,modified+0,bugstatus,submitter), '"') FROM t1;
|
2001-03-23 19:38:42 +01:00
|
|
|
SELECT CONCAT('"',CONCAT_WS('";"',title,prio,category,program,bugstatus,submitter), '"') FROM t1;
|
2002-12-14 16:43:01 +01:00
|
|
|
SELECT CONCAT_WS('";"',title,prio,category,program,bugdesc,created,modified+0,bugstatus,submitter) FROM t1;
|
2003-03-30 15:36:01 +02:00
|
|
|
SELECT bugdesc, REPLACE(bugdesc, 'xxxxxxxxxxxxxxxxxxxx', 'bbbbbbbbbbbbbbbbbbbb') from t1 group by bugdesc;
|
2001-03-23 19:38:42 +01:00
|
|
|
drop table t1;
|
2002-09-17 22:46:53 +02:00
|
|
|
|
|
|
|
#
|
|
|
|
# Test bug in AES_DECRYPT() when called with wrong argument
|
|
|
|
#
|
|
|
|
|
2003-12-10 05:31:42 +01:00
|
|
|
CREATE TABLE t1 (id int(11) NOT NULL auto_increment, tmp text NOT NULL, KEY id (id)) ENGINE=MyISAM;
|
2002-09-17 22:46:53 +02:00
|
|
|
INSERT INTO t1 VALUES (1, 'a545f661efdd1fb66fdee3aab79945bf');
|
|
|
|
SELECT 1 FROM t1 WHERE tmp=AES_DECRYPT(tmp,"password");
|
|
|
|
DROP TABLE t1;
|
2003-05-23 08:32:35 +02:00
|
|
|
|
2003-06-24 14:07:43 +02:00
|
|
|
CREATE TABLE t1 (
|
|
|
|
wid int(10) unsigned NOT NULL auto_increment,
|
|
|
|
data_podp date default NULL,
|
|
|
|
status_wnio enum('nowy','podp','real','arch') NOT NULL default 'nowy',
|
2004-04-28 17:14:53 +02:00
|
|
|
PRIMARY KEY(wid)
|
2003-06-24 14:07:43 +02:00
|
|
|
);
|
|
|
|
|
|
|
|
INSERT INTO t1 VALUES (8,NULL,'real');
|
|
|
|
INSERT INTO t1 VALUES (9,NULL,'nowy');
|
|
|
|
SELECT elt(status_wnio,data_podp) FROM t1 GROUP BY wid;
|
|
|
|
DROP TABLE t1;
|
2003-07-03 20:24:23 +02:00
|
|
|
|
|
|
|
#
|
|
|
|
# test for #739
|
|
|
|
|
2004-02-11 00:06:46 +01:00
|
|
|
CREATE TABLE t1 (title text) ENGINE=MyISAM;
|
2003-07-03 20:24:23 +02:00
|
|
|
INSERT INTO t1 VALUES ('Congress reconvenes in September to debate welfare and adult education');
|
|
|
|
INSERT INTO t1 VALUES ('House passes the CAREERS bill');
|
|
|
|
SELECT CONCAT("</a>",RPAD("",(55 - LENGTH(title)),".")) from t1;
|
|
|
|
DROP TABLE t1;
|
2004-01-20 23:18:51 +01:00
|
|
|
|
|
|
|
#
|
|
|
|
# test for Bug #2290 "output truncated with ELT when using DISTINCT"
|
|
|
|
#
|
|
|
|
|
|
|
|
CREATE TABLE t1 (i int, j int);
|
|
|
|
INSERT INTO t1 VALUES (1,1),(2,2);
|
|
|
|
SELECT DISTINCT i, ELT(j, '345', '34') FROM t1;
|
2004-01-22 17:20:43 +01:00
|
|
|
DROP TABLE t1;
|
2004-02-11 00:06:46 +01:00
|
|
|
|
2004-05-17 09:47:16 +02:00
|
|
|
#
|
|
|
|
# bug #3756: quote and NULL
|
|
|
|
#
|
|
|
|
|
|
|
|
create table t1(a char(4));
|
|
|
|
insert into t1 values ('one'),(NULL),('two'),('four');
|
|
|
|
select a, quote(a), isnull(quote(a)), quote(a) is null, ifnull(quote(a), 'n') from t1;
|
2004-05-17 10:40:02 +02:00
|
|
|
drop table t1;
|
2004-05-19 23:54:52 +02:00
|
|
|
|
2004-09-13 11:25:43 +02:00
|
|
|
#
|
|
|
|
# Bug #5498: TRIM fails with LEADING or TRAILING if remstr = str
|
|
|
|
#
|
|
|
|
|
|
|
|
select trim(trailing 'foo' from 'foo');
|
|
|
|
select trim(leading 'foo' from 'foo');
|
2004-10-06 18:14:33 +02:00
|
|
|
|
2003-05-23 08:32:35 +02:00
|
|
|
#
|
2004-12-22 20:31:17 +01:00
|
|
|
# crashing bug with QUOTE() and LTRIM() or TRIM() fixed
|
|
|
|
# Bug #7495
|
|
|
|
#
|
|
|
|
|
2004-12-23 20:08:54 +01:00
|
|
|
select quote(ltrim(concat(' ', 'a')));
|
|
|
|
select quote(trim(concat(' ', 'a')));
|
2005-02-02 03:29:10 +01:00
|
|
|
|
|
|
|
# Bad results from QUOTE(). Bug #8248
|
|
|
|
CREATE TABLE t1 SELECT 1 UNION SELECT 2 UNION SELECT 3;
|
|
|
|
SELECT QUOTE('A') FROM t1;
|
|
|
|
DROP TABLE t1;
|
2005-02-02 18:05:52 +01:00
|
|
|
|
2003-05-23 08:32:35 +02:00
|
|
|
# Test collation and coercibility
|
|
|
|
#
|
2003-07-03 14:00:01 +02:00
|
|
|
|
|
|
|
select 1=_latin1'1';
|
|
|
|
select _latin1'1'=1;
|
|
|
|
select _latin2'1'=1;
|
|
|
|
select 1=_latin2'1';
|
After merge fixes
Added more DBUG statements
Ensure that we are comparing end space with BINARY strings
Use 'any_db' instead of '' to mean any database. (For HANDLER command)
Only strip ' ' when comparing CHAR, not other space-like characters (like \t)
BitKeeper/deleted/.del-ctype_tis620.result-old~3578ceb0b8284685:
Delete: mysql-test/r/ctype_tis620.result-old
BitKeeper/deleted/.del-ctype_tis620.test-old~ffb1bbd2935d1aba:
Delete: mysql-test/t/ctype_tis620.test-old
client/mysqlbinlog.cc:
Added DBUG statements
Added call of my_end() to free all used memory on exit
heap/hp_info.c:
After merge fixes
heap/hp_open.c:
After merge fixes
include/heap.h:
After merge fixes
include/m_ctype.h:
Use pchar instead of 'int' for character parameters.
Added 'my_binary_compare()'
include/m_string.h:
Fixed wrong define
innobase/ibuf/ibuf0ibuf.c:
After merge fixes
innobase/srv/srv0start.c:
After merge fixes
mysql-test/r/alter_table.result:
Fixed results after merge
mysql-test/r/auto_increment.result:
Fixed results after merge
mysql-test/r/bdb.result:
Fixed results after merge
mysql-test/r/binary.result:
Fixed results after merge
mysql-test/r/create.result:
Fixed results after merge
mysql-test/r/ctype_mb.result:
Fixed results after merge
mysql-test/r/ctype_tis620.result:
Fixed results after merge
mysql-test/r/ctype_utf8.result:
Fixed results after merge
mysql-test/r/delete.result:
Fixed results after merge
mysql-test/r/func_compress.result:
Fixed results after merge
mysql-test/r/func_gconcat.result:
Fixed results after merge
mysql-test/r/func_group.result:
Fixed results after merge
mysql-test/r/func_str.result:
Fixed results after merge
mysql-test/r/innodb.result:
Fixed results after merge
mysql-test/r/insert.result:
Fixed results after merge
mysql-test/r/insert_select.result:
Fixed results after merge
mysql-test/r/key.result:
Fixed results after merge
mysql-test/r/loaddata.result:
Fixed results after merge
mysql-test/r/lock.result:
Fixed results after merge
mysql-test/r/myisam.result:
Fixed results after merge
mysql-test/r/null.result:
Fixed results after merge
mysql-test/r/null_key.result:
Fixed results after merge
mysql-test/r/order_by.result:
Fixed results after merge
mysql-test/r/query_cache.result:
Fixed results after merge
mysql-test/r/range.result:
Fixed results after merge
mysql-test/r/rpl_multi_delete.result:
Fixed results after merge
mysql-test/r/rpl_until.result:
Fixed results after merge
mysql-test/r/subselect.result:
Fixed results after merge
mysql-test/r/subselect_innodb.result:
Fixed results after merge
mysql-test/r/type_blob.result:
Fixed results after merge
mysql-test/r/type_datetime.result:
Fixed results after merge
mysql-test/r/type_decimal.result:
Fixed results after merge
mysql-test/r/type_enum.result:
Fixed results after merge
mysql-test/r/type_float.result:
Fixed results after merge
mysql-test/r/type_ranges.result:
Fixed results after merge
mysql-test/r/type_time.result:
Fixed results after merge
mysql-test/r/type_timestamp.result:
Fixed results after merge
mysql-test/r/type_uint.result:
Fixed results after merge
mysql-test/r/type_year.result:
Fixed results after merge
mysql-test/r/variables.result:
Fixed results after merge
mysql-test/r/warnings.result:
Fixed results after merge
mysql-test/t/case.test:
Fixed shifted error messages
mysql-test/t/create.test:
Fixed shifted error messages
mysql-test/t/ctype_collate.test:
Fixed shifted error messages
mysql-test/t/ctype_tis620.test:
Merge with 4.0 ctype_tis620 test
mysql-test/t/delete.test:
Fixed shifted error messages
mysql-test/t/derived.test:
Fixed shifted error messages
mysql-test/t/fulltext.test:
Fixed shifted error messages
mysql-test/t/func_in.test:
Fixed shifted error messages
mysql-test/t/func_str.test:
Fixed shifted error messages
mysql-test/t/func_test.test:
Fixed shifted error messages
mysql-test/t/grant.test:
Fixed shifted error messages
mysql-test/t/innodb.test:
Change to 4.1 syntax
mysql-test/t/key_cache.test:
Fixed shifted error messages
mysql-test/t/myisam.test:
New test of blob and end space
mysql-test/t/row.test:
Fixed shifted error messages
mysql-test/t/rpl_until.test:
Fixed shifted error messages
mysql-test/t/subselect.test:
Fixed shifted error messages
mysql-test/t/subselect_innodb.test:
Fix test to take into account foreign key constraints
mysql-test/t/union.test:
Fixed shifted error messages
mysql-test/t/user_var.test:
Fixed shifted error messages
mysql-test/t/variables.test:
Fixed shifted error messages
mysys/my_handler.c:
Merge with 4.0 code
sql/ha_heap.cc:
After merge fixes
sql/handler.cc:
After merge fixes
sql/item.cc:
After merge fixes
sql/item_cmpfunc.cc:
Ensure that we are comparing end space with BINARY strings
sql/item_cmpfunc.h:
Ensure that we are comparing end space with BINARY strings
sql/log_event.cc:
More DBUG statements
Ensure that we use all options to LOAD DATA in replication
sql/opt_range.cc:
After merge fixes
sql/sql_db.cc:
After merge fixes
sql/sql_handler.cc:
After merge fixes
Use 'any_db' instead of '' to mean 'no database comparison'
sql/sql_parse.cc:
After merge fixes
sql/sql_select.cc:
After merge fixes
Added function comment for setup_group()
sql/sql_string.cc:
Added stringcmp() for binary comparison.
Added function comments for sortcmp() and stringcmp()
sql/sql_string.h:
Added stringcmp()
sql/sql_table.cc:
After merge fixes
sql/sql_update.cc:
After merge fixes
sql/sql_yacc.yy:
Use 'any_db' instead of '' to mean any database. Using "" causes a 'wrong db name' error.
strings/ctype-big5.c:
Strip only end space, not other space characters.
strings/ctype-bin.c:
Removed some not needed functions.
Added function comments
Don't remove end space in comparisons
Change my_wildcmp_bin() to be 'identical' with other similar code
strings/ctype-czech.c:
Strip only end space, not other space characters.
strings/ctype-gbk.c:
Strip only end space, not other space characters.
strings/ctype-latin1.c:
Strip only end space, not other space characters.
strings/ctype-mb.c:
Strip only end space, not other space characters.
strings/ctype-simple.c:
Strip only end space, not other space characters.
strings/ctype-sjis.c:
Strip only end space, not other space characters.
strings/ctype-tis620.c:
Added usage of my_instr_simple. This needs to be cleaned up!
strings/ctype-utf8.c:
Strip only end space, not other space characters.
strings/ctype-win1250ch.c:
Strip only end space, not other space characters.
Fixed indentation
strings/strto.c:
Code cleanup
2004-02-16 09:03:25 +01:00
|
|
|
--error 1267
|
2003-07-03 14:00:01 +02:00
|
|
|
select _latin1'1'=_latin2'1';
|
|
|
|
select row('a','b','c') = row('a','b','c');
|
|
|
|
select row('A','b','c') = row('a','b','c');
|
|
|
|
select row('A' COLLATE latin1_bin,'b','c') = row('a','b','c');
|
|
|
|
select row('A','b','c') = row('a' COLLATE latin1_bin,'b','c');
|
After merge fixes
Added more DBUG statements
Ensure that we are comparing end space with BINARY strings
Use 'any_db' instead of '' to mean any database. (For HANDLER command)
Only strip ' ' when comparing CHAR, not other space-like characters (like \t)
BitKeeper/deleted/.del-ctype_tis620.result-old~3578ceb0b8284685:
Delete: mysql-test/r/ctype_tis620.result-old
BitKeeper/deleted/.del-ctype_tis620.test-old~ffb1bbd2935d1aba:
Delete: mysql-test/t/ctype_tis620.test-old
client/mysqlbinlog.cc:
Added DBUG statements
Added call of my_end() to free all used memory on exit
heap/hp_info.c:
After merge fixes
heap/hp_open.c:
After merge fixes
include/heap.h:
After merge fixes
include/m_ctype.h:
Use pchar instead of 'int' for character parameters.
Added 'my_binary_compare()'
include/m_string.h:
Fixed wrong define
innobase/ibuf/ibuf0ibuf.c:
After merge fixes
innobase/srv/srv0start.c:
After merge fixes
mysql-test/r/alter_table.result:
Fixed results after merge
mysql-test/r/auto_increment.result:
Fixed results after merge
mysql-test/r/bdb.result:
Fixed results after merge
mysql-test/r/binary.result:
Fixed results after merge
mysql-test/r/create.result:
Fixed results after merge
mysql-test/r/ctype_mb.result:
Fixed results after merge
mysql-test/r/ctype_tis620.result:
Fixed results after merge
mysql-test/r/ctype_utf8.result:
Fixed results after merge
mysql-test/r/delete.result:
Fixed results after merge
mysql-test/r/func_compress.result:
Fixed results after merge
mysql-test/r/func_gconcat.result:
Fixed results after merge
mysql-test/r/func_group.result:
Fixed results after merge
mysql-test/r/func_str.result:
Fixed results after merge
mysql-test/r/innodb.result:
Fixed results after merge
mysql-test/r/insert.result:
Fixed results after merge
mysql-test/r/insert_select.result:
Fixed results after merge
mysql-test/r/key.result:
Fixed results after merge
mysql-test/r/loaddata.result:
Fixed results after merge
mysql-test/r/lock.result:
Fixed results after merge
mysql-test/r/myisam.result:
Fixed results after merge
mysql-test/r/null.result:
Fixed results after merge
mysql-test/r/null_key.result:
Fixed results after merge
mysql-test/r/order_by.result:
Fixed results after merge
mysql-test/r/query_cache.result:
Fixed results after merge
mysql-test/r/range.result:
Fixed results after merge
mysql-test/r/rpl_multi_delete.result:
Fixed results after merge
mysql-test/r/rpl_until.result:
Fixed results after merge
mysql-test/r/subselect.result:
Fixed results after merge
mysql-test/r/subselect_innodb.result:
Fixed results after merge
mysql-test/r/type_blob.result:
Fixed results after merge
mysql-test/r/type_datetime.result:
Fixed results after merge
mysql-test/r/type_decimal.result:
Fixed results after merge
mysql-test/r/type_enum.result:
Fixed results after merge
mysql-test/r/type_float.result:
Fixed results after merge
mysql-test/r/type_ranges.result:
Fixed results after merge
mysql-test/r/type_time.result:
Fixed results after merge
mysql-test/r/type_timestamp.result:
Fixed results after merge
mysql-test/r/type_uint.result:
Fixed results after merge
mysql-test/r/type_year.result:
Fixed results after merge
mysql-test/r/variables.result:
Fixed results after merge
mysql-test/r/warnings.result:
Fixed results after merge
mysql-test/t/case.test:
Fixed shifted error messages
mysql-test/t/create.test:
Fixed shifted error messages
mysql-test/t/ctype_collate.test:
Fixed shifted error messages
mysql-test/t/ctype_tis620.test:
Merge with 4.0 ctype_tis620 test
mysql-test/t/delete.test:
Fixed shifted error messages
mysql-test/t/derived.test:
Fixed shifted error messages
mysql-test/t/fulltext.test:
Fixed shifted error messages
mysql-test/t/func_in.test:
Fixed shifted error messages
mysql-test/t/func_str.test:
Fixed shifted error messages
mysql-test/t/func_test.test:
Fixed shifted error messages
mysql-test/t/grant.test:
Fixed shifted error messages
mysql-test/t/innodb.test:
Change to 4.1 syntax
mysql-test/t/key_cache.test:
Fixed shifted error messages
mysql-test/t/myisam.test:
New test of blob and end space
mysql-test/t/row.test:
Fixed shifted error messages
mysql-test/t/rpl_until.test:
Fixed shifted error messages
mysql-test/t/subselect.test:
Fixed shifted error messages
mysql-test/t/subselect_innodb.test:
Fix test to take into account foreign key constraints
mysql-test/t/union.test:
Fixed shifted error messages
mysql-test/t/user_var.test:
Fixed shifted error messages
mysql-test/t/variables.test:
Fixed shifted error messages
mysys/my_handler.c:
Merge with 4.0 code
sql/ha_heap.cc:
After merge fixes
sql/handler.cc:
After merge fixes
sql/item.cc:
After merge fixes
sql/item_cmpfunc.cc:
Ensure that we are comparing end space with BINARY strings
sql/item_cmpfunc.h:
Ensure that we are comparing end space with BINARY strings
sql/log_event.cc:
More DBUG statements
Ensure that we use all options to LOAD DATA in replication
sql/opt_range.cc:
After merge fixes
sql/sql_db.cc:
After merge fixes
sql/sql_handler.cc:
After merge fixes
Use 'any_db' instead of '' to mean 'no database comparison'
sql/sql_parse.cc:
After merge fixes
sql/sql_select.cc:
After merge fixes
Added function comment for setup_group()
sql/sql_string.cc:
Added stringcmp() for binary comparison.
Added function comments for sortcmp() and stringcmp()
sql/sql_string.h:
Added stringcmp()
sql/sql_table.cc:
After merge fixes
sql/sql_update.cc:
After merge fixes
sql/sql_yacc.yy:
Use 'any_db' instead of '' to mean any database. Using "" causes a 'wrong db name' error.
strings/ctype-big5.c:
Strip only end space, not other space characters.
strings/ctype-bin.c:
Removed some not needed functions.
Added function comments
Don't remove end space in comparisons
Change my_wildcmp_bin() to be 'identical' with other similar code
strings/ctype-czech.c:
Strip only end space, not other space characters.
strings/ctype-gbk.c:
Strip only end space, not other space characters.
strings/ctype-latin1.c:
Strip only end space, not other space characters.
strings/ctype-mb.c:
Strip only end space, not other space characters.
strings/ctype-simple.c:
Strip only end space, not other space characters.
strings/ctype-sjis.c:
Strip only end space, not other space characters.
strings/ctype-tis620.c:
Added usage of my_instr_simple. This needs to be cleaned up!
strings/ctype-utf8.c:
Strip only end space, not other space characters.
strings/ctype-win1250ch.c:
Strip only end space, not other space characters.
Fixed indentation
strings/strto.c:
Code cleanup
2004-02-16 09:03:25 +01:00
|
|
|
--error 1267
|
2003-07-03 14:00:01 +02:00
|
|
|
select row('A' COLLATE latin1_general_ci,'b','c') = row('a' COLLATE latin1_bin,'b','c');
|
|
|
|
|
After merge fixes
Added more DBUG statements
Ensure that we are comparing end space with BINARY strings
Use 'any_db' instead of '' to mean any database. (For HANDLER command)
Only strip ' ' when comparing CHAR, not other space-like characters (like \t)
BitKeeper/deleted/.del-ctype_tis620.result-old~3578ceb0b8284685:
Delete: mysql-test/r/ctype_tis620.result-old
BitKeeper/deleted/.del-ctype_tis620.test-old~ffb1bbd2935d1aba:
Delete: mysql-test/t/ctype_tis620.test-old
client/mysqlbinlog.cc:
Added DBUG statements
Added call of my_end() to free all used memory on exit
heap/hp_info.c:
After merge fixes
heap/hp_open.c:
After merge fixes
include/heap.h:
After merge fixes
include/m_ctype.h:
Use pchar instead of 'int' for character parameters.
Added 'my_binary_compare()'
include/m_string.h:
Fixed wrong define
innobase/ibuf/ibuf0ibuf.c:
After merge fixes
innobase/srv/srv0start.c:
After merge fixes
mysql-test/r/alter_table.result:
Fixed results after merge
mysql-test/r/auto_increment.result:
Fixed results after merge
mysql-test/r/bdb.result:
Fixed results after merge
mysql-test/r/binary.result:
Fixed results after merge
mysql-test/r/create.result:
Fixed results after merge
mysql-test/r/ctype_mb.result:
Fixed results after merge
mysql-test/r/ctype_tis620.result:
Fixed results after merge
mysql-test/r/ctype_utf8.result:
Fixed results after merge
mysql-test/r/delete.result:
Fixed results after merge
mysql-test/r/func_compress.result:
Fixed results after merge
mysql-test/r/func_gconcat.result:
Fixed results after merge
mysql-test/r/func_group.result:
Fixed results after merge
mysql-test/r/func_str.result:
Fixed results after merge
mysql-test/r/innodb.result:
Fixed results after merge
mysql-test/r/insert.result:
Fixed results after merge
mysql-test/r/insert_select.result:
Fixed results after merge
mysql-test/r/key.result:
Fixed results after merge
mysql-test/r/loaddata.result:
Fixed results after merge
mysql-test/r/lock.result:
Fixed results after merge
mysql-test/r/myisam.result:
Fixed results after merge
mysql-test/r/null.result:
Fixed results after merge
mysql-test/r/null_key.result:
Fixed results after merge
mysql-test/r/order_by.result:
Fixed results after merge
mysql-test/r/query_cache.result:
Fixed results after merge
mysql-test/r/range.result:
Fixed results after merge
mysql-test/r/rpl_multi_delete.result:
Fixed results after merge
mysql-test/r/rpl_until.result:
Fixed results after merge
mysql-test/r/subselect.result:
Fixed results after merge
mysql-test/r/subselect_innodb.result:
Fixed results after merge
mysql-test/r/type_blob.result:
Fixed results after merge
mysql-test/r/type_datetime.result:
Fixed results after merge
mysql-test/r/type_decimal.result:
Fixed results after merge
mysql-test/r/type_enum.result:
Fixed results after merge
mysql-test/r/type_float.result:
Fixed results after merge
mysql-test/r/type_ranges.result:
Fixed results after merge
mysql-test/r/type_time.result:
Fixed results after merge
mysql-test/r/type_timestamp.result:
Fixed results after merge
mysql-test/r/type_uint.result:
Fixed results after merge
mysql-test/r/type_year.result:
Fixed results after merge
mysql-test/r/variables.result:
Fixed results after merge
mysql-test/r/warnings.result:
Fixed results after merge
mysql-test/t/case.test:
Fixed shifted error messages
mysql-test/t/create.test:
Fixed shifted error messages
mysql-test/t/ctype_collate.test:
Fixed shifted error messages
mysql-test/t/ctype_tis620.test:
Merge with 4.0 ctype_tis620 test
mysql-test/t/delete.test:
Fixed shifted error messages
mysql-test/t/derived.test:
Fixed shifted error messages
mysql-test/t/fulltext.test:
Fixed shifted error messages
mysql-test/t/func_in.test:
Fixed shifted error messages
mysql-test/t/func_str.test:
Fixed shifted error messages
mysql-test/t/func_test.test:
Fixed shifted error messages
mysql-test/t/grant.test:
Fixed shifted error messages
mysql-test/t/innodb.test:
Change to 4.1 syntax
mysql-test/t/key_cache.test:
Fixed shifted error messages
mysql-test/t/myisam.test:
New test of blob and end space
mysql-test/t/row.test:
Fixed shifted error messages
mysql-test/t/rpl_until.test:
Fixed shifted error messages
mysql-test/t/subselect.test:
Fixed shifted error messages
mysql-test/t/subselect_innodb.test:
Fix test to take into account foreign key constraints
mysql-test/t/union.test:
Fixed shifted error messages
mysql-test/t/user_var.test:
Fixed shifted error messages
mysql-test/t/variables.test:
Fixed shifted error messages
mysys/my_handler.c:
Merge with 4.0 code
sql/ha_heap.cc:
After merge fixes
sql/handler.cc:
After merge fixes
sql/item.cc:
After merge fixes
sql/item_cmpfunc.cc:
Ensure that we are comparing end space with BINARY strings
sql/item_cmpfunc.h:
Ensure that we are comparing end space with BINARY strings
sql/log_event.cc:
More DBUG statements
Ensure that we use all options to LOAD DATA in replication
sql/opt_range.cc:
After merge fixes
sql/sql_db.cc:
After merge fixes
sql/sql_handler.cc:
After merge fixes
Use 'any_db' instead of '' to mean 'no database comparison'
sql/sql_parse.cc:
After merge fixes
sql/sql_select.cc:
After merge fixes
Added function comment for setup_group()
sql/sql_string.cc:
Added stringcmp() for binary comparison.
Added function comments for sortcmp() and stringcmp()
sql/sql_string.h:
Added stringcmp()
sql/sql_table.cc:
After merge fixes
sql/sql_update.cc:
After merge fixes
sql/sql_yacc.yy:
Use 'any_db' instead of '' to mean any database. Using "" causes a 'wrong db name' error.
strings/ctype-big5.c:
Strip only end space, not other space characters.
strings/ctype-bin.c:
Removed some not needed functions.
Added function comments
Don't remove end space in comparisons
Change my_wildcmp_bin() to be 'identical' with other similar code
strings/ctype-czech.c:
Strip only end space, not other space characters.
strings/ctype-gbk.c:
Strip only end space, not other space characters.
strings/ctype-latin1.c:
Strip only end space, not other space characters.
strings/ctype-mb.c:
Strip only end space, not other space characters.
strings/ctype-simple.c:
Strip only end space, not other space characters.
strings/ctype-sjis.c:
Strip only end space, not other space characters.
strings/ctype-tis620.c:
Added usage of my_instr_simple. This needs to be cleaned up!
strings/ctype-utf8.c:
Strip only end space, not other space characters.
strings/ctype-win1250ch.c:
Strip only end space, not other space characters.
Fixed indentation
strings/strto.c:
Code cleanup
2004-02-16 09:03:25 +01:00
|
|
|
--error 1267
|
2003-07-04 15:12:23 +02:00
|
|
|
select concat(_latin1'a',_latin2'a');
|
2003-08-18 23:08:08 +02:00
|
|
|
--error 1270
|
After merge fixes
Added more DBUG statements
Ensure that we are comparing end space with BINARY strings
Use 'any_db' instead of '' to mean any database. (For HANDLER command)
Only strip ' ' when comparing CHAR, not other space-like characters (like \t)
BitKeeper/deleted/.del-ctype_tis620.result-old~3578ceb0b8284685:
Delete: mysql-test/r/ctype_tis620.result-old
BitKeeper/deleted/.del-ctype_tis620.test-old~ffb1bbd2935d1aba:
Delete: mysql-test/t/ctype_tis620.test-old
client/mysqlbinlog.cc:
Added DBUG statements
Added call of my_end() to free all used memory on exit
heap/hp_info.c:
After merge fixes
heap/hp_open.c:
After merge fixes
include/heap.h:
After merge fixes
include/m_ctype.h:
Use pchar instead of 'int' for character parameters.
Added 'my_binary_compare()'
include/m_string.h:
Fixed wrong define
innobase/ibuf/ibuf0ibuf.c:
After merge fixes
innobase/srv/srv0start.c:
After merge fixes
mysql-test/r/alter_table.result:
Fixed results after merge
mysql-test/r/auto_increment.result:
Fixed results after merge
mysql-test/r/bdb.result:
Fixed results after merge
mysql-test/r/binary.result:
Fixed results after merge
mysql-test/r/create.result:
Fixed results after merge
mysql-test/r/ctype_mb.result:
Fixed results after merge
mysql-test/r/ctype_tis620.result:
Fixed results after merge
mysql-test/r/ctype_utf8.result:
Fixed results after merge
mysql-test/r/delete.result:
Fixed results after merge
mysql-test/r/func_compress.result:
Fixed results after merge
mysql-test/r/func_gconcat.result:
Fixed results after merge
mysql-test/r/func_group.result:
Fixed results after merge
mysql-test/r/func_str.result:
Fixed results after merge
mysql-test/r/innodb.result:
Fixed results after merge
mysql-test/r/insert.result:
Fixed results after merge
mysql-test/r/insert_select.result:
Fixed results after merge
mysql-test/r/key.result:
Fixed results after merge
mysql-test/r/loaddata.result:
Fixed results after merge
mysql-test/r/lock.result:
Fixed results after merge
mysql-test/r/myisam.result:
Fixed results after merge
mysql-test/r/null.result:
Fixed results after merge
mysql-test/r/null_key.result:
Fixed results after merge
mysql-test/r/order_by.result:
Fixed results after merge
mysql-test/r/query_cache.result:
Fixed results after merge
mysql-test/r/range.result:
Fixed results after merge
mysql-test/r/rpl_multi_delete.result:
Fixed results after merge
mysql-test/r/rpl_until.result:
Fixed results after merge
mysql-test/r/subselect.result:
Fixed results after merge
mysql-test/r/subselect_innodb.result:
Fixed results after merge
mysql-test/r/type_blob.result:
Fixed results after merge
mysql-test/r/type_datetime.result:
Fixed results after merge
mysql-test/r/type_decimal.result:
Fixed results after merge
mysql-test/r/type_enum.result:
Fixed results after merge
mysql-test/r/type_float.result:
Fixed results after merge
mysql-test/r/type_ranges.result:
Fixed results after merge
mysql-test/r/type_time.result:
Fixed results after merge
mysql-test/r/type_timestamp.result:
Fixed results after merge
mysql-test/r/type_uint.result:
Fixed results after merge
mysql-test/r/type_year.result:
Fixed results after merge
mysql-test/r/variables.result:
Fixed results after merge
mysql-test/r/warnings.result:
Fixed results after merge
mysql-test/t/case.test:
Fixed shifted error messages
mysql-test/t/create.test:
Fixed shifted error messages
mysql-test/t/ctype_collate.test:
Fixed shifted error messages
mysql-test/t/ctype_tis620.test:
Merge with 4.0 ctype_tis620 test
mysql-test/t/delete.test:
Fixed shifted error messages
mysql-test/t/derived.test:
Fixed shifted error messages
mysql-test/t/fulltext.test:
Fixed shifted error messages
mysql-test/t/func_in.test:
Fixed shifted error messages
mysql-test/t/func_str.test:
Fixed shifted error messages
mysql-test/t/func_test.test:
Fixed shifted error messages
mysql-test/t/grant.test:
Fixed shifted error messages
mysql-test/t/innodb.test:
Change to 4.1 syntax
mysql-test/t/key_cache.test:
Fixed shifted error messages
mysql-test/t/myisam.test:
New test of blob and end space
mysql-test/t/row.test:
Fixed shifted error messages
mysql-test/t/rpl_until.test:
Fixed shifted error messages
mysql-test/t/subselect.test:
Fixed shifted error messages
mysql-test/t/subselect_innodb.test:
Fix test to take into account foreign key constraints
mysql-test/t/union.test:
Fixed shifted error messages
mysql-test/t/user_var.test:
Fixed shifted error messages
mysql-test/t/variables.test:
Fixed shifted error messages
mysys/my_handler.c:
Merge with 4.0 code
sql/ha_heap.cc:
After merge fixes
sql/handler.cc:
After merge fixes
sql/item.cc:
After merge fixes
sql/item_cmpfunc.cc:
Ensure that we are comparing end space with BINARY strings
sql/item_cmpfunc.h:
Ensure that we are comparing end space with BINARY strings
sql/log_event.cc:
More DBUG statements
Ensure that we use all options to LOAD DATA in replication
sql/opt_range.cc:
After merge fixes
sql/sql_db.cc:
After merge fixes
sql/sql_handler.cc:
After merge fixes
Use 'any_db' instead of '' to mean 'no database comparison'
sql/sql_parse.cc:
After merge fixes
sql/sql_select.cc:
After merge fixes
Added function comment for setup_group()
sql/sql_string.cc:
Added stringcmp() for binary comparison.
Added function comments for sortcmp() and stringcmp()
sql/sql_string.h:
Added stringcmp()
sql/sql_table.cc:
After merge fixes
sql/sql_update.cc:
After merge fixes
sql/sql_yacc.yy:
Use 'any_db' instead of '' to mean any database. Using "" causes a 'wrong db name' error.
strings/ctype-big5.c:
Strip only end space, not other space characters.
strings/ctype-bin.c:
Removed some not needed functions.
Added function comments
Don't remove end space in comparisons
Change my_wildcmp_bin() to be 'identical' with other similar code
strings/ctype-czech.c:
Strip only end space, not other space characters.
strings/ctype-gbk.c:
Strip only end space, not other space characters.
strings/ctype-latin1.c:
Strip only end space, not other space characters.
strings/ctype-mb.c:
Strip only end space, not other space characters.
strings/ctype-simple.c:
Strip only end space, not other space characters.
strings/ctype-sjis.c:
Strip only end space, not other space characters.
strings/ctype-tis620.c:
Added usage of my_instr_simple. This needs to be cleaned up!
strings/ctype-utf8.c:
Strip only end space, not other space characters.
strings/ctype-win1250ch.c:
Strip only end space, not other space characters.
Fixed indentation
strings/strto.c:
Code cleanup
2004-02-16 09:03:25 +01:00
|
|
|
select concat(_latin1'a',_latin2'a',_latin5'a');
|
|
|
|
--error 1271
|
2003-07-04 15:12:23 +02:00
|
|
|
select concat(_latin1'a',_latin2'a',_latin5'a',_latin7'a');
|
2004-03-19 09:09:14 +01:00
|
|
|
--error 1267
|
|
|
|
select concat_ws(_latin1'a',_latin2'a');
|
2003-07-04 15:12:23 +02:00
|
|
|
|
2003-07-03 16:24:38 +02:00
|
|
|
#
|
|
|
|
# Test FIELD() and collations
|
|
|
|
#
|
|
|
|
select FIELD('b','A','B');
|
|
|
|
select FIELD('B','A','B');
|
|
|
|
select FIELD('b' COLLATE latin1_bin,'A','B');
|
|
|
|
select FIELD('b','A' COLLATE latin1_bin,'B');
|
After merge fixes
Added more DBUG statements
Ensure that we are comparing end space with BINARY strings
Use 'any_db' instead of '' to mean any database. (For HANDLER command)
Only strip ' ' when comparing CHAR, not other space-like characters (like \t)
BitKeeper/deleted/.del-ctype_tis620.result-old~3578ceb0b8284685:
Delete: mysql-test/r/ctype_tis620.result-old
BitKeeper/deleted/.del-ctype_tis620.test-old~ffb1bbd2935d1aba:
Delete: mysql-test/t/ctype_tis620.test-old
client/mysqlbinlog.cc:
Added DBUG statements
Added call of my_end() to free all used memory on exit
heap/hp_info.c:
After merge fixes
heap/hp_open.c:
After merge fixes
include/heap.h:
After merge fixes
include/m_ctype.h:
Use pchar instead of 'int' for character parameters.
Added 'my_binary_compare()'
include/m_string.h:
Fixed wrong define
innobase/ibuf/ibuf0ibuf.c:
After merge fixes
innobase/srv/srv0start.c:
After merge fixes
mysql-test/r/alter_table.result:
Fixed results after merge
mysql-test/r/auto_increment.result:
Fixed results after merge
mysql-test/r/bdb.result:
Fixed results after merge
mysql-test/r/binary.result:
Fixed results after merge
mysql-test/r/create.result:
Fixed results after merge
mysql-test/r/ctype_mb.result:
Fixed results after merge
mysql-test/r/ctype_tis620.result:
Fixed results after merge
mysql-test/r/ctype_utf8.result:
Fixed results after merge
mysql-test/r/delete.result:
Fixed results after merge
mysql-test/r/func_compress.result:
Fixed results after merge
mysql-test/r/func_gconcat.result:
Fixed results after merge
mysql-test/r/func_group.result:
Fixed results after merge
mysql-test/r/func_str.result:
Fixed results after merge
mysql-test/r/innodb.result:
Fixed results after merge
mysql-test/r/insert.result:
Fixed results after merge
mysql-test/r/insert_select.result:
Fixed results after merge
mysql-test/r/key.result:
Fixed results after merge
mysql-test/r/loaddata.result:
Fixed results after merge
mysql-test/r/lock.result:
Fixed results after merge
mysql-test/r/myisam.result:
Fixed results after merge
mysql-test/r/null.result:
Fixed results after merge
mysql-test/r/null_key.result:
Fixed results after merge
mysql-test/r/order_by.result:
Fixed results after merge
mysql-test/r/query_cache.result:
Fixed results after merge
mysql-test/r/range.result:
Fixed results after merge
mysql-test/r/rpl_multi_delete.result:
Fixed results after merge
mysql-test/r/rpl_until.result:
Fixed results after merge
mysql-test/r/subselect.result:
Fixed results after merge
mysql-test/r/subselect_innodb.result:
Fixed results after merge
mysql-test/r/type_blob.result:
Fixed results after merge
mysql-test/r/type_datetime.result:
Fixed results after merge
mysql-test/r/type_decimal.result:
Fixed results after merge
mysql-test/r/type_enum.result:
Fixed results after merge
mysql-test/r/type_float.result:
Fixed results after merge
mysql-test/r/type_ranges.result:
Fixed results after merge
mysql-test/r/type_time.result:
Fixed results after merge
mysql-test/r/type_timestamp.result:
Fixed results after merge
mysql-test/r/type_uint.result:
Fixed results after merge
mysql-test/r/type_year.result:
Fixed results after merge
mysql-test/r/variables.result:
Fixed results after merge
mysql-test/r/warnings.result:
Fixed results after merge
mysql-test/t/case.test:
Fixed shifted error messages
mysql-test/t/create.test:
Fixed shifted error messages
mysql-test/t/ctype_collate.test:
Fixed shifted error messages
mysql-test/t/ctype_tis620.test:
Merge with 4.0 ctype_tis620 test
mysql-test/t/delete.test:
Fixed shifted error messages
mysql-test/t/derived.test:
Fixed shifted error messages
mysql-test/t/fulltext.test:
Fixed shifted error messages
mysql-test/t/func_in.test:
Fixed shifted error messages
mysql-test/t/func_str.test:
Fixed shifted error messages
mysql-test/t/func_test.test:
Fixed shifted error messages
mysql-test/t/grant.test:
Fixed shifted error messages
mysql-test/t/innodb.test:
Change to 4.1 syntax
mysql-test/t/key_cache.test:
Fixed shifted error messages
mysql-test/t/myisam.test:
New test of blob and end space
mysql-test/t/row.test:
Fixed shifted error messages
mysql-test/t/rpl_until.test:
Fixed shifted error messages
mysql-test/t/subselect.test:
Fixed shifted error messages
mysql-test/t/subselect_innodb.test:
Fix test to take into account foreign key constraints
mysql-test/t/union.test:
Fixed shifted error messages
mysql-test/t/user_var.test:
Fixed shifted error messages
mysql-test/t/variables.test:
Fixed shifted error messages
mysys/my_handler.c:
Merge with 4.0 code
sql/ha_heap.cc:
After merge fixes
sql/handler.cc:
After merge fixes
sql/item.cc:
After merge fixes
sql/item_cmpfunc.cc:
Ensure that we are comparing end space with BINARY strings
sql/item_cmpfunc.h:
Ensure that we are comparing end space with BINARY strings
sql/log_event.cc:
More DBUG statements
Ensure that we use all options to LOAD DATA in replication
sql/opt_range.cc:
After merge fixes
sql/sql_db.cc:
After merge fixes
sql/sql_handler.cc:
After merge fixes
Use 'any_db' instead of '' to mean 'no database comparison'
sql/sql_parse.cc:
After merge fixes
sql/sql_select.cc:
After merge fixes
Added function comment for setup_group()
sql/sql_string.cc:
Added stringcmp() for binary comparison.
Added function comments for sortcmp() and stringcmp()
sql/sql_string.h:
Added stringcmp()
sql/sql_table.cc:
After merge fixes
sql/sql_update.cc:
After merge fixes
sql/sql_yacc.yy:
Use 'any_db' instead of '' to mean any database. Using "" causes a 'wrong db name' error.
strings/ctype-big5.c:
Strip only end space, not other space characters.
strings/ctype-bin.c:
Removed some not needed functions.
Added function comments
Don't remove end space in comparisons
Change my_wildcmp_bin() to be 'identical' with other similar code
strings/ctype-czech.c:
Strip only end space, not other space characters.
strings/ctype-gbk.c:
Strip only end space, not other space characters.
strings/ctype-latin1.c:
Strip only end space, not other space characters.
strings/ctype-mb.c:
Strip only end space, not other space characters.
strings/ctype-simple.c:
Strip only end space, not other space characters.
strings/ctype-sjis.c:
Strip only end space, not other space characters.
strings/ctype-tis620.c:
Added usage of my_instr_simple. This needs to be cleaned up!
strings/ctype-utf8.c:
Strip only end space, not other space characters.
strings/ctype-win1250ch.c:
Strip only end space, not other space characters.
Fixed indentation
strings/strto.c:
Code cleanup
2004-02-16 09:03:25 +01:00
|
|
|
--error 1270
|
2003-07-03 16:24:38 +02:00
|
|
|
select FIELD(_latin2'b','A','B');
|
After merge fixes
Added more DBUG statements
Ensure that we are comparing end space with BINARY strings
Use 'any_db' instead of '' to mean any database. (For HANDLER command)
Only strip ' ' when comparing CHAR, not other space-like characters (like \t)
BitKeeper/deleted/.del-ctype_tis620.result-old~3578ceb0b8284685:
Delete: mysql-test/r/ctype_tis620.result-old
BitKeeper/deleted/.del-ctype_tis620.test-old~ffb1bbd2935d1aba:
Delete: mysql-test/t/ctype_tis620.test-old
client/mysqlbinlog.cc:
Added DBUG statements
Added call of my_end() to free all used memory on exit
heap/hp_info.c:
After merge fixes
heap/hp_open.c:
After merge fixes
include/heap.h:
After merge fixes
include/m_ctype.h:
Use pchar instead of 'int' for character parameters.
Added 'my_binary_compare()'
include/m_string.h:
Fixed wrong define
innobase/ibuf/ibuf0ibuf.c:
After merge fixes
innobase/srv/srv0start.c:
After merge fixes
mysql-test/r/alter_table.result:
Fixed results after merge
mysql-test/r/auto_increment.result:
Fixed results after merge
mysql-test/r/bdb.result:
Fixed results after merge
mysql-test/r/binary.result:
Fixed results after merge
mysql-test/r/create.result:
Fixed results after merge
mysql-test/r/ctype_mb.result:
Fixed results after merge
mysql-test/r/ctype_tis620.result:
Fixed results after merge
mysql-test/r/ctype_utf8.result:
Fixed results after merge
mysql-test/r/delete.result:
Fixed results after merge
mysql-test/r/func_compress.result:
Fixed results after merge
mysql-test/r/func_gconcat.result:
Fixed results after merge
mysql-test/r/func_group.result:
Fixed results after merge
mysql-test/r/func_str.result:
Fixed results after merge
mysql-test/r/innodb.result:
Fixed results after merge
mysql-test/r/insert.result:
Fixed results after merge
mysql-test/r/insert_select.result:
Fixed results after merge
mysql-test/r/key.result:
Fixed results after merge
mysql-test/r/loaddata.result:
Fixed results after merge
mysql-test/r/lock.result:
Fixed results after merge
mysql-test/r/myisam.result:
Fixed results after merge
mysql-test/r/null.result:
Fixed results after merge
mysql-test/r/null_key.result:
Fixed results after merge
mysql-test/r/order_by.result:
Fixed results after merge
mysql-test/r/query_cache.result:
Fixed results after merge
mysql-test/r/range.result:
Fixed results after merge
mysql-test/r/rpl_multi_delete.result:
Fixed results after merge
mysql-test/r/rpl_until.result:
Fixed results after merge
mysql-test/r/subselect.result:
Fixed results after merge
mysql-test/r/subselect_innodb.result:
Fixed results after merge
mysql-test/r/type_blob.result:
Fixed results after merge
mysql-test/r/type_datetime.result:
Fixed results after merge
mysql-test/r/type_decimal.result:
Fixed results after merge
mysql-test/r/type_enum.result:
Fixed results after merge
mysql-test/r/type_float.result:
Fixed results after merge
mysql-test/r/type_ranges.result:
Fixed results after merge
mysql-test/r/type_time.result:
Fixed results after merge
mysql-test/r/type_timestamp.result:
Fixed results after merge
mysql-test/r/type_uint.result:
Fixed results after merge
mysql-test/r/type_year.result:
Fixed results after merge
mysql-test/r/variables.result:
Fixed results after merge
mysql-test/r/warnings.result:
Fixed results after merge
mysql-test/t/case.test:
Fixed shifted error messages
mysql-test/t/create.test:
Fixed shifted error messages
mysql-test/t/ctype_collate.test:
Fixed shifted error messages
mysql-test/t/ctype_tis620.test:
Merge with 4.0 ctype_tis620 test
mysql-test/t/delete.test:
Fixed shifted error messages
mysql-test/t/derived.test:
Fixed shifted error messages
mysql-test/t/fulltext.test:
Fixed shifted error messages
mysql-test/t/func_in.test:
Fixed shifted error messages
mysql-test/t/func_str.test:
Fixed shifted error messages
mysql-test/t/func_test.test:
Fixed shifted error messages
mysql-test/t/grant.test:
Fixed shifted error messages
mysql-test/t/innodb.test:
Change to 4.1 syntax
mysql-test/t/key_cache.test:
Fixed shifted error messages
mysql-test/t/myisam.test:
New test of blob and end space
mysql-test/t/row.test:
Fixed shifted error messages
mysql-test/t/rpl_until.test:
Fixed shifted error messages
mysql-test/t/subselect.test:
Fixed shifted error messages
mysql-test/t/subselect_innodb.test:
Fix test to take into account foreign key constraints
mysql-test/t/union.test:
Fixed shifted error messages
mysql-test/t/user_var.test:
Fixed shifted error messages
mysql-test/t/variables.test:
Fixed shifted error messages
mysys/my_handler.c:
Merge with 4.0 code
sql/ha_heap.cc:
After merge fixes
sql/handler.cc:
After merge fixes
sql/item.cc:
After merge fixes
sql/item_cmpfunc.cc:
Ensure that we are comparing end space with BINARY strings
sql/item_cmpfunc.h:
Ensure that we are comparing end space with BINARY strings
sql/log_event.cc:
More DBUG statements
Ensure that we use all options to LOAD DATA in replication
sql/opt_range.cc:
After merge fixes
sql/sql_db.cc:
After merge fixes
sql/sql_handler.cc:
After merge fixes
Use 'any_db' instead of '' to mean 'no database comparison'
sql/sql_parse.cc:
After merge fixes
sql/sql_select.cc:
After merge fixes
Added function comment for setup_group()
sql/sql_string.cc:
Added stringcmp() for binary comparison.
Added function comments for sortcmp() and stringcmp()
sql/sql_string.h:
Added stringcmp()
sql/sql_table.cc:
After merge fixes
sql/sql_update.cc:
After merge fixes
sql/sql_yacc.yy:
Use 'any_db' instead of '' to mean any database. Using "" causes a 'wrong db name' error.
strings/ctype-big5.c:
Strip only end space, not other space characters.
strings/ctype-bin.c:
Removed some not needed functions.
Added function comments
Don't remove end space in comparisons
Change my_wildcmp_bin() to be 'identical' with other similar code
strings/ctype-czech.c:
Strip only end space, not other space characters.
strings/ctype-gbk.c:
Strip only end space, not other space characters.
strings/ctype-latin1.c:
Strip only end space, not other space characters.
strings/ctype-mb.c:
Strip only end space, not other space characters.
strings/ctype-simple.c:
Strip only end space, not other space characters.
strings/ctype-sjis.c:
Strip only end space, not other space characters.
strings/ctype-tis620.c:
Added usage of my_instr_simple. This needs to be cleaned up!
strings/ctype-utf8.c:
Strip only end space, not other space characters.
strings/ctype-win1250ch.c:
Strip only end space, not other space characters.
Fixed indentation
strings/strto.c:
Code cleanup
2004-02-16 09:03:25 +01:00
|
|
|
--error 1270
|
2003-07-03 16:24:38 +02:00
|
|
|
select FIELD('b',_latin2'A','B');
|
2005-04-01 14:04:50 +02:00
|
|
|
select FIELD('1',_latin2'3','2',1);
|
2003-07-03 16:24:38 +02:00
|
|
|
|
2003-06-25 12:07:20 +02:00
|
|
|
select POSITION(_latin1'B' IN _latin1'abcd');
|
|
|
|
select POSITION(_latin1'B' IN _latin1'abcd' COLLATE latin1_bin);
|
|
|
|
select POSITION(_latin1'B' COLLATE latin1_bin IN _latin1'abcd');
|
After merge fixes
Added more DBUG statements
Ensure that we are comparing end space with BINARY strings
Use 'any_db' instead of '' to mean any database. (For HANDLER command)
Only strip ' ' when comparing CHAR, not other space-like characters (like \t)
BitKeeper/deleted/.del-ctype_tis620.result-old~3578ceb0b8284685:
Delete: mysql-test/r/ctype_tis620.result-old
BitKeeper/deleted/.del-ctype_tis620.test-old~ffb1bbd2935d1aba:
Delete: mysql-test/t/ctype_tis620.test-old
client/mysqlbinlog.cc:
Added DBUG statements
Added call of my_end() to free all used memory on exit
heap/hp_info.c:
After merge fixes
heap/hp_open.c:
After merge fixes
include/heap.h:
After merge fixes
include/m_ctype.h:
Use pchar instead of 'int' for character parameters.
Added 'my_binary_compare()'
include/m_string.h:
Fixed wrong define
innobase/ibuf/ibuf0ibuf.c:
After merge fixes
innobase/srv/srv0start.c:
After merge fixes
mysql-test/r/alter_table.result:
Fixed results after merge
mysql-test/r/auto_increment.result:
Fixed results after merge
mysql-test/r/bdb.result:
Fixed results after merge
mysql-test/r/binary.result:
Fixed results after merge
mysql-test/r/create.result:
Fixed results after merge
mysql-test/r/ctype_mb.result:
Fixed results after merge
mysql-test/r/ctype_tis620.result:
Fixed results after merge
mysql-test/r/ctype_utf8.result:
Fixed results after merge
mysql-test/r/delete.result:
Fixed results after merge
mysql-test/r/func_compress.result:
Fixed results after merge
mysql-test/r/func_gconcat.result:
Fixed results after merge
mysql-test/r/func_group.result:
Fixed results after merge
mysql-test/r/func_str.result:
Fixed results after merge
mysql-test/r/innodb.result:
Fixed results after merge
mysql-test/r/insert.result:
Fixed results after merge
mysql-test/r/insert_select.result:
Fixed results after merge
mysql-test/r/key.result:
Fixed results after merge
mysql-test/r/loaddata.result:
Fixed results after merge
mysql-test/r/lock.result:
Fixed results after merge
mysql-test/r/myisam.result:
Fixed results after merge
mysql-test/r/null.result:
Fixed results after merge
mysql-test/r/null_key.result:
Fixed results after merge
mysql-test/r/order_by.result:
Fixed results after merge
mysql-test/r/query_cache.result:
Fixed results after merge
mysql-test/r/range.result:
Fixed results after merge
mysql-test/r/rpl_multi_delete.result:
Fixed results after merge
mysql-test/r/rpl_until.result:
Fixed results after merge
mysql-test/r/subselect.result:
Fixed results after merge
mysql-test/r/subselect_innodb.result:
Fixed results after merge
mysql-test/r/type_blob.result:
Fixed results after merge
mysql-test/r/type_datetime.result:
Fixed results after merge
mysql-test/r/type_decimal.result:
Fixed results after merge
mysql-test/r/type_enum.result:
Fixed results after merge
mysql-test/r/type_float.result:
Fixed results after merge
mysql-test/r/type_ranges.result:
Fixed results after merge
mysql-test/r/type_time.result:
Fixed results after merge
mysql-test/r/type_timestamp.result:
Fixed results after merge
mysql-test/r/type_uint.result:
Fixed results after merge
mysql-test/r/type_year.result:
Fixed results after merge
mysql-test/r/variables.result:
Fixed results after merge
mysql-test/r/warnings.result:
Fixed results after merge
mysql-test/t/case.test:
Fixed shifted error messages
mysql-test/t/create.test:
Fixed shifted error messages
mysql-test/t/ctype_collate.test:
Fixed shifted error messages
mysql-test/t/ctype_tis620.test:
Merge with 4.0 ctype_tis620 test
mysql-test/t/delete.test:
Fixed shifted error messages
mysql-test/t/derived.test:
Fixed shifted error messages
mysql-test/t/fulltext.test:
Fixed shifted error messages
mysql-test/t/func_in.test:
Fixed shifted error messages
mysql-test/t/func_str.test:
Fixed shifted error messages
mysql-test/t/func_test.test:
Fixed shifted error messages
mysql-test/t/grant.test:
Fixed shifted error messages
mysql-test/t/innodb.test:
Change to 4.1 syntax
mysql-test/t/key_cache.test:
Fixed shifted error messages
mysql-test/t/myisam.test:
New test of blob and end space
mysql-test/t/row.test:
Fixed shifted error messages
mysql-test/t/rpl_until.test:
Fixed shifted error messages
mysql-test/t/subselect.test:
Fixed shifted error messages
mysql-test/t/subselect_innodb.test:
Fix test to take into account foreign key constraints
mysql-test/t/union.test:
Fixed shifted error messages
mysql-test/t/user_var.test:
Fixed shifted error messages
mysql-test/t/variables.test:
Fixed shifted error messages
mysys/my_handler.c:
Merge with 4.0 code
sql/ha_heap.cc:
After merge fixes
sql/handler.cc:
After merge fixes
sql/item.cc:
After merge fixes
sql/item_cmpfunc.cc:
Ensure that we are comparing end space with BINARY strings
sql/item_cmpfunc.h:
Ensure that we are comparing end space with BINARY strings
sql/log_event.cc:
More DBUG statements
Ensure that we use all options to LOAD DATA in replication
sql/opt_range.cc:
After merge fixes
sql/sql_db.cc:
After merge fixes
sql/sql_handler.cc:
After merge fixes
Use 'any_db' instead of '' to mean 'no database comparison'
sql/sql_parse.cc:
After merge fixes
sql/sql_select.cc:
After merge fixes
Added function comment for setup_group()
sql/sql_string.cc:
Added stringcmp() for binary comparison.
Added function comments for sortcmp() and stringcmp()
sql/sql_string.h:
Added stringcmp()
sql/sql_table.cc:
After merge fixes
sql/sql_update.cc:
After merge fixes
sql/sql_yacc.yy:
Use 'any_db' instead of '' to mean any database. Using "" causes a 'wrong db name' error.
strings/ctype-big5.c:
Strip only end space, not other space characters.
strings/ctype-bin.c:
Removed some not needed functions.
Added function comments
Don't remove end space in comparisons
Change my_wildcmp_bin() to be 'identical' with other similar code
strings/ctype-czech.c:
Strip only end space, not other space characters.
strings/ctype-gbk.c:
Strip only end space, not other space characters.
strings/ctype-latin1.c:
Strip only end space, not other space characters.
strings/ctype-mb.c:
Strip only end space, not other space characters.
strings/ctype-simple.c:
Strip only end space, not other space characters.
strings/ctype-sjis.c:
Strip only end space, not other space characters.
strings/ctype-tis620.c:
Added usage of my_instr_simple. This needs to be cleaned up!
strings/ctype-utf8.c:
Strip only end space, not other space characters.
strings/ctype-win1250ch.c:
Strip only end space, not other space characters.
Fixed indentation
strings/strto.c:
Code cleanup
2004-02-16 09:03:25 +01:00
|
|
|
--error 1267
|
2003-06-25 12:07:20 +02:00
|
|
|
select POSITION(_latin1'B' COLLATE latin1_general_ci IN _latin1'abcd' COLLATE latin1_bin);
|
After merge fixes
Added more DBUG statements
Ensure that we are comparing end space with BINARY strings
Use 'any_db' instead of '' to mean any database. (For HANDLER command)
Only strip ' ' when comparing CHAR, not other space-like characters (like \t)
BitKeeper/deleted/.del-ctype_tis620.result-old~3578ceb0b8284685:
Delete: mysql-test/r/ctype_tis620.result-old
BitKeeper/deleted/.del-ctype_tis620.test-old~ffb1bbd2935d1aba:
Delete: mysql-test/t/ctype_tis620.test-old
client/mysqlbinlog.cc:
Added DBUG statements
Added call of my_end() to free all used memory on exit
heap/hp_info.c:
After merge fixes
heap/hp_open.c:
After merge fixes
include/heap.h:
After merge fixes
include/m_ctype.h:
Use pchar instead of 'int' for character parameters.
Added 'my_binary_compare()'
include/m_string.h:
Fixed wrong define
innobase/ibuf/ibuf0ibuf.c:
After merge fixes
innobase/srv/srv0start.c:
After merge fixes
mysql-test/r/alter_table.result:
Fixed results after merge
mysql-test/r/auto_increment.result:
Fixed results after merge
mysql-test/r/bdb.result:
Fixed results after merge
mysql-test/r/binary.result:
Fixed results after merge
mysql-test/r/create.result:
Fixed results after merge
mysql-test/r/ctype_mb.result:
Fixed results after merge
mysql-test/r/ctype_tis620.result:
Fixed results after merge
mysql-test/r/ctype_utf8.result:
Fixed results after merge
mysql-test/r/delete.result:
Fixed results after merge
mysql-test/r/func_compress.result:
Fixed results after merge
mysql-test/r/func_gconcat.result:
Fixed results after merge
mysql-test/r/func_group.result:
Fixed results after merge
mysql-test/r/func_str.result:
Fixed results after merge
mysql-test/r/innodb.result:
Fixed results after merge
mysql-test/r/insert.result:
Fixed results after merge
mysql-test/r/insert_select.result:
Fixed results after merge
mysql-test/r/key.result:
Fixed results after merge
mysql-test/r/loaddata.result:
Fixed results after merge
mysql-test/r/lock.result:
Fixed results after merge
mysql-test/r/myisam.result:
Fixed results after merge
mysql-test/r/null.result:
Fixed results after merge
mysql-test/r/null_key.result:
Fixed results after merge
mysql-test/r/order_by.result:
Fixed results after merge
mysql-test/r/query_cache.result:
Fixed results after merge
mysql-test/r/range.result:
Fixed results after merge
mysql-test/r/rpl_multi_delete.result:
Fixed results after merge
mysql-test/r/rpl_until.result:
Fixed results after merge
mysql-test/r/subselect.result:
Fixed results after merge
mysql-test/r/subselect_innodb.result:
Fixed results after merge
mysql-test/r/type_blob.result:
Fixed results after merge
mysql-test/r/type_datetime.result:
Fixed results after merge
mysql-test/r/type_decimal.result:
Fixed results after merge
mysql-test/r/type_enum.result:
Fixed results after merge
mysql-test/r/type_float.result:
Fixed results after merge
mysql-test/r/type_ranges.result:
Fixed results after merge
mysql-test/r/type_time.result:
Fixed results after merge
mysql-test/r/type_timestamp.result:
Fixed results after merge
mysql-test/r/type_uint.result:
Fixed results after merge
mysql-test/r/type_year.result:
Fixed results after merge
mysql-test/r/variables.result:
Fixed results after merge
mysql-test/r/warnings.result:
Fixed results after merge
mysql-test/t/case.test:
Fixed shifted error messages
mysql-test/t/create.test:
Fixed shifted error messages
mysql-test/t/ctype_collate.test:
Fixed shifted error messages
mysql-test/t/ctype_tis620.test:
Merge with 4.0 ctype_tis620 test
mysql-test/t/delete.test:
Fixed shifted error messages
mysql-test/t/derived.test:
Fixed shifted error messages
mysql-test/t/fulltext.test:
Fixed shifted error messages
mysql-test/t/func_in.test:
Fixed shifted error messages
mysql-test/t/func_str.test:
Fixed shifted error messages
mysql-test/t/func_test.test:
Fixed shifted error messages
mysql-test/t/grant.test:
Fixed shifted error messages
mysql-test/t/innodb.test:
Change to 4.1 syntax
mysql-test/t/key_cache.test:
Fixed shifted error messages
mysql-test/t/myisam.test:
New test of blob and end space
mysql-test/t/row.test:
Fixed shifted error messages
mysql-test/t/rpl_until.test:
Fixed shifted error messages
mysql-test/t/subselect.test:
Fixed shifted error messages
mysql-test/t/subselect_innodb.test:
Fix test to take into account foreign key constraints
mysql-test/t/union.test:
Fixed shifted error messages
mysql-test/t/user_var.test:
Fixed shifted error messages
mysql-test/t/variables.test:
Fixed shifted error messages
mysys/my_handler.c:
Merge with 4.0 code
sql/ha_heap.cc:
After merge fixes
sql/handler.cc:
After merge fixes
sql/item.cc:
After merge fixes
sql/item_cmpfunc.cc:
Ensure that we are comparing end space with BINARY strings
sql/item_cmpfunc.h:
Ensure that we are comparing end space with BINARY strings
sql/log_event.cc:
More DBUG statements
Ensure that we use all options to LOAD DATA in replication
sql/opt_range.cc:
After merge fixes
sql/sql_db.cc:
After merge fixes
sql/sql_handler.cc:
After merge fixes
Use 'any_db' instead of '' to mean 'no database comparison'
sql/sql_parse.cc:
After merge fixes
sql/sql_select.cc:
After merge fixes
Added function comment for setup_group()
sql/sql_string.cc:
Added stringcmp() for binary comparison.
Added function comments for sortcmp() and stringcmp()
sql/sql_string.h:
Added stringcmp()
sql/sql_table.cc:
After merge fixes
sql/sql_update.cc:
After merge fixes
sql/sql_yacc.yy:
Use 'any_db' instead of '' to mean any database. Using "" causes a 'wrong db name' error.
strings/ctype-big5.c:
Strip only end space, not other space characters.
strings/ctype-bin.c:
Removed some not needed functions.
Added function comments
Don't remove end space in comparisons
Change my_wildcmp_bin() to be 'identical' with other similar code
strings/ctype-czech.c:
Strip only end space, not other space characters.
strings/ctype-gbk.c:
Strip only end space, not other space characters.
strings/ctype-latin1.c:
Strip only end space, not other space characters.
strings/ctype-mb.c:
Strip only end space, not other space characters.
strings/ctype-simple.c:
Strip only end space, not other space characters.
strings/ctype-sjis.c:
Strip only end space, not other space characters.
strings/ctype-tis620.c:
Added usage of my_instr_simple. This needs to be cleaned up!
strings/ctype-utf8.c:
Strip only end space, not other space characters.
strings/ctype-win1250ch.c:
Strip only end space, not other space characters.
Fixed indentation
strings/strto.c:
Code cleanup
2004-02-16 09:03:25 +01:00
|
|
|
--error 1267
|
2003-06-25 12:07:20 +02:00
|
|
|
select POSITION(_latin1'B' IN _latin2'abcd');
|
|
|
|
|
|
|
|
select FIND_IN_SET(_latin1'B',_latin1'a,b,c,d');
|
2006-11-20 21:42:06 +01:00
|
|
|
|
|
|
|
# fix this:
|
|
|
|
--disable_parsing
|
|
|
|
select FIND_IN_SET(_latin1'B',_latin1'a,b,c,d' COLLATE latin1_bin);
|
|
|
|
select FIND_IN_SET(_latin1'B' COLLATE latin1_bin,_latin1'a,b,c,d');
|
|
|
|
--enable_parsing
|
|
|
|
|
After merge fixes
Added more DBUG statements
Ensure that we are comparing end space with BINARY strings
Use 'any_db' instead of '' to mean any database. (For HANDLER command)
Only strip ' ' when comparing CHAR, not other space-like characters (like \t)
BitKeeper/deleted/.del-ctype_tis620.result-old~3578ceb0b8284685:
Delete: mysql-test/r/ctype_tis620.result-old
BitKeeper/deleted/.del-ctype_tis620.test-old~ffb1bbd2935d1aba:
Delete: mysql-test/t/ctype_tis620.test-old
client/mysqlbinlog.cc:
Added DBUG statements
Added call of my_end() to free all used memory on exit
heap/hp_info.c:
After merge fixes
heap/hp_open.c:
After merge fixes
include/heap.h:
After merge fixes
include/m_ctype.h:
Use pchar instead of 'int' for character parameters.
Added 'my_binary_compare()'
include/m_string.h:
Fixed wrong define
innobase/ibuf/ibuf0ibuf.c:
After merge fixes
innobase/srv/srv0start.c:
After merge fixes
mysql-test/r/alter_table.result:
Fixed results after merge
mysql-test/r/auto_increment.result:
Fixed results after merge
mysql-test/r/bdb.result:
Fixed results after merge
mysql-test/r/binary.result:
Fixed results after merge
mysql-test/r/create.result:
Fixed results after merge
mysql-test/r/ctype_mb.result:
Fixed results after merge
mysql-test/r/ctype_tis620.result:
Fixed results after merge
mysql-test/r/ctype_utf8.result:
Fixed results after merge
mysql-test/r/delete.result:
Fixed results after merge
mysql-test/r/func_compress.result:
Fixed results after merge
mysql-test/r/func_gconcat.result:
Fixed results after merge
mysql-test/r/func_group.result:
Fixed results after merge
mysql-test/r/func_str.result:
Fixed results after merge
mysql-test/r/innodb.result:
Fixed results after merge
mysql-test/r/insert.result:
Fixed results after merge
mysql-test/r/insert_select.result:
Fixed results after merge
mysql-test/r/key.result:
Fixed results after merge
mysql-test/r/loaddata.result:
Fixed results after merge
mysql-test/r/lock.result:
Fixed results after merge
mysql-test/r/myisam.result:
Fixed results after merge
mysql-test/r/null.result:
Fixed results after merge
mysql-test/r/null_key.result:
Fixed results after merge
mysql-test/r/order_by.result:
Fixed results after merge
mysql-test/r/query_cache.result:
Fixed results after merge
mysql-test/r/range.result:
Fixed results after merge
mysql-test/r/rpl_multi_delete.result:
Fixed results after merge
mysql-test/r/rpl_until.result:
Fixed results after merge
mysql-test/r/subselect.result:
Fixed results after merge
mysql-test/r/subselect_innodb.result:
Fixed results after merge
mysql-test/r/type_blob.result:
Fixed results after merge
mysql-test/r/type_datetime.result:
Fixed results after merge
mysql-test/r/type_decimal.result:
Fixed results after merge
mysql-test/r/type_enum.result:
Fixed results after merge
mysql-test/r/type_float.result:
Fixed results after merge
mysql-test/r/type_ranges.result:
Fixed results after merge
mysql-test/r/type_time.result:
Fixed results after merge
mysql-test/r/type_timestamp.result:
Fixed results after merge
mysql-test/r/type_uint.result:
Fixed results after merge
mysql-test/r/type_year.result:
Fixed results after merge
mysql-test/r/variables.result:
Fixed results after merge
mysql-test/r/warnings.result:
Fixed results after merge
mysql-test/t/case.test:
Fixed shifted error messages
mysql-test/t/create.test:
Fixed shifted error messages
mysql-test/t/ctype_collate.test:
Fixed shifted error messages
mysql-test/t/ctype_tis620.test:
Merge with 4.0 ctype_tis620 test
mysql-test/t/delete.test:
Fixed shifted error messages
mysql-test/t/derived.test:
Fixed shifted error messages
mysql-test/t/fulltext.test:
Fixed shifted error messages
mysql-test/t/func_in.test:
Fixed shifted error messages
mysql-test/t/func_str.test:
Fixed shifted error messages
mysql-test/t/func_test.test:
Fixed shifted error messages
mysql-test/t/grant.test:
Fixed shifted error messages
mysql-test/t/innodb.test:
Change to 4.1 syntax
mysql-test/t/key_cache.test:
Fixed shifted error messages
mysql-test/t/myisam.test:
New test of blob and end space
mysql-test/t/row.test:
Fixed shifted error messages
mysql-test/t/rpl_until.test:
Fixed shifted error messages
mysql-test/t/subselect.test:
Fixed shifted error messages
mysql-test/t/subselect_innodb.test:
Fix test to take into account foreign key constraints
mysql-test/t/union.test:
Fixed shifted error messages
mysql-test/t/user_var.test:
Fixed shifted error messages
mysql-test/t/variables.test:
Fixed shifted error messages
mysys/my_handler.c:
Merge with 4.0 code
sql/ha_heap.cc:
After merge fixes
sql/handler.cc:
After merge fixes
sql/item.cc:
After merge fixes
sql/item_cmpfunc.cc:
Ensure that we are comparing end space with BINARY strings
sql/item_cmpfunc.h:
Ensure that we are comparing end space with BINARY strings
sql/log_event.cc:
More DBUG statements
Ensure that we use all options to LOAD DATA in replication
sql/opt_range.cc:
After merge fixes
sql/sql_db.cc:
After merge fixes
sql/sql_handler.cc:
After merge fixes
Use 'any_db' instead of '' to mean 'no database comparison'
sql/sql_parse.cc:
After merge fixes
sql/sql_select.cc:
After merge fixes
Added function comment for setup_group()
sql/sql_string.cc:
Added stringcmp() for binary comparison.
Added function comments for sortcmp() and stringcmp()
sql/sql_string.h:
Added stringcmp()
sql/sql_table.cc:
After merge fixes
sql/sql_update.cc:
After merge fixes
sql/sql_yacc.yy:
Use 'any_db' instead of '' to mean any database. Using "" causes a 'wrong db name' error.
strings/ctype-big5.c:
Strip only end space, not other space characters.
strings/ctype-bin.c:
Removed some not needed functions.
Added function comments
Don't remove end space in comparisons
Change my_wildcmp_bin() to be 'identical' with other similar code
strings/ctype-czech.c:
Strip only end space, not other space characters.
strings/ctype-gbk.c:
Strip only end space, not other space characters.
strings/ctype-latin1.c:
Strip only end space, not other space characters.
strings/ctype-mb.c:
Strip only end space, not other space characters.
strings/ctype-simple.c:
Strip only end space, not other space characters.
strings/ctype-sjis.c:
Strip only end space, not other space characters.
strings/ctype-tis620.c:
Added usage of my_instr_simple. This needs to be cleaned up!
strings/ctype-utf8.c:
Strip only end space, not other space characters.
strings/ctype-win1250ch.c:
Strip only end space, not other space characters.
Fixed indentation
strings/strto.c:
Code cleanup
2004-02-16 09:03:25 +01:00
|
|
|
--error 1267
|
2003-06-25 12:07:20 +02:00
|
|
|
select FIND_IN_SET(_latin1'B' COLLATE latin1_general_ci,_latin1'a,b,c,d' COLLATE latin1_bin);
|
After merge fixes
Added more DBUG statements
Ensure that we are comparing end space with BINARY strings
Use 'any_db' instead of '' to mean any database. (For HANDLER command)
Only strip ' ' when comparing CHAR, not other space-like characters (like \t)
BitKeeper/deleted/.del-ctype_tis620.result-old~3578ceb0b8284685:
Delete: mysql-test/r/ctype_tis620.result-old
BitKeeper/deleted/.del-ctype_tis620.test-old~ffb1bbd2935d1aba:
Delete: mysql-test/t/ctype_tis620.test-old
client/mysqlbinlog.cc:
Added DBUG statements
Added call of my_end() to free all used memory on exit
heap/hp_info.c:
After merge fixes
heap/hp_open.c:
After merge fixes
include/heap.h:
After merge fixes
include/m_ctype.h:
Use pchar instead of 'int' for character parameters.
Added 'my_binary_compare()'
include/m_string.h:
Fixed wrong define
innobase/ibuf/ibuf0ibuf.c:
After merge fixes
innobase/srv/srv0start.c:
After merge fixes
mysql-test/r/alter_table.result:
Fixed results after merge
mysql-test/r/auto_increment.result:
Fixed results after merge
mysql-test/r/bdb.result:
Fixed results after merge
mysql-test/r/binary.result:
Fixed results after merge
mysql-test/r/create.result:
Fixed results after merge
mysql-test/r/ctype_mb.result:
Fixed results after merge
mysql-test/r/ctype_tis620.result:
Fixed results after merge
mysql-test/r/ctype_utf8.result:
Fixed results after merge
mysql-test/r/delete.result:
Fixed results after merge
mysql-test/r/func_compress.result:
Fixed results after merge
mysql-test/r/func_gconcat.result:
Fixed results after merge
mysql-test/r/func_group.result:
Fixed results after merge
mysql-test/r/func_str.result:
Fixed results after merge
mysql-test/r/innodb.result:
Fixed results after merge
mysql-test/r/insert.result:
Fixed results after merge
mysql-test/r/insert_select.result:
Fixed results after merge
mysql-test/r/key.result:
Fixed results after merge
mysql-test/r/loaddata.result:
Fixed results after merge
mysql-test/r/lock.result:
Fixed results after merge
mysql-test/r/myisam.result:
Fixed results after merge
mysql-test/r/null.result:
Fixed results after merge
mysql-test/r/null_key.result:
Fixed results after merge
mysql-test/r/order_by.result:
Fixed results after merge
mysql-test/r/query_cache.result:
Fixed results after merge
mysql-test/r/range.result:
Fixed results after merge
mysql-test/r/rpl_multi_delete.result:
Fixed results after merge
mysql-test/r/rpl_until.result:
Fixed results after merge
mysql-test/r/subselect.result:
Fixed results after merge
mysql-test/r/subselect_innodb.result:
Fixed results after merge
mysql-test/r/type_blob.result:
Fixed results after merge
mysql-test/r/type_datetime.result:
Fixed results after merge
mysql-test/r/type_decimal.result:
Fixed results after merge
mysql-test/r/type_enum.result:
Fixed results after merge
mysql-test/r/type_float.result:
Fixed results after merge
mysql-test/r/type_ranges.result:
Fixed results after merge
mysql-test/r/type_time.result:
Fixed results after merge
mysql-test/r/type_timestamp.result:
Fixed results after merge
mysql-test/r/type_uint.result:
Fixed results after merge
mysql-test/r/type_year.result:
Fixed results after merge
mysql-test/r/variables.result:
Fixed results after merge
mysql-test/r/warnings.result:
Fixed results after merge
mysql-test/t/case.test:
Fixed shifted error messages
mysql-test/t/create.test:
Fixed shifted error messages
mysql-test/t/ctype_collate.test:
Fixed shifted error messages
mysql-test/t/ctype_tis620.test:
Merge with 4.0 ctype_tis620 test
mysql-test/t/delete.test:
Fixed shifted error messages
mysql-test/t/derived.test:
Fixed shifted error messages
mysql-test/t/fulltext.test:
Fixed shifted error messages
mysql-test/t/func_in.test:
Fixed shifted error messages
mysql-test/t/func_str.test:
Fixed shifted error messages
mysql-test/t/func_test.test:
Fixed shifted error messages
mysql-test/t/grant.test:
Fixed shifted error messages
mysql-test/t/innodb.test:
Change to 4.1 syntax
mysql-test/t/key_cache.test:
Fixed shifted error messages
mysql-test/t/myisam.test:
New test of blob and end space
mysql-test/t/row.test:
Fixed shifted error messages
mysql-test/t/rpl_until.test:
Fixed shifted error messages
mysql-test/t/subselect.test:
Fixed shifted error messages
mysql-test/t/subselect_innodb.test:
Fix test to take into account foreign key constraints
mysql-test/t/union.test:
Fixed shifted error messages
mysql-test/t/user_var.test:
Fixed shifted error messages
mysql-test/t/variables.test:
Fixed shifted error messages
mysys/my_handler.c:
Merge with 4.0 code
sql/ha_heap.cc:
After merge fixes
sql/handler.cc:
After merge fixes
sql/item.cc:
After merge fixes
sql/item_cmpfunc.cc:
Ensure that we are comparing end space with BINARY strings
sql/item_cmpfunc.h:
Ensure that we are comparing end space with BINARY strings
sql/log_event.cc:
More DBUG statements
Ensure that we use all options to LOAD DATA in replication
sql/opt_range.cc:
After merge fixes
sql/sql_db.cc:
After merge fixes
sql/sql_handler.cc:
After merge fixes
Use 'any_db' instead of '' to mean 'no database comparison'
sql/sql_parse.cc:
After merge fixes
sql/sql_select.cc:
After merge fixes
Added function comment for setup_group()
sql/sql_string.cc:
Added stringcmp() for binary comparison.
Added function comments for sortcmp() and stringcmp()
sql/sql_string.h:
Added stringcmp()
sql/sql_table.cc:
After merge fixes
sql/sql_update.cc:
After merge fixes
sql/sql_yacc.yy:
Use 'any_db' instead of '' to mean any database. Using "" causes a 'wrong db name' error.
strings/ctype-big5.c:
Strip only end space, not other space characters.
strings/ctype-bin.c:
Removed some not needed functions.
Added function comments
Don't remove end space in comparisons
Change my_wildcmp_bin() to be 'identical' with other similar code
strings/ctype-czech.c:
Strip only end space, not other space characters.
strings/ctype-gbk.c:
Strip only end space, not other space characters.
strings/ctype-latin1.c:
Strip only end space, not other space characters.
strings/ctype-mb.c:
Strip only end space, not other space characters.
strings/ctype-simple.c:
Strip only end space, not other space characters.
strings/ctype-sjis.c:
Strip only end space, not other space characters.
strings/ctype-tis620.c:
Added usage of my_instr_simple. This needs to be cleaned up!
strings/ctype-utf8.c:
Strip only end space, not other space characters.
strings/ctype-win1250ch.c:
Strip only end space, not other space characters.
Fixed indentation
strings/strto.c:
Code cleanup
2004-02-16 09:03:25 +01:00
|
|
|
--error 1267
|
2003-06-25 12:07:20 +02:00
|
|
|
select FIND_IN_SET(_latin1'B',_latin2'a,b,c,d');
|
|
|
|
|
|
|
|
select SUBSTRING_INDEX(_latin1'abcdabcdabcd',_latin1'd',2);
|
2006-11-20 21:42:06 +01:00
|
|
|
|
|
|
|
# fix this:
|
|
|
|
--disable_parsing
|
|
|
|
select SUBSTRING_INDEX(_latin1'abcdabcdabcd' COLLATE latin1_bin,_latin1'd',2);
|
|
|
|
select SUBSTRING_INDEX(_latin1'abcdabcdabcd',_latin1'd' COLLATE latin1_bin,2);
|
|
|
|
--enable_parsing
|
|
|
|
|
After merge fixes
Added more DBUG statements
Ensure that we are comparing end space with BINARY strings
Use 'any_db' instead of '' to mean any database. (For HANDLER command)
Only strip ' ' when comparing CHAR, not other space-like characters (like \t)
BitKeeper/deleted/.del-ctype_tis620.result-old~3578ceb0b8284685:
Delete: mysql-test/r/ctype_tis620.result-old
BitKeeper/deleted/.del-ctype_tis620.test-old~ffb1bbd2935d1aba:
Delete: mysql-test/t/ctype_tis620.test-old
client/mysqlbinlog.cc:
Added DBUG statements
Added call of my_end() to free all used memory on exit
heap/hp_info.c:
After merge fixes
heap/hp_open.c:
After merge fixes
include/heap.h:
After merge fixes
include/m_ctype.h:
Use pchar instead of 'int' for character parameters.
Added 'my_binary_compare()'
include/m_string.h:
Fixed wrong define
innobase/ibuf/ibuf0ibuf.c:
After merge fixes
innobase/srv/srv0start.c:
After merge fixes
mysql-test/r/alter_table.result:
Fixed results after merge
mysql-test/r/auto_increment.result:
Fixed results after merge
mysql-test/r/bdb.result:
Fixed results after merge
mysql-test/r/binary.result:
Fixed results after merge
mysql-test/r/create.result:
Fixed results after merge
mysql-test/r/ctype_mb.result:
Fixed results after merge
mysql-test/r/ctype_tis620.result:
Fixed results after merge
mysql-test/r/ctype_utf8.result:
Fixed results after merge
mysql-test/r/delete.result:
Fixed results after merge
mysql-test/r/func_compress.result:
Fixed results after merge
mysql-test/r/func_gconcat.result:
Fixed results after merge
mysql-test/r/func_group.result:
Fixed results after merge
mysql-test/r/func_str.result:
Fixed results after merge
mysql-test/r/innodb.result:
Fixed results after merge
mysql-test/r/insert.result:
Fixed results after merge
mysql-test/r/insert_select.result:
Fixed results after merge
mysql-test/r/key.result:
Fixed results after merge
mysql-test/r/loaddata.result:
Fixed results after merge
mysql-test/r/lock.result:
Fixed results after merge
mysql-test/r/myisam.result:
Fixed results after merge
mysql-test/r/null.result:
Fixed results after merge
mysql-test/r/null_key.result:
Fixed results after merge
mysql-test/r/order_by.result:
Fixed results after merge
mysql-test/r/query_cache.result:
Fixed results after merge
mysql-test/r/range.result:
Fixed results after merge
mysql-test/r/rpl_multi_delete.result:
Fixed results after merge
mysql-test/r/rpl_until.result:
Fixed results after merge
mysql-test/r/subselect.result:
Fixed results after merge
mysql-test/r/subselect_innodb.result:
Fixed results after merge
mysql-test/r/type_blob.result:
Fixed results after merge
mysql-test/r/type_datetime.result:
Fixed results after merge
mysql-test/r/type_decimal.result:
Fixed results after merge
mysql-test/r/type_enum.result:
Fixed results after merge
mysql-test/r/type_float.result:
Fixed results after merge
mysql-test/r/type_ranges.result:
Fixed results after merge
mysql-test/r/type_time.result:
Fixed results after merge
mysql-test/r/type_timestamp.result:
Fixed results after merge
mysql-test/r/type_uint.result:
Fixed results after merge
mysql-test/r/type_year.result:
Fixed results after merge
mysql-test/r/variables.result:
Fixed results after merge
mysql-test/r/warnings.result:
Fixed results after merge
mysql-test/t/case.test:
Fixed shifted error messages
mysql-test/t/create.test:
Fixed shifted error messages
mysql-test/t/ctype_collate.test:
Fixed shifted error messages
mysql-test/t/ctype_tis620.test:
Merge with 4.0 ctype_tis620 test
mysql-test/t/delete.test:
Fixed shifted error messages
mysql-test/t/derived.test:
Fixed shifted error messages
mysql-test/t/fulltext.test:
Fixed shifted error messages
mysql-test/t/func_in.test:
Fixed shifted error messages
mysql-test/t/func_str.test:
Fixed shifted error messages
mysql-test/t/func_test.test:
Fixed shifted error messages
mysql-test/t/grant.test:
Fixed shifted error messages
mysql-test/t/innodb.test:
Change to 4.1 syntax
mysql-test/t/key_cache.test:
Fixed shifted error messages
mysql-test/t/myisam.test:
New test of blob and end space
mysql-test/t/row.test:
Fixed shifted error messages
mysql-test/t/rpl_until.test:
Fixed shifted error messages
mysql-test/t/subselect.test:
Fixed shifted error messages
mysql-test/t/subselect_innodb.test:
Fix test to take into account foreign key constraints
mysql-test/t/union.test:
Fixed shifted error messages
mysql-test/t/user_var.test:
Fixed shifted error messages
mysql-test/t/variables.test:
Fixed shifted error messages
mysys/my_handler.c:
Merge with 4.0 code
sql/ha_heap.cc:
After merge fixes
sql/handler.cc:
After merge fixes
sql/item.cc:
After merge fixes
sql/item_cmpfunc.cc:
Ensure that we are comparing end space with BINARY strings
sql/item_cmpfunc.h:
Ensure that we are comparing end space with BINARY strings
sql/log_event.cc:
More DBUG statements
Ensure that we use all options to LOAD DATA in replication
sql/opt_range.cc:
After merge fixes
sql/sql_db.cc:
After merge fixes
sql/sql_handler.cc:
After merge fixes
Use 'any_db' instead of '' to mean 'no database comparison'
sql/sql_parse.cc:
After merge fixes
sql/sql_select.cc:
After merge fixes
Added function comment for setup_group()
sql/sql_string.cc:
Added stringcmp() for binary comparison.
Added function comments for sortcmp() and stringcmp()
sql/sql_string.h:
Added stringcmp()
sql/sql_table.cc:
After merge fixes
sql/sql_update.cc:
After merge fixes
sql/sql_yacc.yy:
Use 'any_db' instead of '' to mean any database. Using "" causes a 'wrong db name' error.
strings/ctype-big5.c:
Strip only end space, not other space characters.
strings/ctype-bin.c:
Removed some not needed functions.
Added function comments
Don't remove end space in comparisons
Change my_wildcmp_bin() to be 'identical' with other similar code
strings/ctype-czech.c:
Strip only end space, not other space characters.
strings/ctype-gbk.c:
Strip only end space, not other space characters.
strings/ctype-latin1.c:
Strip only end space, not other space characters.
strings/ctype-mb.c:
Strip only end space, not other space characters.
strings/ctype-simple.c:
Strip only end space, not other space characters.
strings/ctype-sjis.c:
Strip only end space, not other space characters.
strings/ctype-tis620.c:
Added usage of my_instr_simple. This needs to be cleaned up!
strings/ctype-utf8.c:
Strip only end space, not other space characters.
strings/ctype-win1250ch.c:
Strip only end space, not other space characters.
Fixed indentation
strings/strto.c:
Code cleanup
2004-02-16 09:03:25 +01:00
|
|
|
--error 1267
|
2003-06-25 12:07:20 +02:00
|
|
|
select SUBSTRING_INDEX(_latin1'abcdabcdabcd',_latin2'd',2);
|
After merge fixes
Added more DBUG statements
Ensure that we are comparing end space with BINARY strings
Use 'any_db' instead of '' to mean any database. (For HANDLER command)
Only strip ' ' when comparing CHAR, not other space-like characters (like \t)
BitKeeper/deleted/.del-ctype_tis620.result-old~3578ceb0b8284685:
Delete: mysql-test/r/ctype_tis620.result-old
BitKeeper/deleted/.del-ctype_tis620.test-old~ffb1bbd2935d1aba:
Delete: mysql-test/t/ctype_tis620.test-old
client/mysqlbinlog.cc:
Added DBUG statements
Added call of my_end() to free all used memory on exit
heap/hp_info.c:
After merge fixes
heap/hp_open.c:
After merge fixes
include/heap.h:
After merge fixes
include/m_ctype.h:
Use pchar instead of 'int' for character parameters.
Added 'my_binary_compare()'
include/m_string.h:
Fixed wrong define
innobase/ibuf/ibuf0ibuf.c:
After merge fixes
innobase/srv/srv0start.c:
After merge fixes
mysql-test/r/alter_table.result:
Fixed results after merge
mysql-test/r/auto_increment.result:
Fixed results after merge
mysql-test/r/bdb.result:
Fixed results after merge
mysql-test/r/binary.result:
Fixed results after merge
mysql-test/r/create.result:
Fixed results after merge
mysql-test/r/ctype_mb.result:
Fixed results after merge
mysql-test/r/ctype_tis620.result:
Fixed results after merge
mysql-test/r/ctype_utf8.result:
Fixed results after merge
mysql-test/r/delete.result:
Fixed results after merge
mysql-test/r/func_compress.result:
Fixed results after merge
mysql-test/r/func_gconcat.result:
Fixed results after merge
mysql-test/r/func_group.result:
Fixed results after merge
mysql-test/r/func_str.result:
Fixed results after merge
mysql-test/r/innodb.result:
Fixed results after merge
mysql-test/r/insert.result:
Fixed results after merge
mysql-test/r/insert_select.result:
Fixed results after merge
mysql-test/r/key.result:
Fixed results after merge
mysql-test/r/loaddata.result:
Fixed results after merge
mysql-test/r/lock.result:
Fixed results after merge
mysql-test/r/myisam.result:
Fixed results after merge
mysql-test/r/null.result:
Fixed results after merge
mysql-test/r/null_key.result:
Fixed results after merge
mysql-test/r/order_by.result:
Fixed results after merge
mysql-test/r/query_cache.result:
Fixed results after merge
mysql-test/r/range.result:
Fixed results after merge
mysql-test/r/rpl_multi_delete.result:
Fixed results after merge
mysql-test/r/rpl_until.result:
Fixed results after merge
mysql-test/r/subselect.result:
Fixed results after merge
mysql-test/r/subselect_innodb.result:
Fixed results after merge
mysql-test/r/type_blob.result:
Fixed results after merge
mysql-test/r/type_datetime.result:
Fixed results after merge
mysql-test/r/type_decimal.result:
Fixed results after merge
mysql-test/r/type_enum.result:
Fixed results after merge
mysql-test/r/type_float.result:
Fixed results after merge
mysql-test/r/type_ranges.result:
Fixed results after merge
mysql-test/r/type_time.result:
Fixed results after merge
mysql-test/r/type_timestamp.result:
Fixed results after merge
mysql-test/r/type_uint.result:
Fixed results after merge
mysql-test/r/type_year.result:
Fixed results after merge
mysql-test/r/variables.result:
Fixed results after merge
mysql-test/r/warnings.result:
Fixed results after merge
mysql-test/t/case.test:
Fixed shifted error messages
mysql-test/t/create.test:
Fixed shifted error messages
mysql-test/t/ctype_collate.test:
Fixed shifted error messages
mysql-test/t/ctype_tis620.test:
Merge with 4.0 ctype_tis620 test
mysql-test/t/delete.test:
Fixed shifted error messages
mysql-test/t/derived.test:
Fixed shifted error messages
mysql-test/t/fulltext.test:
Fixed shifted error messages
mysql-test/t/func_in.test:
Fixed shifted error messages
mysql-test/t/func_str.test:
Fixed shifted error messages
mysql-test/t/func_test.test:
Fixed shifted error messages
mysql-test/t/grant.test:
Fixed shifted error messages
mysql-test/t/innodb.test:
Change to 4.1 syntax
mysql-test/t/key_cache.test:
Fixed shifted error messages
mysql-test/t/myisam.test:
New test of blob and end space
mysql-test/t/row.test:
Fixed shifted error messages
mysql-test/t/rpl_until.test:
Fixed shifted error messages
mysql-test/t/subselect.test:
Fixed shifted error messages
mysql-test/t/subselect_innodb.test:
Fix test to take into account foreign key constraints
mysql-test/t/union.test:
Fixed shifted error messages
mysql-test/t/user_var.test:
Fixed shifted error messages
mysql-test/t/variables.test:
Fixed shifted error messages
mysys/my_handler.c:
Merge with 4.0 code
sql/ha_heap.cc:
After merge fixes
sql/handler.cc:
After merge fixes
sql/item.cc:
After merge fixes
sql/item_cmpfunc.cc:
Ensure that we are comparing end space with BINARY strings
sql/item_cmpfunc.h:
Ensure that we are comparing end space with BINARY strings
sql/log_event.cc:
More DBUG statements
Ensure that we use all options to LOAD DATA in replication
sql/opt_range.cc:
After merge fixes
sql/sql_db.cc:
After merge fixes
sql/sql_handler.cc:
After merge fixes
Use 'any_db' instead of '' to mean 'no database comparison'
sql/sql_parse.cc:
After merge fixes
sql/sql_select.cc:
After merge fixes
Added function comment for setup_group()
sql/sql_string.cc:
Added stringcmp() for binary comparison.
Added function comments for sortcmp() and stringcmp()
sql/sql_string.h:
Added stringcmp()
sql/sql_table.cc:
After merge fixes
sql/sql_update.cc:
After merge fixes
sql/sql_yacc.yy:
Use 'any_db' instead of '' to mean any database. Using "" causes a 'wrong db name' error.
strings/ctype-big5.c:
Strip only end space, not other space characters.
strings/ctype-bin.c:
Removed some not needed functions.
Added function comments
Don't remove end space in comparisons
Change my_wildcmp_bin() to be 'identical' with other similar code
strings/ctype-czech.c:
Strip only end space, not other space characters.
strings/ctype-gbk.c:
Strip only end space, not other space characters.
strings/ctype-latin1.c:
Strip only end space, not other space characters.
strings/ctype-mb.c:
Strip only end space, not other space characters.
strings/ctype-simple.c:
Strip only end space, not other space characters.
strings/ctype-sjis.c:
Strip only end space, not other space characters.
strings/ctype-tis620.c:
Added usage of my_instr_simple. This needs to be cleaned up!
strings/ctype-utf8.c:
Strip only end space, not other space characters.
strings/ctype-win1250ch.c:
Strip only end space, not other space characters.
Fixed indentation
strings/strto.c:
Code cleanup
2004-02-16 09:03:25 +01:00
|
|
|
--error 1267
|
2003-06-25 12:07:20 +02:00
|
|
|
select SUBSTRING_INDEX(_latin1'abcdabcdabcd' COLLATE latin1_general_ci,_latin1'd' COLLATE latin1_bin,2);
|
|
|
|
|
2003-06-27 09:02:08 +02:00
|
|
|
select _latin1'B' between _latin1'a' and _latin1'c';
|
|
|
|
select _latin1'B' collate latin1_bin between _latin1'a' and _latin1'c';
|
|
|
|
select _latin1'B' between _latin1'a' collate latin1_bin and _latin1'c';
|
|
|
|
select _latin1'B' between _latin1'a' and _latin1'c' collate latin1_bin;
|
After merge fixes
Added more DBUG statements
Ensure that we are comparing end space with BINARY strings
Use 'any_db' instead of '' to mean any database. (For HANDLER command)
Only strip ' ' when comparing CHAR, not other space-like characters (like \t)
BitKeeper/deleted/.del-ctype_tis620.result-old~3578ceb0b8284685:
Delete: mysql-test/r/ctype_tis620.result-old
BitKeeper/deleted/.del-ctype_tis620.test-old~ffb1bbd2935d1aba:
Delete: mysql-test/t/ctype_tis620.test-old
client/mysqlbinlog.cc:
Added DBUG statements
Added call of my_end() to free all used memory on exit
heap/hp_info.c:
After merge fixes
heap/hp_open.c:
After merge fixes
include/heap.h:
After merge fixes
include/m_ctype.h:
Use pchar instead of 'int' for character parameters.
Added 'my_binary_compare()'
include/m_string.h:
Fixed wrong define
innobase/ibuf/ibuf0ibuf.c:
After merge fixes
innobase/srv/srv0start.c:
After merge fixes
mysql-test/r/alter_table.result:
Fixed results after merge
mysql-test/r/auto_increment.result:
Fixed results after merge
mysql-test/r/bdb.result:
Fixed results after merge
mysql-test/r/binary.result:
Fixed results after merge
mysql-test/r/create.result:
Fixed results after merge
mysql-test/r/ctype_mb.result:
Fixed results after merge
mysql-test/r/ctype_tis620.result:
Fixed results after merge
mysql-test/r/ctype_utf8.result:
Fixed results after merge
mysql-test/r/delete.result:
Fixed results after merge
mysql-test/r/func_compress.result:
Fixed results after merge
mysql-test/r/func_gconcat.result:
Fixed results after merge
mysql-test/r/func_group.result:
Fixed results after merge
mysql-test/r/func_str.result:
Fixed results after merge
mysql-test/r/innodb.result:
Fixed results after merge
mysql-test/r/insert.result:
Fixed results after merge
mysql-test/r/insert_select.result:
Fixed results after merge
mysql-test/r/key.result:
Fixed results after merge
mysql-test/r/loaddata.result:
Fixed results after merge
mysql-test/r/lock.result:
Fixed results after merge
mysql-test/r/myisam.result:
Fixed results after merge
mysql-test/r/null.result:
Fixed results after merge
mysql-test/r/null_key.result:
Fixed results after merge
mysql-test/r/order_by.result:
Fixed results after merge
mysql-test/r/query_cache.result:
Fixed results after merge
mysql-test/r/range.result:
Fixed results after merge
mysql-test/r/rpl_multi_delete.result:
Fixed results after merge
mysql-test/r/rpl_until.result:
Fixed results after merge
mysql-test/r/subselect.result:
Fixed results after merge
mysql-test/r/subselect_innodb.result:
Fixed results after merge
mysql-test/r/type_blob.result:
Fixed results after merge
mysql-test/r/type_datetime.result:
Fixed results after merge
mysql-test/r/type_decimal.result:
Fixed results after merge
mysql-test/r/type_enum.result:
Fixed results after merge
mysql-test/r/type_float.result:
Fixed results after merge
mysql-test/r/type_ranges.result:
Fixed results after merge
mysql-test/r/type_time.result:
Fixed results after merge
mysql-test/r/type_timestamp.result:
Fixed results after merge
mysql-test/r/type_uint.result:
Fixed results after merge
mysql-test/r/type_year.result:
Fixed results after merge
mysql-test/r/variables.result:
Fixed results after merge
mysql-test/r/warnings.result:
Fixed results after merge
mysql-test/t/case.test:
Fixed shifted error messages
mysql-test/t/create.test:
Fixed shifted error messages
mysql-test/t/ctype_collate.test:
Fixed shifted error messages
mysql-test/t/ctype_tis620.test:
Merge with 4.0 ctype_tis620 test
mysql-test/t/delete.test:
Fixed shifted error messages
mysql-test/t/derived.test:
Fixed shifted error messages
mysql-test/t/fulltext.test:
Fixed shifted error messages
mysql-test/t/func_in.test:
Fixed shifted error messages
mysql-test/t/func_str.test:
Fixed shifted error messages
mysql-test/t/func_test.test:
Fixed shifted error messages
mysql-test/t/grant.test:
Fixed shifted error messages
mysql-test/t/innodb.test:
Change to 4.1 syntax
mysql-test/t/key_cache.test:
Fixed shifted error messages
mysql-test/t/myisam.test:
New test of blob and end space
mysql-test/t/row.test:
Fixed shifted error messages
mysql-test/t/rpl_until.test:
Fixed shifted error messages
mysql-test/t/subselect.test:
Fixed shifted error messages
mysql-test/t/subselect_innodb.test:
Fix test to take into account foreign key constraints
mysql-test/t/union.test:
Fixed shifted error messages
mysql-test/t/user_var.test:
Fixed shifted error messages
mysql-test/t/variables.test:
Fixed shifted error messages
mysys/my_handler.c:
Merge with 4.0 code
sql/ha_heap.cc:
After merge fixes
sql/handler.cc:
After merge fixes
sql/item.cc:
After merge fixes
sql/item_cmpfunc.cc:
Ensure that we are comparing end space with BINARY strings
sql/item_cmpfunc.h:
Ensure that we are comparing end space with BINARY strings
sql/log_event.cc:
More DBUG statements
Ensure that we use all options to LOAD DATA in replication
sql/opt_range.cc:
After merge fixes
sql/sql_db.cc:
After merge fixes
sql/sql_handler.cc:
After merge fixes
Use 'any_db' instead of '' to mean 'no database comparison'
sql/sql_parse.cc:
After merge fixes
sql/sql_select.cc:
After merge fixes
Added function comment for setup_group()
sql/sql_string.cc:
Added stringcmp() for binary comparison.
Added function comments for sortcmp() and stringcmp()
sql/sql_string.h:
Added stringcmp()
sql/sql_table.cc:
After merge fixes
sql/sql_update.cc:
After merge fixes
sql/sql_yacc.yy:
Use 'any_db' instead of '' to mean any database. Using "" causes a 'wrong db name' error.
strings/ctype-big5.c:
Strip only end space, not other space characters.
strings/ctype-bin.c:
Removed some not needed functions.
Added function comments
Don't remove end space in comparisons
Change my_wildcmp_bin() to be 'identical' with other similar code
strings/ctype-czech.c:
Strip only end space, not other space characters.
strings/ctype-gbk.c:
Strip only end space, not other space characters.
strings/ctype-latin1.c:
Strip only end space, not other space characters.
strings/ctype-mb.c:
Strip only end space, not other space characters.
strings/ctype-simple.c:
Strip only end space, not other space characters.
strings/ctype-sjis.c:
Strip only end space, not other space characters.
strings/ctype-tis620.c:
Added usage of my_instr_simple. This needs to be cleaned up!
strings/ctype-utf8.c:
Strip only end space, not other space characters.
strings/ctype-win1250ch.c:
Strip only end space, not other space characters.
Fixed indentation
strings/strto.c:
Code cleanup
2004-02-16 09:03:25 +01:00
|
|
|
--error 1270
|
2003-06-27 09:02:08 +02:00
|
|
|
select _latin2'B' between _latin1'a' and _latin1'b';
|
After merge fixes
Added more DBUG statements
Ensure that we are comparing end space with BINARY strings
Use 'any_db' instead of '' to mean any database. (For HANDLER command)
Only strip ' ' when comparing CHAR, not other space-like characters (like \t)
BitKeeper/deleted/.del-ctype_tis620.result-old~3578ceb0b8284685:
Delete: mysql-test/r/ctype_tis620.result-old
BitKeeper/deleted/.del-ctype_tis620.test-old~ffb1bbd2935d1aba:
Delete: mysql-test/t/ctype_tis620.test-old
client/mysqlbinlog.cc:
Added DBUG statements
Added call of my_end() to free all used memory on exit
heap/hp_info.c:
After merge fixes
heap/hp_open.c:
After merge fixes
include/heap.h:
After merge fixes
include/m_ctype.h:
Use pchar instead of 'int' for character parameters.
Added 'my_binary_compare()'
include/m_string.h:
Fixed wrong define
innobase/ibuf/ibuf0ibuf.c:
After merge fixes
innobase/srv/srv0start.c:
After merge fixes
mysql-test/r/alter_table.result:
Fixed results after merge
mysql-test/r/auto_increment.result:
Fixed results after merge
mysql-test/r/bdb.result:
Fixed results after merge
mysql-test/r/binary.result:
Fixed results after merge
mysql-test/r/create.result:
Fixed results after merge
mysql-test/r/ctype_mb.result:
Fixed results after merge
mysql-test/r/ctype_tis620.result:
Fixed results after merge
mysql-test/r/ctype_utf8.result:
Fixed results after merge
mysql-test/r/delete.result:
Fixed results after merge
mysql-test/r/func_compress.result:
Fixed results after merge
mysql-test/r/func_gconcat.result:
Fixed results after merge
mysql-test/r/func_group.result:
Fixed results after merge
mysql-test/r/func_str.result:
Fixed results after merge
mysql-test/r/innodb.result:
Fixed results after merge
mysql-test/r/insert.result:
Fixed results after merge
mysql-test/r/insert_select.result:
Fixed results after merge
mysql-test/r/key.result:
Fixed results after merge
mysql-test/r/loaddata.result:
Fixed results after merge
mysql-test/r/lock.result:
Fixed results after merge
mysql-test/r/myisam.result:
Fixed results after merge
mysql-test/r/null.result:
Fixed results after merge
mysql-test/r/null_key.result:
Fixed results after merge
mysql-test/r/order_by.result:
Fixed results after merge
mysql-test/r/query_cache.result:
Fixed results after merge
mysql-test/r/range.result:
Fixed results after merge
mysql-test/r/rpl_multi_delete.result:
Fixed results after merge
mysql-test/r/rpl_until.result:
Fixed results after merge
mysql-test/r/subselect.result:
Fixed results after merge
mysql-test/r/subselect_innodb.result:
Fixed results after merge
mysql-test/r/type_blob.result:
Fixed results after merge
mysql-test/r/type_datetime.result:
Fixed results after merge
mysql-test/r/type_decimal.result:
Fixed results after merge
mysql-test/r/type_enum.result:
Fixed results after merge
mysql-test/r/type_float.result:
Fixed results after merge
mysql-test/r/type_ranges.result:
Fixed results after merge
mysql-test/r/type_time.result:
Fixed results after merge
mysql-test/r/type_timestamp.result:
Fixed results after merge
mysql-test/r/type_uint.result:
Fixed results after merge
mysql-test/r/type_year.result:
Fixed results after merge
mysql-test/r/variables.result:
Fixed results after merge
mysql-test/r/warnings.result:
Fixed results after merge
mysql-test/t/case.test:
Fixed shifted error messages
mysql-test/t/create.test:
Fixed shifted error messages
mysql-test/t/ctype_collate.test:
Fixed shifted error messages
mysql-test/t/ctype_tis620.test:
Merge with 4.0 ctype_tis620 test
mysql-test/t/delete.test:
Fixed shifted error messages
mysql-test/t/derived.test:
Fixed shifted error messages
mysql-test/t/fulltext.test:
Fixed shifted error messages
mysql-test/t/func_in.test:
Fixed shifted error messages
mysql-test/t/func_str.test:
Fixed shifted error messages
mysql-test/t/func_test.test:
Fixed shifted error messages
mysql-test/t/grant.test:
Fixed shifted error messages
mysql-test/t/innodb.test:
Change to 4.1 syntax
mysql-test/t/key_cache.test:
Fixed shifted error messages
mysql-test/t/myisam.test:
New test of blob and end space
mysql-test/t/row.test:
Fixed shifted error messages
mysql-test/t/rpl_until.test:
Fixed shifted error messages
mysql-test/t/subselect.test:
Fixed shifted error messages
mysql-test/t/subselect_innodb.test:
Fix test to take into account foreign key constraints
mysql-test/t/union.test:
Fixed shifted error messages
mysql-test/t/user_var.test:
Fixed shifted error messages
mysql-test/t/variables.test:
Fixed shifted error messages
mysys/my_handler.c:
Merge with 4.0 code
sql/ha_heap.cc:
After merge fixes
sql/handler.cc:
After merge fixes
sql/item.cc:
After merge fixes
sql/item_cmpfunc.cc:
Ensure that we are comparing end space with BINARY strings
sql/item_cmpfunc.h:
Ensure that we are comparing end space with BINARY strings
sql/log_event.cc:
More DBUG statements
Ensure that we use all options to LOAD DATA in replication
sql/opt_range.cc:
After merge fixes
sql/sql_db.cc:
After merge fixes
sql/sql_handler.cc:
After merge fixes
Use 'any_db' instead of '' to mean 'no database comparison'
sql/sql_parse.cc:
After merge fixes
sql/sql_select.cc:
After merge fixes
Added function comment for setup_group()
sql/sql_string.cc:
Added stringcmp() for binary comparison.
Added function comments for sortcmp() and stringcmp()
sql/sql_string.h:
Added stringcmp()
sql/sql_table.cc:
After merge fixes
sql/sql_update.cc:
After merge fixes
sql/sql_yacc.yy:
Use 'any_db' instead of '' to mean any database. Using "" causes a 'wrong db name' error.
strings/ctype-big5.c:
Strip only end space, not other space characters.
strings/ctype-bin.c:
Removed some not needed functions.
Added function comments
Don't remove end space in comparisons
Change my_wildcmp_bin() to be 'identical' with other similar code
strings/ctype-czech.c:
Strip only end space, not other space characters.
strings/ctype-gbk.c:
Strip only end space, not other space characters.
strings/ctype-latin1.c:
Strip only end space, not other space characters.
strings/ctype-mb.c:
Strip only end space, not other space characters.
strings/ctype-simple.c:
Strip only end space, not other space characters.
strings/ctype-sjis.c:
Strip only end space, not other space characters.
strings/ctype-tis620.c:
Added usage of my_instr_simple. This needs to be cleaned up!
strings/ctype-utf8.c:
Strip only end space, not other space characters.
strings/ctype-win1250ch.c:
Strip only end space, not other space characters.
Fixed indentation
strings/strto.c:
Code cleanup
2004-02-16 09:03:25 +01:00
|
|
|
--error 1270
|
2003-06-27 09:02:08 +02:00
|
|
|
select _latin1'B' between _latin2'a' and _latin1'b';
|
After merge fixes
Added more DBUG statements
Ensure that we are comparing end space with BINARY strings
Use 'any_db' instead of '' to mean any database. (For HANDLER command)
Only strip ' ' when comparing CHAR, not other space-like characters (like \t)
BitKeeper/deleted/.del-ctype_tis620.result-old~3578ceb0b8284685:
Delete: mysql-test/r/ctype_tis620.result-old
BitKeeper/deleted/.del-ctype_tis620.test-old~ffb1bbd2935d1aba:
Delete: mysql-test/t/ctype_tis620.test-old
client/mysqlbinlog.cc:
Added DBUG statements
Added call of my_end() to free all used memory on exit
heap/hp_info.c:
After merge fixes
heap/hp_open.c:
After merge fixes
include/heap.h:
After merge fixes
include/m_ctype.h:
Use pchar instead of 'int' for character parameters.
Added 'my_binary_compare()'
include/m_string.h:
Fixed wrong define
innobase/ibuf/ibuf0ibuf.c:
After merge fixes
innobase/srv/srv0start.c:
After merge fixes
mysql-test/r/alter_table.result:
Fixed results after merge
mysql-test/r/auto_increment.result:
Fixed results after merge
mysql-test/r/bdb.result:
Fixed results after merge
mysql-test/r/binary.result:
Fixed results after merge
mysql-test/r/create.result:
Fixed results after merge
mysql-test/r/ctype_mb.result:
Fixed results after merge
mysql-test/r/ctype_tis620.result:
Fixed results after merge
mysql-test/r/ctype_utf8.result:
Fixed results after merge
mysql-test/r/delete.result:
Fixed results after merge
mysql-test/r/func_compress.result:
Fixed results after merge
mysql-test/r/func_gconcat.result:
Fixed results after merge
mysql-test/r/func_group.result:
Fixed results after merge
mysql-test/r/func_str.result:
Fixed results after merge
mysql-test/r/innodb.result:
Fixed results after merge
mysql-test/r/insert.result:
Fixed results after merge
mysql-test/r/insert_select.result:
Fixed results after merge
mysql-test/r/key.result:
Fixed results after merge
mysql-test/r/loaddata.result:
Fixed results after merge
mysql-test/r/lock.result:
Fixed results after merge
mysql-test/r/myisam.result:
Fixed results after merge
mysql-test/r/null.result:
Fixed results after merge
mysql-test/r/null_key.result:
Fixed results after merge
mysql-test/r/order_by.result:
Fixed results after merge
mysql-test/r/query_cache.result:
Fixed results after merge
mysql-test/r/range.result:
Fixed results after merge
mysql-test/r/rpl_multi_delete.result:
Fixed results after merge
mysql-test/r/rpl_until.result:
Fixed results after merge
mysql-test/r/subselect.result:
Fixed results after merge
mysql-test/r/subselect_innodb.result:
Fixed results after merge
mysql-test/r/type_blob.result:
Fixed results after merge
mysql-test/r/type_datetime.result:
Fixed results after merge
mysql-test/r/type_decimal.result:
Fixed results after merge
mysql-test/r/type_enum.result:
Fixed results after merge
mysql-test/r/type_float.result:
Fixed results after merge
mysql-test/r/type_ranges.result:
Fixed results after merge
mysql-test/r/type_time.result:
Fixed results after merge
mysql-test/r/type_timestamp.result:
Fixed results after merge
mysql-test/r/type_uint.result:
Fixed results after merge
mysql-test/r/type_year.result:
Fixed results after merge
mysql-test/r/variables.result:
Fixed results after merge
mysql-test/r/warnings.result:
Fixed results after merge
mysql-test/t/case.test:
Fixed shifted error messages
mysql-test/t/create.test:
Fixed shifted error messages
mysql-test/t/ctype_collate.test:
Fixed shifted error messages
mysql-test/t/ctype_tis620.test:
Merge with 4.0 ctype_tis620 test
mysql-test/t/delete.test:
Fixed shifted error messages
mysql-test/t/derived.test:
Fixed shifted error messages
mysql-test/t/fulltext.test:
Fixed shifted error messages
mysql-test/t/func_in.test:
Fixed shifted error messages
mysql-test/t/func_str.test:
Fixed shifted error messages
mysql-test/t/func_test.test:
Fixed shifted error messages
mysql-test/t/grant.test:
Fixed shifted error messages
mysql-test/t/innodb.test:
Change to 4.1 syntax
mysql-test/t/key_cache.test:
Fixed shifted error messages
mysql-test/t/myisam.test:
New test of blob and end space
mysql-test/t/row.test:
Fixed shifted error messages
mysql-test/t/rpl_until.test:
Fixed shifted error messages
mysql-test/t/subselect.test:
Fixed shifted error messages
mysql-test/t/subselect_innodb.test:
Fix test to take into account foreign key constraints
mysql-test/t/union.test:
Fixed shifted error messages
mysql-test/t/user_var.test:
Fixed shifted error messages
mysql-test/t/variables.test:
Fixed shifted error messages
mysys/my_handler.c:
Merge with 4.0 code
sql/ha_heap.cc:
After merge fixes
sql/handler.cc:
After merge fixes
sql/item.cc:
After merge fixes
sql/item_cmpfunc.cc:
Ensure that we are comparing end space with BINARY strings
sql/item_cmpfunc.h:
Ensure that we are comparing end space with BINARY strings
sql/log_event.cc:
More DBUG statements
Ensure that we use all options to LOAD DATA in replication
sql/opt_range.cc:
After merge fixes
sql/sql_db.cc:
After merge fixes
sql/sql_handler.cc:
After merge fixes
Use 'any_db' instead of '' to mean 'no database comparison'
sql/sql_parse.cc:
After merge fixes
sql/sql_select.cc:
After merge fixes
Added function comment for setup_group()
sql/sql_string.cc:
Added stringcmp() for binary comparison.
Added function comments for sortcmp() and stringcmp()
sql/sql_string.h:
Added stringcmp()
sql/sql_table.cc:
After merge fixes
sql/sql_update.cc:
After merge fixes
sql/sql_yacc.yy:
Use 'any_db' instead of '' to mean any database. Using "" causes a 'wrong db name' error.
strings/ctype-big5.c:
Strip only end space, not other space characters.
strings/ctype-bin.c:
Removed some not needed functions.
Added function comments
Don't remove end space in comparisons
Change my_wildcmp_bin() to be 'identical' with other similar code
strings/ctype-czech.c:
Strip only end space, not other space characters.
strings/ctype-gbk.c:
Strip only end space, not other space characters.
strings/ctype-latin1.c:
Strip only end space, not other space characters.
strings/ctype-mb.c:
Strip only end space, not other space characters.
strings/ctype-simple.c:
Strip only end space, not other space characters.
strings/ctype-sjis.c:
Strip only end space, not other space characters.
strings/ctype-tis620.c:
Added usage of my_instr_simple. This needs to be cleaned up!
strings/ctype-utf8.c:
Strip only end space, not other space characters.
strings/ctype-win1250ch.c:
Strip only end space, not other space characters.
Fixed indentation
strings/strto.c:
Code cleanup
2004-02-16 09:03:25 +01:00
|
|
|
--error 1270
|
2003-06-27 09:02:08 +02:00
|
|
|
select _latin1'B' between _latin1'a' and _latin2'b';
|
After merge fixes
Added more DBUG statements
Ensure that we are comparing end space with BINARY strings
Use 'any_db' instead of '' to mean any database. (For HANDLER command)
Only strip ' ' when comparing CHAR, not other space-like characters (like \t)
BitKeeper/deleted/.del-ctype_tis620.result-old~3578ceb0b8284685:
Delete: mysql-test/r/ctype_tis620.result-old
BitKeeper/deleted/.del-ctype_tis620.test-old~ffb1bbd2935d1aba:
Delete: mysql-test/t/ctype_tis620.test-old
client/mysqlbinlog.cc:
Added DBUG statements
Added call of my_end() to free all used memory on exit
heap/hp_info.c:
After merge fixes
heap/hp_open.c:
After merge fixes
include/heap.h:
After merge fixes
include/m_ctype.h:
Use pchar instead of 'int' for character parameters.
Added 'my_binary_compare()'
include/m_string.h:
Fixed wrong define
innobase/ibuf/ibuf0ibuf.c:
After merge fixes
innobase/srv/srv0start.c:
After merge fixes
mysql-test/r/alter_table.result:
Fixed results after merge
mysql-test/r/auto_increment.result:
Fixed results after merge
mysql-test/r/bdb.result:
Fixed results after merge
mysql-test/r/binary.result:
Fixed results after merge
mysql-test/r/create.result:
Fixed results after merge
mysql-test/r/ctype_mb.result:
Fixed results after merge
mysql-test/r/ctype_tis620.result:
Fixed results after merge
mysql-test/r/ctype_utf8.result:
Fixed results after merge
mysql-test/r/delete.result:
Fixed results after merge
mysql-test/r/func_compress.result:
Fixed results after merge
mysql-test/r/func_gconcat.result:
Fixed results after merge
mysql-test/r/func_group.result:
Fixed results after merge
mysql-test/r/func_str.result:
Fixed results after merge
mysql-test/r/innodb.result:
Fixed results after merge
mysql-test/r/insert.result:
Fixed results after merge
mysql-test/r/insert_select.result:
Fixed results after merge
mysql-test/r/key.result:
Fixed results after merge
mysql-test/r/loaddata.result:
Fixed results after merge
mysql-test/r/lock.result:
Fixed results after merge
mysql-test/r/myisam.result:
Fixed results after merge
mysql-test/r/null.result:
Fixed results after merge
mysql-test/r/null_key.result:
Fixed results after merge
mysql-test/r/order_by.result:
Fixed results after merge
mysql-test/r/query_cache.result:
Fixed results after merge
mysql-test/r/range.result:
Fixed results after merge
mysql-test/r/rpl_multi_delete.result:
Fixed results after merge
mysql-test/r/rpl_until.result:
Fixed results after merge
mysql-test/r/subselect.result:
Fixed results after merge
mysql-test/r/subselect_innodb.result:
Fixed results after merge
mysql-test/r/type_blob.result:
Fixed results after merge
mysql-test/r/type_datetime.result:
Fixed results after merge
mysql-test/r/type_decimal.result:
Fixed results after merge
mysql-test/r/type_enum.result:
Fixed results after merge
mysql-test/r/type_float.result:
Fixed results after merge
mysql-test/r/type_ranges.result:
Fixed results after merge
mysql-test/r/type_time.result:
Fixed results after merge
mysql-test/r/type_timestamp.result:
Fixed results after merge
mysql-test/r/type_uint.result:
Fixed results after merge
mysql-test/r/type_year.result:
Fixed results after merge
mysql-test/r/variables.result:
Fixed results after merge
mysql-test/r/warnings.result:
Fixed results after merge
mysql-test/t/case.test:
Fixed shifted error messages
mysql-test/t/create.test:
Fixed shifted error messages
mysql-test/t/ctype_collate.test:
Fixed shifted error messages
mysql-test/t/ctype_tis620.test:
Merge with 4.0 ctype_tis620 test
mysql-test/t/delete.test:
Fixed shifted error messages
mysql-test/t/derived.test:
Fixed shifted error messages
mysql-test/t/fulltext.test:
Fixed shifted error messages
mysql-test/t/func_in.test:
Fixed shifted error messages
mysql-test/t/func_str.test:
Fixed shifted error messages
mysql-test/t/func_test.test:
Fixed shifted error messages
mysql-test/t/grant.test:
Fixed shifted error messages
mysql-test/t/innodb.test:
Change to 4.1 syntax
mysql-test/t/key_cache.test:
Fixed shifted error messages
mysql-test/t/myisam.test:
New test of blob and end space
mysql-test/t/row.test:
Fixed shifted error messages
mysql-test/t/rpl_until.test:
Fixed shifted error messages
mysql-test/t/subselect.test:
Fixed shifted error messages
mysql-test/t/subselect_innodb.test:
Fix test to take into account foreign key constraints
mysql-test/t/union.test:
Fixed shifted error messages
mysql-test/t/user_var.test:
Fixed shifted error messages
mysql-test/t/variables.test:
Fixed shifted error messages
mysys/my_handler.c:
Merge with 4.0 code
sql/ha_heap.cc:
After merge fixes
sql/handler.cc:
After merge fixes
sql/item.cc:
After merge fixes
sql/item_cmpfunc.cc:
Ensure that we are comparing end space with BINARY strings
sql/item_cmpfunc.h:
Ensure that we are comparing end space with BINARY strings
sql/log_event.cc:
More DBUG statements
Ensure that we use all options to LOAD DATA in replication
sql/opt_range.cc:
After merge fixes
sql/sql_db.cc:
After merge fixes
sql/sql_handler.cc:
After merge fixes
Use 'any_db' instead of '' to mean 'no database comparison'
sql/sql_parse.cc:
After merge fixes
sql/sql_select.cc:
After merge fixes
Added function comment for setup_group()
sql/sql_string.cc:
Added stringcmp() for binary comparison.
Added function comments for sortcmp() and stringcmp()
sql/sql_string.h:
Added stringcmp()
sql/sql_table.cc:
After merge fixes
sql/sql_update.cc:
After merge fixes
sql/sql_yacc.yy:
Use 'any_db' instead of '' to mean any database. Using "" causes a 'wrong db name' error.
strings/ctype-big5.c:
Strip only end space, not other space characters.
strings/ctype-bin.c:
Removed some not needed functions.
Added function comments
Don't remove end space in comparisons
Change my_wildcmp_bin() to be 'identical' with other similar code
strings/ctype-czech.c:
Strip only end space, not other space characters.
strings/ctype-gbk.c:
Strip only end space, not other space characters.
strings/ctype-latin1.c:
Strip only end space, not other space characters.
strings/ctype-mb.c:
Strip only end space, not other space characters.
strings/ctype-simple.c:
Strip only end space, not other space characters.
strings/ctype-sjis.c:
Strip only end space, not other space characters.
strings/ctype-tis620.c:
Added usage of my_instr_simple. This needs to be cleaned up!
strings/ctype-utf8.c:
Strip only end space, not other space characters.
strings/ctype-win1250ch.c:
Strip only end space, not other space characters.
Fixed indentation
strings/strto.c:
Code cleanup
2004-02-16 09:03:25 +01:00
|
|
|
--error 1270
|
2003-06-27 09:02:08 +02:00
|
|
|
select _latin1'B' collate latin1_general_ci between _latin1'a' collate latin1_bin and _latin1'b';
|
2003-06-25 12:07:20 +02:00
|
|
|
|
2003-06-27 10:52:38 +02:00
|
|
|
select _latin1'B' in (_latin1'a',_latin1'b');
|
|
|
|
select _latin1'B' collate latin1_bin in (_latin1'a',_latin1'b');
|
|
|
|
select _latin1'B' in (_latin1'a' collate latin1_bin,_latin1'b');
|
|
|
|
select _latin1'B' in (_latin1'a',_latin1'b' collate latin1_bin);
|
After merge fixes
Added more DBUG statements
Ensure that we are comparing end space with BINARY strings
Use 'any_db' instead of '' to mean any database. (For HANDLER command)
Only strip ' ' when comparing CHAR, not other space-like characters (like \t)
BitKeeper/deleted/.del-ctype_tis620.result-old~3578ceb0b8284685:
Delete: mysql-test/r/ctype_tis620.result-old
BitKeeper/deleted/.del-ctype_tis620.test-old~ffb1bbd2935d1aba:
Delete: mysql-test/t/ctype_tis620.test-old
client/mysqlbinlog.cc:
Added DBUG statements
Added call of my_end() to free all used memory on exit
heap/hp_info.c:
After merge fixes
heap/hp_open.c:
After merge fixes
include/heap.h:
After merge fixes
include/m_ctype.h:
Use pchar instead of 'int' for character parameters.
Added 'my_binary_compare()'
include/m_string.h:
Fixed wrong define
innobase/ibuf/ibuf0ibuf.c:
After merge fixes
innobase/srv/srv0start.c:
After merge fixes
mysql-test/r/alter_table.result:
Fixed results after merge
mysql-test/r/auto_increment.result:
Fixed results after merge
mysql-test/r/bdb.result:
Fixed results after merge
mysql-test/r/binary.result:
Fixed results after merge
mysql-test/r/create.result:
Fixed results after merge
mysql-test/r/ctype_mb.result:
Fixed results after merge
mysql-test/r/ctype_tis620.result:
Fixed results after merge
mysql-test/r/ctype_utf8.result:
Fixed results after merge
mysql-test/r/delete.result:
Fixed results after merge
mysql-test/r/func_compress.result:
Fixed results after merge
mysql-test/r/func_gconcat.result:
Fixed results after merge
mysql-test/r/func_group.result:
Fixed results after merge
mysql-test/r/func_str.result:
Fixed results after merge
mysql-test/r/innodb.result:
Fixed results after merge
mysql-test/r/insert.result:
Fixed results after merge
mysql-test/r/insert_select.result:
Fixed results after merge
mysql-test/r/key.result:
Fixed results after merge
mysql-test/r/loaddata.result:
Fixed results after merge
mysql-test/r/lock.result:
Fixed results after merge
mysql-test/r/myisam.result:
Fixed results after merge
mysql-test/r/null.result:
Fixed results after merge
mysql-test/r/null_key.result:
Fixed results after merge
mysql-test/r/order_by.result:
Fixed results after merge
mysql-test/r/query_cache.result:
Fixed results after merge
mysql-test/r/range.result:
Fixed results after merge
mysql-test/r/rpl_multi_delete.result:
Fixed results after merge
mysql-test/r/rpl_until.result:
Fixed results after merge
mysql-test/r/subselect.result:
Fixed results after merge
mysql-test/r/subselect_innodb.result:
Fixed results after merge
mysql-test/r/type_blob.result:
Fixed results after merge
mysql-test/r/type_datetime.result:
Fixed results after merge
mysql-test/r/type_decimal.result:
Fixed results after merge
mysql-test/r/type_enum.result:
Fixed results after merge
mysql-test/r/type_float.result:
Fixed results after merge
mysql-test/r/type_ranges.result:
Fixed results after merge
mysql-test/r/type_time.result:
Fixed results after merge
mysql-test/r/type_timestamp.result:
Fixed results after merge
mysql-test/r/type_uint.result:
Fixed results after merge
mysql-test/r/type_year.result:
Fixed results after merge
mysql-test/r/variables.result:
Fixed results after merge
mysql-test/r/warnings.result:
Fixed results after merge
mysql-test/t/case.test:
Fixed shifted error messages
mysql-test/t/create.test:
Fixed shifted error messages
mysql-test/t/ctype_collate.test:
Fixed shifted error messages
mysql-test/t/ctype_tis620.test:
Merge with 4.0 ctype_tis620 test
mysql-test/t/delete.test:
Fixed shifted error messages
mysql-test/t/derived.test:
Fixed shifted error messages
mysql-test/t/fulltext.test:
Fixed shifted error messages
mysql-test/t/func_in.test:
Fixed shifted error messages
mysql-test/t/func_str.test:
Fixed shifted error messages
mysql-test/t/func_test.test:
Fixed shifted error messages
mysql-test/t/grant.test:
Fixed shifted error messages
mysql-test/t/innodb.test:
Change to 4.1 syntax
mysql-test/t/key_cache.test:
Fixed shifted error messages
mysql-test/t/myisam.test:
New test of blob and end space
mysql-test/t/row.test:
Fixed shifted error messages
mysql-test/t/rpl_until.test:
Fixed shifted error messages
mysql-test/t/subselect.test:
Fixed shifted error messages
mysql-test/t/subselect_innodb.test:
Fix test to take into account foreign key constraints
mysql-test/t/union.test:
Fixed shifted error messages
mysql-test/t/user_var.test:
Fixed shifted error messages
mysql-test/t/variables.test:
Fixed shifted error messages
mysys/my_handler.c:
Merge with 4.0 code
sql/ha_heap.cc:
After merge fixes
sql/handler.cc:
After merge fixes
sql/item.cc:
After merge fixes
sql/item_cmpfunc.cc:
Ensure that we are comparing end space with BINARY strings
sql/item_cmpfunc.h:
Ensure that we are comparing end space with BINARY strings
sql/log_event.cc:
More DBUG statements
Ensure that we use all options to LOAD DATA in replication
sql/opt_range.cc:
After merge fixes
sql/sql_db.cc:
After merge fixes
sql/sql_handler.cc:
After merge fixes
Use 'any_db' instead of '' to mean 'no database comparison'
sql/sql_parse.cc:
After merge fixes
sql/sql_select.cc:
After merge fixes
Added function comment for setup_group()
sql/sql_string.cc:
Added stringcmp() for binary comparison.
Added function comments for sortcmp() and stringcmp()
sql/sql_string.h:
Added stringcmp()
sql/sql_table.cc:
After merge fixes
sql/sql_update.cc:
After merge fixes
sql/sql_yacc.yy:
Use 'any_db' instead of '' to mean any database. Using "" causes a 'wrong db name' error.
strings/ctype-big5.c:
Strip only end space, not other space characters.
strings/ctype-bin.c:
Removed some not needed functions.
Added function comments
Don't remove end space in comparisons
Change my_wildcmp_bin() to be 'identical' with other similar code
strings/ctype-czech.c:
Strip only end space, not other space characters.
strings/ctype-gbk.c:
Strip only end space, not other space characters.
strings/ctype-latin1.c:
Strip only end space, not other space characters.
strings/ctype-mb.c:
Strip only end space, not other space characters.
strings/ctype-simple.c:
Strip only end space, not other space characters.
strings/ctype-sjis.c:
Strip only end space, not other space characters.
strings/ctype-tis620.c:
Added usage of my_instr_simple. This needs to be cleaned up!
strings/ctype-utf8.c:
Strip only end space, not other space characters.
strings/ctype-win1250ch.c:
Strip only end space, not other space characters.
Fixed indentation
strings/strto.c:
Code cleanup
2004-02-16 09:03:25 +01:00
|
|
|
--error 1270
|
2003-06-27 10:52:38 +02:00
|
|
|
select _latin2'B' in (_latin1'a',_latin1'b');
|
After merge fixes
Added more DBUG statements
Ensure that we are comparing end space with BINARY strings
Use 'any_db' instead of '' to mean any database. (For HANDLER command)
Only strip ' ' when comparing CHAR, not other space-like characters (like \t)
BitKeeper/deleted/.del-ctype_tis620.result-old~3578ceb0b8284685:
Delete: mysql-test/r/ctype_tis620.result-old
BitKeeper/deleted/.del-ctype_tis620.test-old~ffb1bbd2935d1aba:
Delete: mysql-test/t/ctype_tis620.test-old
client/mysqlbinlog.cc:
Added DBUG statements
Added call of my_end() to free all used memory on exit
heap/hp_info.c:
After merge fixes
heap/hp_open.c:
After merge fixes
include/heap.h:
After merge fixes
include/m_ctype.h:
Use pchar instead of 'int' for character parameters.
Added 'my_binary_compare()'
include/m_string.h:
Fixed wrong define
innobase/ibuf/ibuf0ibuf.c:
After merge fixes
innobase/srv/srv0start.c:
After merge fixes
mysql-test/r/alter_table.result:
Fixed results after merge
mysql-test/r/auto_increment.result:
Fixed results after merge
mysql-test/r/bdb.result:
Fixed results after merge
mysql-test/r/binary.result:
Fixed results after merge
mysql-test/r/create.result:
Fixed results after merge
mysql-test/r/ctype_mb.result:
Fixed results after merge
mysql-test/r/ctype_tis620.result:
Fixed results after merge
mysql-test/r/ctype_utf8.result:
Fixed results after merge
mysql-test/r/delete.result:
Fixed results after merge
mysql-test/r/func_compress.result:
Fixed results after merge
mysql-test/r/func_gconcat.result:
Fixed results after merge
mysql-test/r/func_group.result:
Fixed results after merge
mysql-test/r/func_str.result:
Fixed results after merge
mysql-test/r/innodb.result:
Fixed results after merge
mysql-test/r/insert.result:
Fixed results after merge
mysql-test/r/insert_select.result:
Fixed results after merge
mysql-test/r/key.result:
Fixed results after merge
mysql-test/r/loaddata.result:
Fixed results after merge
mysql-test/r/lock.result:
Fixed results after merge
mysql-test/r/myisam.result:
Fixed results after merge
mysql-test/r/null.result:
Fixed results after merge
mysql-test/r/null_key.result:
Fixed results after merge
mysql-test/r/order_by.result:
Fixed results after merge
mysql-test/r/query_cache.result:
Fixed results after merge
mysql-test/r/range.result:
Fixed results after merge
mysql-test/r/rpl_multi_delete.result:
Fixed results after merge
mysql-test/r/rpl_until.result:
Fixed results after merge
mysql-test/r/subselect.result:
Fixed results after merge
mysql-test/r/subselect_innodb.result:
Fixed results after merge
mysql-test/r/type_blob.result:
Fixed results after merge
mysql-test/r/type_datetime.result:
Fixed results after merge
mysql-test/r/type_decimal.result:
Fixed results after merge
mysql-test/r/type_enum.result:
Fixed results after merge
mysql-test/r/type_float.result:
Fixed results after merge
mysql-test/r/type_ranges.result:
Fixed results after merge
mysql-test/r/type_time.result:
Fixed results after merge
mysql-test/r/type_timestamp.result:
Fixed results after merge
mysql-test/r/type_uint.result:
Fixed results after merge
mysql-test/r/type_year.result:
Fixed results after merge
mysql-test/r/variables.result:
Fixed results after merge
mysql-test/r/warnings.result:
Fixed results after merge
mysql-test/t/case.test:
Fixed shifted error messages
mysql-test/t/create.test:
Fixed shifted error messages
mysql-test/t/ctype_collate.test:
Fixed shifted error messages
mysql-test/t/ctype_tis620.test:
Merge with 4.0 ctype_tis620 test
mysql-test/t/delete.test:
Fixed shifted error messages
mysql-test/t/derived.test:
Fixed shifted error messages
mysql-test/t/fulltext.test:
Fixed shifted error messages
mysql-test/t/func_in.test:
Fixed shifted error messages
mysql-test/t/func_str.test:
Fixed shifted error messages
mysql-test/t/func_test.test:
Fixed shifted error messages
mysql-test/t/grant.test:
Fixed shifted error messages
mysql-test/t/innodb.test:
Change to 4.1 syntax
mysql-test/t/key_cache.test:
Fixed shifted error messages
mysql-test/t/myisam.test:
New test of blob and end space
mysql-test/t/row.test:
Fixed shifted error messages
mysql-test/t/rpl_until.test:
Fixed shifted error messages
mysql-test/t/subselect.test:
Fixed shifted error messages
mysql-test/t/subselect_innodb.test:
Fix test to take into account foreign key constraints
mysql-test/t/union.test:
Fixed shifted error messages
mysql-test/t/user_var.test:
Fixed shifted error messages
mysql-test/t/variables.test:
Fixed shifted error messages
mysys/my_handler.c:
Merge with 4.0 code
sql/ha_heap.cc:
After merge fixes
sql/handler.cc:
After merge fixes
sql/item.cc:
After merge fixes
sql/item_cmpfunc.cc:
Ensure that we are comparing end space with BINARY strings
sql/item_cmpfunc.h:
Ensure that we are comparing end space with BINARY strings
sql/log_event.cc:
More DBUG statements
Ensure that we use all options to LOAD DATA in replication
sql/opt_range.cc:
After merge fixes
sql/sql_db.cc:
After merge fixes
sql/sql_handler.cc:
After merge fixes
Use 'any_db' instead of '' to mean 'no database comparison'
sql/sql_parse.cc:
After merge fixes
sql/sql_select.cc:
After merge fixes
Added function comment for setup_group()
sql/sql_string.cc:
Added stringcmp() for binary comparison.
Added function comments for sortcmp() and stringcmp()
sql/sql_string.h:
Added stringcmp()
sql/sql_table.cc:
After merge fixes
sql/sql_update.cc:
After merge fixes
sql/sql_yacc.yy:
Use 'any_db' instead of '' to mean any database. Using "" causes a 'wrong db name' error.
strings/ctype-big5.c:
Strip only end space, not other space characters.
strings/ctype-bin.c:
Removed some not needed functions.
Added function comments
Don't remove end space in comparisons
Change my_wildcmp_bin() to be 'identical' with other similar code
strings/ctype-czech.c:
Strip only end space, not other space characters.
strings/ctype-gbk.c:
Strip only end space, not other space characters.
strings/ctype-latin1.c:
Strip only end space, not other space characters.
strings/ctype-mb.c:
Strip only end space, not other space characters.
strings/ctype-simple.c:
Strip only end space, not other space characters.
strings/ctype-sjis.c:
Strip only end space, not other space characters.
strings/ctype-tis620.c:
Added usage of my_instr_simple. This needs to be cleaned up!
strings/ctype-utf8.c:
Strip only end space, not other space characters.
strings/ctype-win1250ch.c:
Strip only end space, not other space characters.
Fixed indentation
strings/strto.c:
Code cleanup
2004-02-16 09:03:25 +01:00
|
|
|
--error 1270
|
2003-06-27 10:52:38 +02:00
|
|
|
select _latin1'B' in (_latin2'a',_latin1'b');
|
After merge fixes
Added more DBUG statements
Ensure that we are comparing end space with BINARY strings
Use 'any_db' instead of '' to mean any database. (For HANDLER command)
Only strip ' ' when comparing CHAR, not other space-like characters (like \t)
BitKeeper/deleted/.del-ctype_tis620.result-old~3578ceb0b8284685:
Delete: mysql-test/r/ctype_tis620.result-old
BitKeeper/deleted/.del-ctype_tis620.test-old~ffb1bbd2935d1aba:
Delete: mysql-test/t/ctype_tis620.test-old
client/mysqlbinlog.cc:
Added DBUG statements
Added call of my_end() to free all used memory on exit
heap/hp_info.c:
After merge fixes
heap/hp_open.c:
After merge fixes
include/heap.h:
After merge fixes
include/m_ctype.h:
Use pchar instead of 'int' for character parameters.
Added 'my_binary_compare()'
include/m_string.h:
Fixed wrong define
innobase/ibuf/ibuf0ibuf.c:
After merge fixes
innobase/srv/srv0start.c:
After merge fixes
mysql-test/r/alter_table.result:
Fixed results after merge
mysql-test/r/auto_increment.result:
Fixed results after merge
mysql-test/r/bdb.result:
Fixed results after merge
mysql-test/r/binary.result:
Fixed results after merge
mysql-test/r/create.result:
Fixed results after merge
mysql-test/r/ctype_mb.result:
Fixed results after merge
mysql-test/r/ctype_tis620.result:
Fixed results after merge
mysql-test/r/ctype_utf8.result:
Fixed results after merge
mysql-test/r/delete.result:
Fixed results after merge
mysql-test/r/func_compress.result:
Fixed results after merge
mysql-test/r/func_gconcat.result:
Fixed results after merge
mysql-test/r/func_group.result:
Fixed results after merge
mysql-test/r/func_str.result:
Fixed results after merge
mysql-test/r/innodb.result:
Fixed results after merge
mysql-test/r/insert.result:
Fixed results after merge
mysql-test/r/insert_select.result:
Fixed results after merge
mysql-test/r/key.result:
Fixed results after merge
mysql-test/r/loaddata.result:
Fixed results after merge
mysql-test/r/lock.result:
Fixed results after merge
mysql-test/r/myisam.result:
Fixed results after merge
mysql-test/r/null.result:
Fixed results after merge
mysql-test/r/null_key.result:
Fixed results after merge
mysql-test/r/order_by.result:
Fixed results after merge
mysql-test/r/query_cache.result:
Fixed results after merge
mysql-test/r/range.result:
Fixed results after merge
mysql-test/r/rpl_multi_delete.result:
Fixed results after merge
mysql-test/r/rpl_until.result:
Fixed results after merge
mysql-test/r/subselect.result:
Fixed results after merge
mysql-test/r/subselect_innodb.result:
Fixed results after merge
mysql-test/r/type_blob.result:
Fixed results after merge
mysql-test/r/type_datetime.result:
Fixed results after merge
mysql-test/r/type_decimal.result:
Fixed results after merge
mysql-test/r/type_enum.result:
Fixed results after merge
mysql-test/r/type_float.result:
Fixed results after merge
mysql-test/r/type_ranges.result:
Fixed results after merge
mysql-test/r/type_time.result:
Fixed results after merge
mysql-test/r/type_timestamp.result:
Fixed results after merge
mysql-test/r/type_uint.result:
Fixed results after merge
mysql-test/r/type_year.result:
Fixed results after merge
mysql-test/r/variables.result:
Fixed results after merge
mysql-test/r/warnings.result:
Fixed results after merge
mysql-test/t/case.test:
Fixed shifted error messages
mysql-test/t/create.test:
Fixed shifted error messages
mysql-test/t/ctype_collate.test:
Fixed shifted error messages
mysql-test/t/ctype_tis620.test:
Merge with 4.0 ctype_tis620 test
mysql-test/t/delete.test:
Fixed shifted error messages
mysql-test/t/derived.test:
Fixed shifted error messages
mysql-test/t/fulltext.test:
Fixed shifted error messages
mysql-test/t/func_in.test:
Fixed shifted error messages
mysql-test/t/func_str.test:
Fixed shifted error messages
mysql-test/t/func_test.test:
Fixed shifted error messages
mysql-test/t/grant.test:
Fixed shifted error messages
mysql-test/t/innodb.test:
Change to 4.1 syntax
mysql-test/t/key_cache.test:
Fixed shifted error messages
mysql-test/t/myisam.test:
New test of blob and end space
mysql-test/t/row.test:
Fixed shifted error messages
mysql-test/t/rpl_until.test:
Fixed shifted error messages
mysql-test/t/subselect.test:
Fixed shifted error messages
mysql-test/t/subselect_innodb.test:
Fix test to take into account foreign key constraints
mysql-test/t/union.test:
Fixed shifted error messages
mysql-test/t/user_var.test:
Fixed shifted error messages
mysql-test/t/variables.test:
Fixed shifted error messages
mysys/my_handler.c:
Merge with 4.0 code
sql/ha_heap.cc:
After merge fixes
sql/handler.cc:
After merge fixes
sql/item.cc:
After merge fixes
sql/item_cmpfunc.cc:
Ensure that we are comparing end space with BINARY strings
sql/item_cmpfunc.h:
Ensure that we are comparing end space with BINARY strings
sql/log_event.cc:
More DBUG statements
Ensure that we use all options to LOAD DATA in replication
sql/opt_range.cc:
After merge fixes
sql/sql_db.cc:
After merge fixes
sql/sql_handler.cc:
After merge fixes
Use 'any_db' instead of '' to mean 'no database comparison'
sql/sql_parse.cc:
After merge fixes
sql/sql_select.cc:
After merge fixes
Added function comment for setup_group()
sql/sql_string.cc:
Added stringcmp() for binary comparison.
Added function comments for sortcmp() and stringcmp()
sql/sql_string.h:
Added stringcmp()
sql/sql_table.cc:
After merge fixes
sql/sql_update.cc:
After merge fixes
sql/sql_yacc.yy:
Use 'any_db' instead of '' to mean any database. Using "" causes a 'wrong db name' error.
strings/ctype-big5.c:
Strip only end space, not other space characters.
strings/ctype-bin.c:
Removed some not needed functions.
Added function comments
Don't remove end space in comparisons
Change my_wildcmp_bin() to be 'identical' with other similar code
strings/ctype-czech.c:
Strip only end space, not other space characters.
strings/ctype-gbk.c:
Strip only end space, not other space characters.
strings/ctype-latin1.c:
Strip only end space, not other space characters.
strings/ctype-mb.c:
Strip only end space, not other space characters.
strings/ctype-simple.c:
Strip only end space, not other space characters.
strings/ctype-sjis.c:
Strip only end space, not other space characters.
strings/ctype-tis620.c:
Added usage of my_instr_simple. This needs to be cleaned up!
strings/ctype-utf8.c:
Strip only end space, not other space characters.
strings/ctype-win1250ch.c:
Strip only end space, not other space characters.
Fixed indentation
strings/strto.c:
Code cleanup
2004-02-16 09:03:25 +01:00
|
|
|
--error 1270
|
2003-06-27 10:52:38 +02:00
|
|
|
select _latin1'B' in (_latin1'a',_latin2'b');
|
After merge fixes
Added more DBUG statements
Ensure that we are comparing end space with BINARY strings
Use 'any_db' instead of '' to mean any database. (For HANDLER command)
Only strip ' ' when comparing CHAR, not other space-like characters (like \t)
BitKeeper/deleted/.del-ctype_tis620.result-old~3578ceb0b8284685:
Delete: mysql-test/r/ctype_tis620.result-old
BitKeeper/deleted/.del-ctype_tis620.test-old~ffb1bbd2935d1aba:
Delete: mysql-test/t/ctype_tis620.test-old
client/mysqlbinlog.cc:
Added DBUG statements
Added call of my_end() to free all used memory on exit
heap/hp_info.c:
After merge fixes
heap/hp_open.c:
After merge fixes
include/heap.h:
After merge fixes
include/m_ctype.h:
Use pchar instead of 'int' for character parameters.
Added 'my_binary_compare()'
include/m_string.h:
Fixed wrong define
innobase/ibuf/ibuf0ibuf.c:
After merge fixes
innobase/srv/srv0start.c:
After merge fixes
mysql-test/r/alter_table.result:
Fixed results after merge
mysql-test/r/auto_increment.result:
Fixed results after merge
mysql-test/r/bdb.result:
Fixed results after merge
mysql-test/r/binary.result:
Fixed results after merge
mysql-test/r/create.result:
Fixed results after merge
mysql-test/r/ctype_mb.result:
Fixed results after merge
mysql-test/r/ctype_tis620.result:
Fixed results after merge
mysql-test/r/ctype_utf8.result:
Fixed results after merge
mysql-test/r/delete.result:
Fixed results after merge
mysql-test/r/func_compress.result:
Fixed results after merge
mysql-test/r/func_gconcat.result:
Fixed results after merge
mysql-test/r/func_group.result:
Fixed results after merge
mysql-test/r/func_str.result:
Fixed results after merge
mysql-test/r/innodb.result:
Fixed results after merge
mysql-test/r/insert.result:
Fixed results after merge
mysql-test/r/insert_select.result:
Fixed results after merge
mysql-test/r/key.result:
Fixed results after merge
mysql-test/r/loaddata.result:
Fixed results after merge
mysql-test/r/lock.result:
Fixed results after merge
mysql-test/r/myisam.result:
Fixed results after merge
mysql-test/r/null.result:
Fixed results after merge
mysql-test/r/null_key.result:
Fixed results after merge
mysql-test/r/order_by.result:
Fixed results after merge
mysql-test/r/query_cache.result:
Fixed results after merge
mysql-test/r/range.result:
Fixed results after merge
mysql-test/r/rpl_multi_delete.result:
Fixed results after merge
mysql-test/r/rpl_until.result:
Fixed results after merge
mysql-test/r/subselect.result:
Fixed results after merge
mysql-test/r/subselect_innodb.result:
Fixed results after merge
mysql-test/r/type_blob.result:
Fixed results after merge
mysql-test/r/type_datetime.result:
Fixed results after merge
mysql-test/r/type_decimal.result:
Fixed results after merge
mysql-test/r/type_enum.result:
Fixed results after merge
mysql-test/r/type_float.result:
Fixed results after merge
mysql-test/r/type_ranges.result:
Fixed results after merge
mysql-test/r/type_time.result:
Fixed results after merge
mysql-test/r/type_timestamp.result:
Fixed results after merge
mysql-test/r/type_uint.result:
Fixed results after merge
mysql-test/r/type_year.result:
Fixed results after merge
mysql-test/r/variables.result:
Fixed results after merge
mysql-test/r/warnings.result:
Fixed results after merge
mysql-test/t/case.test:
Fixed shifted error messages
mysql-test/t/create.test:
Fixed shifted error messages
mysql-test/t/ctype_collate.test:
Fixed shifted error messages
mysql-test/t/ctype_tis620.test:
Merge with 4.0 ctype_tis620 test
mysql-test/t/delete.test:
Fixed shifted error messages
mysql-test/t/derived.test:
Fixed shifted error messages
mysql-test/t/fulltext.test:
Fixed shifted error messages
mysql-test/t/func_in.test:
Fixed shifted error messages
mysql-test/t/func_str.test:
Fixed shifted error messages
mysql-test/t/func_test.test:
Fixed shifted error messages
mysql-test/t/grant.test:
Fixed shifted error messages
mysql-test/t/innodb.test:
Change to 4.1 syntax
mysql-test/t/key_cache.test:
Fixed shifted error messages
mysql-test/t/myisam.test:
New test of blob and end space
mysql-test/t/row.test:
Fixed shifted error messages
mysql-test/t/rpl_until.test:
Fixed shifted error messages
mysql-test/t/subselect.test:
Fixed shifted error messages
mysql-test/t/subselect_innodb.test:
Fix test to take into account foreign key constraints
mysql-test/t/union.test:
Fixed shifted error messages
mysql-test/t/user_var.test:
Fixed shifted error messages
mysql-test/t/variables.test:
Fixed shifted error messages
mysys/my_handler.c:
Merge with 4.0 code
sql/ha_heap.cc:
After merge fixes
sql/handler.cc:
After merge fixes
sql/item.cc:
After merge fixes
sql/item_cmpfunc.cc:
Ensure that we are comparing end space with BINARY strings
sql/item_cmpfunc.h:
Ensure that we are comparing end space with BINARY strings
sql/log_event.cc:
More DBUG statements
Ensure that we use all options to LOAD DATA in replication
sql/opt_range.cc:
After merge fixes
sql/sql_db.cc:
After merge fixes
sql/sql_handler.cc:
After merge fixes
Use 'any_db' instead of '' to mean 'no database comparison'
sql/sql_parse.cc:
After merge fixes
sql/sql_select.cc:
After merge fixes
Added function comment for setup_group()
sql/sql_string.cc:
Added stringcmp() for binary comparison.
Added function comments for sortcmp() and stringcmp()
sql/sql_string.h:
Added stringcmp()
sql/sql_table.cc:
After merge fixes
sql/sql_update.cc:
After merge fixes
sql/sql_yacc.yy:
Use 'any_db' instead of '' to mean any database. Using "" causes a 'wrong db name' error.
strings/ctype-big5.c:
Strip only end space, not other space characters.
strings/ctype-bin.c:
Removed some not needed functions.
Added function comments
Don't remove end space in comparisons
Change my_wildcmp_bin() to be 'identical' with other similar code
strings/ctype-czech.c:
Strip only end space, not other space characters.
strings/ctype-gbk.c:
Strip only end space, not other space characters.
strings/ctype-latin1.c:
Strip only end space, not other space characters.
strings/ctype-mb.c:
Strip only end space, not other space characters.
strings/ctype-simple.c:
Strip only end space, not other space characters.
strings/ctype-sjis.c:
Strip only end space, not other space characters.
strings/ctype-tis620.c:
Added usage of my_instr_simple. This needs to be cleaned up!
strings/ctype-utf8.c:
Strip only end space, not other space characters.
strings/ctype-win1250ch.c:
Strip only end space, not other space characters.
Fixed indentation
strings/strto.c:
Code cleanup
2004-02-16 09:03:25 +01:00
|
|
|
--error 1270
|
2003-06-27 10:52:38 +02:00
|
|
|
select _latin1'B' COLLATE latin1_general_ci in (_latin1'a' COLLATE latin1_bin,_latin1'b');
|
After merge fixes
Added more DBUG statements
Ensure that we are comparing end space with BINARY strings
Use 'any_db' instead of '' to mean any database. (For HANDLER command)
Only strip ' ' when comparing CHAR, not other space-like characters (like \t)
BitKeeper/deleted/.del-ctype_tis620.result-old~3578ceb0b8284685:
Delete: mysql-test/r/ctype_tis620.result-old
BitKeeper/deleted/.del-ctype_tis620.test-old~ffb1bbd2935d1aba:
Delete: mysql-test/t/ctype_tis620.test-old
client/mysqlbinlog.cc:
Added DBUG statements
Added call of my_end() to free all used memory on exit
heap/hp_info.c:
After merge fixes
heap/hp_open.c:
After merge fixes
include/heap.h:
After merge fixes
include/m_ctype.h:
Use pchar instead of 'int' for character parameters.
Added 'my_binary_compare()'
include/m_string.h:
Fixed wrong define
innobase/ibuf/ibuf0ibuf.c:
After merge fixes
innobase/srv/srv0start.c:
After merge fixes
mysql-test/r/alter_table.result:
Fixed results after merge
mysql-test/r/auto_increment.result:
Fixed results after merge
mysql-test/r/bdb.result:
Fixed results after merge
mysql-test/r/binary.result:
Fixed results after merge
mysql-test/r/create.result:
Fixed results after merge
mysql-test/r/ctype_mb.result:
Fixed results after merge
mysql-test/r/ctype_tis620.result:
Fixed results after merge
mysql-test/r/ctype_utf8.result:
Fixed results after merge
mysql-test/r/delete.result:
Fixed results after merge
mysql-test/r/func_compress.result:
Fixed results after merge
mysql-test/r/func_gconcat.result:
Fixed results after merge
mysql-test/r/func_group.result:
Fixed results after merge
mysql-test/r/func_str.result:
Fixed results after merge
mysql-test/r/innodb.result:
Fixed results after merge
mysql-test/r/insert.result:
Fixed results after merge
mysql-test/r/insert_select.result:
Fixed results after merge
mysql-test/r/key.result:
Fixed results after merge
mysql-test/r/loaddata.result:
Fixed results after merge
mysql-test/r/lock.result:
Fixed results after merge
mysql-test/r/myisam.result:
Fixed results after merge
mysql-test/r/null.result:
Fixed results after merge
mysql-test/r/null_key.result:
Fixed results after merge
mysql-test/r/order_by.result:
Fixed results after merge
mysql-test/r/query_cache.result:
Fixed results after merge
mysql-test/r/range.result:
Fixed results after merge
mysql-test/r/rpl_multi_delete.result:
Fixed results after merge
mysql-test/r/rpl_until.result:
Fixed results after merge
mysql-test/r/subselect.result:
Fixed results after merge
mysql-test/r/subselect_innodb.result:
Fixed results after merge
mysql-test/r/type_blob.result:
Fixed results after merge
mysql-test/r/type_datetime.result:
Fixed results after merge
mysql-test/r/type_decimal.result:
Fixed results after merge
mysql-test/r/type_enum.result:
Fixed results after merge
mysql-test/r/type_float.result:
Fixed results after merge
mysql-test/r/type_ranges.result:
Fixed results after merge
mysql-test/r/type_time.result:
Fixed results after merge
mysql-test/r/type_timestamp.result:
Fixed results after merge
mysql-test/r/type_uint.result:
Fixed results after merge
mysql-test/r/type_year.result:
Fixed results after merge
mysql-test/r/variables.result:
Fixed results after merge
mysql-test/r/warnings.result:
Fixed results after merge
mysql-test/t/case.test:
Fixed shifted error messages
mysql-test/t/create.test:
Fixed shifted error messages
mysql-test/t/ctype_collate.test:
Fixed shifted error messages
mysql-test/t/ctype_tis620.test:
Merge with 4.0 ctype_tis620 test
mysql-test/t/delete.test:
Fixed shifted error messages
mysql-test/t/derived.test:
Fixed shifted error messages
mysql-test/t/fulltext.test:
Fixed shifted error messages
mysql-test/t/func_in.test:
Fixed shifted error messages
mysql-test/t/func_str.test:
Fixed shifted error messages
mysql-test/t/func_test.test:
Fixed shifted error messages
mysql-test/t/grant.test:
Fixed shifted error messages
mysql-test/t/innodb.test:
Change to 4.1 syntax
mysql-test/t/key_cache.test:
Fixed shifted error messages
mysql-test/t/myisam.test:
New test of blob and end space
mysql-test/t/row.test:
Fixed shifted error messages
mysql-test/t/rpl_until.test:
Fixed shifted error messages
mysql-test/t/subselect.test:
Fixed shifted error messages
mysql-test/t/subselect_innodb.test:
Fix test to take into account foreign key constraints
mysql-test/t/union.test:
Fixed shifted error messages
mysql-test/t/user_var.test:
Fixed shifted error messages
mysql-test/t/variables.test:
Fixed shifted error messages
mysys/my_handler.c:
Merge with 4.0 code
sql/ha_heap.cc:
After merge fixes
sql/handler.cc:
After merge fixes
sql/item.cc:
After merge fixes
sql/item_cmpfunc.cc:
Ensure that we are comparing end space with BINARY strings
sql/item_cmpfunc.h:
Ensure that we are comparing end space with BINARY strings
sql/log_event.cc:
More DBUG statements
Ensure that we use all options to LOAD DATA in replication
sql/opt_range.cc:
After merge fixes
sql/sql_db.cc:
After merge fixes
sql/sql_handler.cc:
After merge fixes
Use 'any_db' instead of '' to mean 'no database comparison'
sql/sql_parse.cc:
After merge fixes
sql/sql_select.cc:
After merge fixes
Added function comment for setup_group()
sql/sql_string.cc:
Added stringcmp() for binary comparison.
Added function comments for sortcmp() and stringcmp()
sql/sql_string.h:
Added stringcmp()
sql/sql_table.cc:
After merge fixes
sql/sql_update.cc:
After merge fixes
sql/sql_yacc.yy:
Use 'any_db' instead of '' to mean any database. Using "" causes a 'wrong db name' error.
strings/ctype-big5.c:
Strip only end space, not other space characters.
strings/ctype-bin.c:
Removed some not needed functions.
Added function comments
Don't remove end space in comparisons
Change my_wildcmp_bin() to be 'identical' with other similar code
strings/ctype-czech.c:
Strip only end space, not other space characters.
strings/ctype-gbk.c:
Strip only end space, not other space characters.
strings/ctype-latin1.c:
Strip only end space, not other space characters.
strings/ctype-mb.c:
Strip only end space, not other space characters.
strings/ctype-simple.c:
Strip only end space, not other space characters.
strings/ctype-sjis.c:
Strip only end space, not other space characters.
strings/ctype-tis620.c:
Added usage of my_instr_simple. This needs to be cleaned up!
strings/ctype-utf8.c:
Strip only end space, not other space characters.
strings/ctype-win1250ch.c:
Strip only end space, not other space characters.
Fixed indentation
strings/strto.c:
Code cleanup
2004-02-16 09:03:25 +01:00
|
|
|
--error 1270
|
2003-06-27 10:52:38 +02:00
|
|
|
select _latin1'B' COLLATE latin1_general_ci in (_latin1'a',_latin1'b' COLLATE latin1_bin);
|
|
|
|
|
2003-06-19 08:36:44 +02:00
|
|
|
select collation(bin(130)), coercibility(bin(130));
|
|
|
|
select collation(oct(130)), coercibility(oct(130));
|
|
|
|
select collation(conv(130,16,10)), coercibility(conv(130,16,10));
|
|
|
|
select collation(hex(130)), coercibility(hex(130));
|
|
|
|
select collation(char(130)), coercibility(hex(130));
|
|
|
|
select collation(format(130,10)), coercibility(format(130,10));
|
2003-05-23 08:32:35 +02:00
|
|
|
select collation(lcase(_latin2'a')), coercibility(lcase(_latin2'a'));
|
|
|
|
select collation(ucase(_latin2'a')), coercibility(ucase(_latin2'a'));
|
|
|
|
select collation(left(_latin2'a',1)), coercibility(left(_latin2'a',1));
|
|
|
|
select collation(right(_latin2'a',1)), coercibility(right(_latin2'a',1));
|
|
|
|
select collation(substring(_latin2'a',1,1)), coercibility(substring(_latin2'a',1,1));
|
|
|
|
select collation(concat(_latin2'a',_latin2'b')), coercibility(concat(_latin2'a',_latin2'b'));
|
2003-06-19 10:12:55 +02:00
|
|
|
select collation(lpad(_latin2'a',4,_latin2'b')), coercibility(lpad(_latin2'a',4,_latin2'b'));
|
|
|
|
select collation(rpad(_latin2'a',4,_latin2'b')), coercibility(rpad(_latin2'a',4,_latin2'b'));
|
2003-05-23 08:32:35 +02:00
|
|
|
select collation(concat_ws(_latin2'a',_latin2'b')), coercibility(concat_ws(_latin2'a',_latin2'b'));
|
2003-06-19 10:12:55 +02:00
|
|
|
select collation(make_set(255,_latin2'a',_latin2'b',_latin2'c')), coercibility(make_set(255,_latin2'a',_latin2'b',_latin2'c'));
|
|
|
|
select collation(export_set(255,_latin2'y',_latin2'n',_latin2' ')), coercibility(export_set(255,_latin2'y',_latin2'n',_latin2' '));
|
2003-06-03 14:13:19 +02:00
|
|
|
select collation(trim(_latin2' a ')), coercibility(trim(_latin2' a '));
|
|
|
|
select collation(ltrim(_latin2' a ')), coercibility(ltrim(_latin2' a '));
|
|
|
|
select collation(rtrim(_latin2' a ')), coercibility(rtrim(_latin2' a '));
|
|
|
|
select collation(trim(LEADING _latin2' ' FROM _latin2'a')), coercibility(trim(LEADING _latin2'a' FROM _latin2'a'));
|
|
|
|
select collation(trim(TRAILING _latin2' ' FROM _latin2'a')), coercibility(trim(TRAILING _latin2'a' FROM _latin2'a'));
|
|
|
|
select collation(trim(BOTH _latin2' ' FROM _latin2'a')), coercibility(trim(BOTH _latin2'a' FROM _latin2'a'));
|
2003-06-10 11:54:03 +02:00
|
|
|
select collation(repeat(_latin2'a',10)), coercibility(repeat(_latin2'a',10));
|
|
|
|
select collation(reverse(_latin2'ab')), coercibility(reverse(_latin2'ab'));
|
|
|
|
select collation(quote(_latin2'ab')), coercibility(quote(_latin2'ab'));
|
|
|
|
select collation(soundex(_latin2'ab')), coercibility(soundex(_latin2'ab'));
|
|
|
|
select collation(substring(_latin2'ab',1)), coercibility(substring(_latin2'ab',1));
|
2003-06-10 13:41:42 +02:00
|
|
|
select collation(insert(_latin2'abcd',2,3,_latin2'ef')), coercibility(insert(_latin2'abcd',2,3,_latin2'ef'));
|
2003-06-19 08:36:44 +02:00
|
|
|
select collation(replace(_latin2'abcd',_latin2'b',_latin2'B')), coercibility(replace(_latin2'abcd',_latin2'b',_latin2'B'));
|
2004-06-08 12:36:44 +02:00
|
|
|
select collation(encode('abcd','ab')), coercibility(encode('abcd','ab'));
|
2003-06-10 11:54:03 +02:00
|
|
|
|
2003-05-23 08:32:35 +02:00
|
|
|
create table t1
|
|
|
|
select
|
2003-06-19 08:36:44 +02:00
|
|
|
bin(130),
|
|
|
|
oct(130),
|
|
|
|
conv(130,16,10),
|
|
|
|
hex(130),
|
|
|
|
char(130),
|
|
|
|
format(130,10),
|
2003-05-23 08:32:35 +02:00
|
|
|
left(_latin2'a',1),
|
|
|
|
right(_latin2'a',1),
|
|
|
|
lcase(_latin2'a'),
|
|
|
|
ucase(_latin2'a'),
|
|
|
|
substring(_latin2'a',1,1),
|
|
|
|
concat(_latin2'a',_latin2'b'),
|
2003-06-19 10:12:55 +02:00
|
|
|
lpad(_latin2'a',4,_latin2'b'),
|
|
|
|
rpad(_latin2'a',4,_latin2'b'),
|
2003-06-03 14:13:19 +02:00
|
|
|
concat_ws(_latin2'a',_latin2'b'),
|
2003-06-19 10:12:55 +02:00
|
|
|
make_set(255,_latin2'a',_latin2'b',_latin2'c'),
|
|
|
|
export_set(255,_latin2'y',_latin2'n',_latin2' '),
|
2003-06-03 14:13:19 +02:00
|
|
|
trim(_latin2' a '),
|
|
|
|
ltrim(_latin2' a '),
|
|
|
|
rtrim(_latin2' a '),
|
|
|
|
trim(LEADING _latin2' ' FROM _latin2' a '),
|
|
|
|
trim(TRAILING _latin2' ' FROM _latin2' a '),
|
2003-06-10 11:54:03 +02:00
|
|
|
trim(BOTH _latin2' ' FROM _latin2' a '),
|
|
|
|
repeat(_latin2'a',10),
|
|
|
|
reverse(_latin2'ab'),
|
|
|
|
quote(_latin2'ab'),
|
|
|
|
soundex(_latin2'ab'),
|
2003-06-10 13:41:42 +02:00
|
|
|
substring(_latin2'ab',1),
|
2003-06-19 08:36:44 +02:00
|
|
|
insert(_latin2'abcd',2,3,_latin2'ef'),
|
2004-06-08 12:36:44 +02:00
|
|
|
replace(_latin2'abcd',_latin2'b',_latin2'B'),
|
|
|
|
encode('abcd','ab')
|
2003-06-03 14:13:19 +02:00
|
|
|
;
|
2003-05-23 08:32:35 +02:00
|
|
|
show create table t1;
|
|
|
|
drop table t1;
|
2003-07-12 03:55:03 +02:00
|
|
|
|
Bugs#9129: CHARSET(), COLLATION(), COERCIBILITY()
not always correct for NULL values.
Now they always result a non NULL value even
the argument is NULL. It is more usefull for
debugging purposes.
mysql-test/r/func_str.result:
Bugs#9129: CHARSET(), COLLATION(), COERCIBILITY()
not always correct for NULL values.
Also, a mistake in EXPORT_SET was fixed.
mysql-test/t/func_str.test:
Bugs#9129: CHARSET(), COLLATION(), COERCIBILITY()
not always correct for NULL values.
sql/item_func.cc:
Bugs#9129: CHARSET(), COLLATION(), COERCIBILITY()
not always correct for NULL values.
sql/item_strfunc.cc:
Bugs#9129: CHARSET(), COLLATION(), COERCIBILITY()
not always correct for NULL values.
A minor mistake in EXPORT_SET() was fixed.
2005-03-16 14:44:29 +01:00
|
|
|
#
|
|
|
|
# Bug#9129
|
|
|
|
#
|
|
|
|
create table t1 (a char character set latin2);
|
|
|
|
insert into t1 values (null);
|
|
|
|
select charset(a), collation(a), coercibility(a) from t1;
|
|
|
|
drop table t1;
|
|
|
|
select charset(null), collation(null), coercibility(null);
|
2005-03-24 15:10:46 +01:00
|
|
|
#
|
|
|
|
# Make sure OUTER JOIN is not replaced with a regular joun
|
|
|
|
#
|
|
|
|
CREATE TABLE t1 (a int, b int);
|
|
|
|
CREATE TABLE t2 (a int, b int);
|
|
|
|
INSERT INTO t1 VALUES (1,1),(2,2);
|
|
|
|
INSERT INTO t2 VALUES (2,2),(3,3);
|
|
|
|
select t1.*,t2.* from t1 left join t2 on (t1.b=t2.b)
|
|
|
|
where collation(t2.a) = _utf8'binary' order by t1.a,t2.a;
|
|
|
|
select t1.*,t2.* from t1 left join t2 on (t1.b=t2.b)
|
|
|
|
where charset(t2.a) = _utf8'binary' order by t1.a,t2.a;
|
|
|
|
select t1.*,t2.* from t1 left join t2 on (t1.b=t2.b)
|
WL#2649 Number-to-string conversions
added:
include/ctype_numconv.inc
mysql-test/include/ctype_numconv.inc
mysql-test/r/ctype_binary.result
mysql-test/t/ctype_binary.test
Adding tests
modified:
mysql-test/r/bigint.result
mysql-test/r/case.result
mysql-test/r/create.result
mysql-test/r/ctype_cp1251.result
mysql-test/r/ctype_latin1.result
mysql-test/r/ctype_ucs.result
mysql-test/r/func_gconcat.result
mysql-test/r/func_str.result
mysql-test/r/metadata.result
mysql-test/r/ps_1general.result
mysql-test/r/ps_2myisam.result
mysql-test/r/ps_3innodb.result
mysql-test/r/ps_4heap.result
mysql-test/r/ps_5merge.result
mysql-test/r/show_check.result
mysql-test/r/type_datetime.result
mysql-test/r/type_ranges.result
mysql-test/r/union.result
mysql-test/suite/ndb/r/ps_7ndb.result
mysql-test/t/ctype_cp1251.test
mysql-test/t/ctype_latin1.test
mysql-test/t/ctype_ucs.test
mysql-test/t/func_str.test
Fixing tests
@ sql/field.cc
- Return str result using my_charset_numeric.
- Using real multi-byte aware str_to_XXX functions
to handle tricky charset values propely (e.g. UCS2)
@ sql/field.h
- Changing derivation of non-string field types to DERIVATION_NUMERIC.
- Changing binary() for numeric/datetime fields to always
return TRUE even if charset is not my_charset_bin. We need
this to keep ha_base_keytype() return HA_KEYTYPE_BINARY.
- Adding BINARY_FLAG into some fields, because it's not
being set automatically anymore with
"my_charset_bin to my_charset_numeric" change.
- Changing derivation for numeric/datetime datatypes to a weaker
value, to make "SELECT concat('string', field)" use character
set of the string literal for the result of the function.
@ sql/item.cc
- Implementing generic val_str_ascii().
- Using max_char_length() instead of direct read of max_length
to make "tricky" charsets like UCS2 work.
NOTE: in the future we'll possibly remove all direct reads of max_length
- Fixing Item_num::safe_charset_converter().
Previously it alligned binary string to
character string (for example by adding leading 0x00
when doing binary->UCS2 conversion). Now it just
converts from my_charset_numbner to "tocs".
- Using val_str_ascii() in Item::get_time() to make UCS2 arguments work.
- Other misc changes
@ sql/item.h
- Changing MY_COLL_CMP_CONV and MY_COLL_ALLOW_CONV to
bit operations instead of hard-coded bit masks.
- Addding new method DTCollation.set_numeric().
- Adding new methods to Item.
- Adding helper functions to make code look nicer:
agg_item_charsets_for_string_result()
agg_item_charsets_for_comparison()
- Changing charset for Item_num-derived items
from my_charset_bin to my_charset_numeric
(which is an alias for latin1).
@ sql/item_cmpfunc.cc
- Using new helper functions
- Other misc changes
@ sql/item_cmpfunc.h
- Fixing strcmp() to return max_length=2.
Previously it returned 1, which was wrong,
because it did not fit '-1'.
@ sql/item_func.cc
- Using new helper functions
- Other minor changes
@ sql/item_func.h
- Removing unused functions
- Adding helper functions
agg_arg_charsets_for_string_result()
agg_arg_charsets_for_comparison()
- Adding set_numeric() into constructors of numeric items.
- Using fix_length_and_charset() and fix_char_length()
instead of direct write to max_length.
@ sql/item_geofunc.cc
- Changing class for Item_func_geometry_type and
Item_func_as_wkt from Item_str_func to
Item_str_ascii_func, to make them return UCS2 result
properly (when character_set_connection=ucs2).
@ sql/item_geofunc.h
- Changing class for Item_func_geometry_type and
Item_func_as_wkt from Item_str_func to
Item_str_ascii_func, to make them return UCS2 result
properly (when @@character_set_connection=ucs2).
@ sql/item_strfunc.cc
- Implementing Item_str_func::val_str().
- Renaming val_str to val_str_ascii for some items,
to make them work with UCS2 properly.
- Using new helper functions
- All single-argument functions that expect string
result now call this method:
agg_arg_charsets_for_string_result(collation, args, 1);
This enables character set conversion to @@character_set_connection
in case of pure numeric input.
@ sql/item_strfunc.h
- Introducing Item_str_ascii_func - for functions
which return pure ASCII data, for performance purposes,
as well as for the cases when the old implementation
of val_str() was heavily 8-bit oriented and implementing
a UCS2-aware version is tricky.
@ sql/item_sum.cc
- Using new helper functions.
@ sql/item_timefunc.cc
- Using my_charset_numeric instead of my_charset_bin.
- Using fix_char_length(), fix_length_and_charset()
and fix_length_and_charset_datetime()
instead of direct write to max_length.
- Using tricky-charset aware function str_to_time_with_warn()
@ sql/item_timefunc.h
- Using new helper functions for charset and length initialization.
- Changing base class for Item_func_get_format() to make
it return UCS2 properly (when character_set_connection=ucs2).
@ sql/item_xmlfunc.cc
- Using new helper function
@ sql/my_decimal.cc
- Adding a new DECIMAL to CHAR converter
with real multibyte support (e.g. UCS2)
@ sql/mysql_priv.h
- Introducing a new derivation level for numeric/datetime data types.
- Adding macros for my_charset_numeric and MY_REPERTOIRE_NUMERIC.
- Adding prototypes for str_set_decimal()
- Adding prototypes for character-set aware str_to_xxx() functions.
@ sql/protocol.cc
- Changing charsetnr to "binary" client-side metadata for
numeric/datetime data types.
@ sql/time.cc
- Adding to_ascii() helper function, to convert a string
in any character set to ascii representation. In the
future can be extended to understand digits written
in various non-Latin word scripts.
- Adding real multy-byte character set aware versions for str_to_XXXX,
to make these these type of queries work correct:
INSERT INTO t1 SET datetime_column=ucs2_expression;
@ strings/ctype-ucs2.c
- endptr was not calculated correctly. INSERTing of UCS2
values into numeric columns returned warnings about
truncated wrong data.
2010-02-11 05:17:25 +01:00
|
|
|
where coercibility(t2.a) = 5 order by t1.a,t2.a;
|
2005-03-24 15:10:46 +01:00
|
|
|
DROP TABLE t1, t2;
|
Bugs#9129: CHARSET(), COLLATION(), COERCIBILITY()
not always correct for NULL values.
Now they always result a non NULL value even
the argument is NULL. It is more usefull for
debugging purposes.
mysql-test/r/func_str.result:
Bugs#9129: CHARSET(), COLLATION(), COERCIBILITY()
not always correct for NULL values.
Also, a mistake in EXPORT_SET was fixed.
mysql-test/t/func_str.test:
Bugs#9129: CHARSET(), COLLATION(), COERCIBILITY()
not always correct for NULL values.
sql/item_func.cc:
Bugs#9129: CHARSET(), COLLATION(), COERCIBILITY()
not always correct for NULL values.
sql/item_strfunc.cc:
Bugs#9129: CHARSET(), COLLATION(), COERCIBILITY()
not always correct for NULL values.
A minor mistake in EXPORT_SET() was fixed.
2005-03-16 14:44:29 +01:00
|
|
|
|
2003-07-12 03:55:03 +02:00
|
|
|
#
|
|
|
|
# test for SUBSTR
|
|
|
|
#
|
|
|
|
select SUBSTR('abcdefg',3,2);
|
|
|
|
select SUBSTRING('abcdefg',3,2);
|
|
|
|
select SUBSTR('abcdefg',-3,2) FROM DUAL;
|
|
|
|
select SUBSTR('abcdefg',-1,5) FROM DUAL;
|
|
|
|
select SUBSTR('abcdefg',0,0) FROM DUAL;
|
|
|
|
select SUBSTR('abcdefg',-1,-1) FROM DUAL;
|
|
|
|
select SUBSTR('abcdefg',1,-1) FROM DUAL;
|
2003-08-05 07:08:16 +02:00
|
|
|
|
|
|
|
#
|
|
|
|
# Test that fix_fields doesn't follow to upper level (to comparison)
|
|
|
|
# when an error on a lower level (in concat) has accured:
|
|
|
|
#
|
|
|
|
create table t7 (s1 char);
|
After merge fixes
Added more DBUG statements
Ensure that we are comparing end space with BINARY strings
Use 'any_db' instead of '' to mean any database. (For HANDLER command)
Only strip ' ' when comparing CHAR, not other space-like characters (like \t)
BitKeeper/deleted/.del-ctype_tis620.result-old~3578ceb0b8284685:
Delete: mysql-test/r/ctype_tis620.result-old
BitKeeper/deleted/.del-ctype_tis620.test-old~ffb1bbd2935d1aba:
Delete: mysql-test/t/ctype_tis620.test-old
client/mysqlbinlog.cc:
Added DBUG statements
Added call of my_end() to free all used memory on exit
heap/hp_info.c:
After merge fixes
heap/hp_open.c:
After merge fixes
include/heap.h:
After merge fixes
include/m_ctype.h:
Use pchar instead of 'int' for character parameters.
Added 'my_binary_compare()'
include/m_string.h:
Fixed wrong define
innobase/ibuf/ibuf0ibuf.c:
After merge fixes
innobase/srv/srv0start.c:
After merge fixes
mysql-test/r/alter_table.result:
Fixed results after merge
mysql-test/r/auto_increment.result:
Fixed results after merge
mysql-test/r/bdb.result:
Fixed results after merge
mysql-test/r/binary.result:
Fixed results after merge
mysql-test/r/create.result:
Fixed results after merge
mysql-test/r/ctype_mb.result:
Fixed results after merge
mysql-test/r/ctype_tis620.result:
Fixed results after merge
mysql-test/r/ctype_utf8.result:
Fixed results after merge
mysql-test/r/delete.result:
Fixed results after merge
mysql-test/r/func_compress.result:
Fixed results after merge
mysql-test/r/func_gconcat.result:
Fixed results after merge
mysql-test/r/func_group.result:
Fixed results after merge
mysql-test/r/func_str.result:
Fixed results after merge
mysql-test/r/innodb.result:
Fixed results after merge
mysql-test/r/insert.result:
Fixed results after merge
mysql-test/r/insert_select.result:
Fixed results after merge
mysql-test/r/key.result:
Fixed results after merge
mysql-test/r/loaddata.result:
Fixed results after merge
mysql-test/r/lock.result:
Fixed results after merge
mysql-test/r/myisam.result:
Fixed results after merge
mysql-test/r/null.result:
Fixed results after merge
mysql-test/r/null_key.result:
Fixed results after merge
mysql-test/r/order_by.result:
Fixed results after merge
mysql-test/r/query_cache.result:
Fixed results after merge
mysql-test/r/range.result:
Fixed results after merge
mysql-test/r/rpl_multi_delete.result:
Fixed results after merge
mysql-test/r/rpl_until.result:
Fixed results after merge
mysql-test/r/subselect.result:
Fixed results after merge
mysql-test/r/subselect_innodb.result:
Fixed results after merge
mysql-test/r/type_blob.result:
Fixed results after merge
mysql-test/r/type_datetime.result:
Fixed results after merge
mysql-test/r/type_decimal.result:
Fixed results after merge
mysql-test/r/type_enum.result:
Fixed results after merge
mysql-test/r/type_float.result:
Fixed results after merge
mysql-test/r/type_ranges.result:
Fixed results after merge
mysql-test/r/type_time.result:
Fixed results after merge
mysql-test/r/type_timestamp.result:
Fixed results after merge
mysql-test/r/type_uint.result:
Fixed results after merge
mysql-test/r/type_year.result:
Fixed results after merge
mysql-test/r/variables.result:
Fixed results after merge
mysql-test/r/warnings.result:
Fixed results after merge
mysql-test/t/case.test:
Fixed shifted error messages
mysql-test/t/create.test:
Fixed shifted error messages
mysql-test/t/ctype_collate.test:
Fixed shifted error messages
mysql-test/t/ctype_tis620.test:
Merge with 4.0 ctype_tis620 test
mysql-test/t/delete.test:
Fixed shifted error messages
mysql-test/t/derived.test:
Fixed shifted error messages
mysql-test/t/fulltext.test:
Fixed shifted error messages
mysql-test/t/func_in.test:
Fixed shifted error messages
mysql-test/t/func_str.test:
Fixed shifted error messages
mysql-test/t/func_test.test:
Fixed shifted error messages
mysql-test/t/grant.test:
Fixed shifted error messages
mysql-test/t/innodb.test:
Change to 4.1 syntax
mysql-test/t/key_cache.test:
Fixed shifted error messages
mysql-test/t/myisam.test:
New test of blob and end space
mysql-test/t/row.test:
Fixed shifted error messages
mysql-test/t/rpl_until.test:
Fixed shifted error messages
mysql-test/t/subselect.test:
Fixed shifted error messages
mysql-test/t/subselect_innodb.test:
Fix test to take into account foreign key constraints
mysql-test/t/union.test:
Fixed shifted error messages
mysql-test/t/user_var.test:
Fixed shifted error messages
mysql-test/t/variables.test:
Fixed shifted error messages
mysys/my_handler.c:
Merge with 4.0 code
sql/ha_heap.cc:
After merge fixes
sql/handler.cc:
After merge fixes
sql/item.cc:
After merge fixes
sql/item_cmpfunc.cc:
Ensure that we are comparing end space with BINARY strings
sql/item_cmpfunc.h:
Ensure that we are comparing end space with BINARY strings
sql/log_event.cc:
More DBUG statements
Ensure that we use all options to LOAD DATA in replication
sql/opt_range.cc:
After merge fixes
sql/sql_db.cc:
After merge fixes
sql/sql_handler.cc:
After merge fixes
Use 'any_db' instead of '' to mean 'no database comparison'
sql/sql_parse.cc:
After merge fixes
sql/sql_select.cc:
After merge fixes
Added function comment for setup_group()
sql/sql_string.cc:
Added stringcmp() for binary comparison.
Added function comments for sortcmp() and stringcmp()
sql/sql_string.h:
Added stringcmp()
sql/sql_table.cc:
After merge fixes
sql/sql_update.cc:
After merge fixes
sql/sql_yacc.yy:
Use 'any_db' instead of '' to mean any database. Using "" causes a 'wrong db name' error.
strings/ctype-big5.c:
Strip only end space, not other space characters.
strings/ctype-bin.c:
Removed some not needed functions.
Added function comments
Don't remove end space in comparisons
Change my_wildcmp_bin() to be 'identical' with other similar code
strings/ctype-czech.c:
Strip only end space, not other space characters.
strings/ctype-gbk.c:
Strip only end space, not other space characters.
strings/ctype-latin1.c:
Strip only end space, not other space characters.
strings/ctype-mb.c:
Strip only end space, not other space characters.
strings/ctype-simple.c:
Strip only end space, not other space characters.
strings/ctype-sjis.c:
Strip only end space, not other space characters.
strings/ctype-tis620.c:
Added usage of my_instr_simple. This needs to be cleaned up!
strings/ctype-utf8.c:
Strip only end space, not other space characters.
strings/ctype-win1250ch.c:
Strip only end space, not other space characters.
Fixed indentation
strings/strto.c:
Code cleanup
2004-02-16 09:03:25 +01:00
|
|
|
--error 1267
|
2003-08-05 07:08:16 +02:00
|
|
|
select * from t7
|
|
|
|
where concat(s1 collate latin1_general_ci,s1 collate latin1_swedish_ci) = 'AA';
|
|
|
|
drop table t7;
|
2003-08-11 21:44:43 +02:00
|
|
|
|
2003-11-07 08:43:24 +01:00
|
|
|
select substring_index("1abcd;2abcd;3abcd;4abcd", ';', 2),substring_index("1abcd;2abcd;3abcd;4abcd", ';', -2);
|
|
|
|
|
Bug#22684 (BENCHMARK, ENCODE, DECODE and FORMAT are not real functions)
Before this change, the functions BENCHMARK, ENCODE, DECODE and FORMAT could
only accept a constant for some parameters.
After this change, this restriction has been removed. An implication is that
these functions can also be used in prepared statements.
The change consist of changing the following classes:
- Item_func_benchmark
- Item_func_encode
- Item_func_decode
- Item_func_format
to:
- only accept Item* in the constructor,
- and evaluate arguments during calls to val_xxx()
which fits the general design of all the other functions.
The 'TODO' items identified in item_create.cc during the work done for
Bug 21114 are addressed by this fix, as a natural consequence of aligning
the design.
In the 'func_str' test, a single very long test line involving an explain
extended select with many functions has been rewritten into multiple
separate tests, to improve maintainability.
The result of explain extended select decode(encode(...)) has changed,
since the encode and decode functions now print all their parameters.
mysql-test/r/func_str.result:
Bug#22684 (BENCHMARK, ENCODE, DECODE and FORMAT are not real functions)
mysql-test/r/parser.result:
Bug#22684 (BENCHMARK, ENCODE, DECODE and FORMAT are not real functions)
mysql-test/r/ps.result:
Bug#22684 (BENCHMARK, ENCODE, DECODE and FORMAT are not real functions)
mysql-test/t/func_str.test:
Bug#22684 (BENCHMARK, ENCODE, DECODE and FORMAT are not real functions)
mysql-test/t/parser.test:
Bug#22684 (BENCHMARK, ENCODE, DECODE and FORMAT are not real functions)
mysql-test/t/ps.test:
Bug#22684 (BENCHMARK, ENCODE, DECODE and FORMAT are not real functions)
sql/item_create.cc:
Bug#22684 (BENCHMARK, ENCODE, DECODE and FORMAT are not real functions)
sql/item_func.cc:
Bug#22684 (BENCHMARK, ENCODE, DECODE and FORMAT are not real functions)
sql/item_func.h:
Bug#22684 (BENCHMARK, ENCODE, DECODE and FORMAT are not real functions)
sql/item_strfunc.cc:
Bug#22684 (BENCHMARK, ENCODE, DECODE and FORMAT are not real functions)
sql/item_strfunc.h:
Bug#22684 (BENCHMARK, ENCODE, DECODE and FORMAT are not real functions)
2006-11-16 17:03:47 +01:00
|
|
|
explain extended select md5('hello');
|
|
|
|
explain extended select sha('abc');
|
|
|
|
explain extended select sha1('abc');
|
|
|
|
explain extended select soundex('');
|
|
|
|
explain extended select 'mood' sounds like 'mud';
|
|
|
|
explain extended select aes_decrypt(aes_encrypt('abc','1'),'1');
|
|
|
|
explain extended select concat('*',space(5),'*');
|
|
|
|
explain extended select reverse('abc');
|
|
|
|
explain extended select rpad('a',4,'1');
|
|
|
|
explain extended select lpad('a',4,'1');
|
|
|
|
explain extended select concat_ws(',','',NULL,'a');
|
|
|
|
explain extended select make_set(255,_latin2'a', _latin2'b', _latin2'c');
|
|
|
|
explain extended select elt(2,1);
|
|
|
|
explain extended select locate("a","b",2);
|
|
|
|
explain extended select format(130,10);
|
|
|
|
explain extended select char(0);
|
|
|
|
explain extended select conv(130,16,10);
|
|
|
|
explain extended select hex(130);
|
|
|
|
explain extended select binary 'HE';
|
|
|
|
explain extended select export_set(255,_latin2'y', _latin2'n', _latin2' ');
|
|
|
|
explain extended select FIELD('b' COLLATE latin1_bin,'A','B');
|
|
|
|
explain extended select FIND_IN_SET(_latin1'B', _latin1'a,b,c,d');
|
|
|
|
explain extended select collation(conv(130,16,10));
|
|
|
|
explain extended select coercibility(conv(130,16,10));
|
|
|
|
explain extended select length('\n\t\r\b\0\_\%\\');
|
|
|
|
explain extended select bit_length('\n\t\r\b\0\_\%\\');
|
|
|
|
explain extended select bit_length('\n\t\r\b\0\_\%\\');
|
|
|
|
explain extended select concat('monty',' was here ','again');
|
|
|
|
explain extended select length('hello');
|
|
|
|
explain extended select char(ascii('h'));
|
|
|
|
explain extended select ord('h');
|
|
|
|
explain extended select quote(1/0);
|
|
|
|
explain extended select crc32("123");
|
|
|
|
explain extended select replace('aaaa','a','b');
|
|
|
|
explain extended select insert('txs',2,1,'hi');
|
|
|
|
explain extended select left(_latin2'a',1);
|
|
|
|
explain extended select right(_latin2'a',1);
|
|
|
|
explain extended select lcase(_latin2'a');
|
|
|
|
explain extended select ucase(_latin2'a');
|
|
|
|
explain extended select SUBSTR('abcdefg',3,2);
|
|
|
|
explain extended select substring_index("1abcd;2abcd;3abcd;4abcd", ';', 2);
|
|
|
|
explain extended select trim(_latin2' a ');
|
|
|
|
explain extended select ltrim(_latin2' a ');
|
|
|
|
explain extended select rtrim(_latin2' a ');
|
|
|
|
explain extended select decode(encode(repeat("a",100000),"monty"),"monty");
|
2003-12-22 16:00:51 +01:00
|
|
|
|
|
|
|
#
|
2004-05-05 11:31:17 +02:00
|
|
|
# lpad returns incorrect result (Bug #2182)
|
2003-12-22 16:00:51 +01:00
|
|
|
#
|
|
|
|
|
|
|
|
SELECT lpad(12345, 5, "#");
|
2004-03-09 13:52:37 +01:00
|
|
|
|
2004-03-15 16:18:30 +01:00
|
|
|
#
|
2004-05-05 11:31:17 +02:00
|
|
|
# Problem the the CONV() function (Bug #2972)
|
2004-03-15 16:18:30 +01:00
|
|
|
#
|
|
|
|
|
|
|
|
SELECT conv(71, 10, 36), conv('1Z', 36, 10);
|
2005-10-06 16:54:43 +02:00
|
|
|
SELECT conv(71, 10, 37), conv('1Z', 37, 10), conv(0,1,10),conv(0,0,10), conv(0,-1,10);
|
2004-03-15 16:18:30 +01:00
|
|
|
|
2004-03-09 13:52:37 +01:00
|
|
|
#
|
2004-05-05 11:31:17 +02:00
|
|
|
# Bug in SUBSTRING when mixed with CONCAT and ORDER BY (Bug #3089)
|
2004-03-09 13:52:37 +01:00
|
|
|
#
|
|
|
|
|
|
|
|
create table t1 (id int(1), str varchar(10)) DEFAULT CHARSET=utf8;
|
|
|
|
insert into t1 values (1,'aaaaaaaaaa'), (2,'bbbbbbbbbb');
|
|
|
|
create table t2 (id int(1), str varchar(10)) DEFAULT CHARSET=utf8;
|
|
|
|
insert into t2 values (1,'cccccccccc'), (2,'dddddddddd');
|
|
|
|
select substring(concat(t1.str, t2.str), 1, 15) "name" from t1, t2
|
|
|
|
where t2.id=t1.id order by name;
|
|
|
|
drop table t1, t2;
|
2004-05-05 11:31:17 +02:00
|
|
|
|
|
|
|
#
|
|
|
|
# Test case for conversion of long string value to integer (Bug #3472)
|
|
|
|
#
|
|
|
|
|
2004-05-07 00:43:17 +02:00
|
|
|
create table t1 (c1 INT, c2 INT UNSIGNED);
|
|
|
|
insert into t1 values ('21474836461','21474836461');
|
|
|
|
insert into t1 values ('-21474836461','-21474836461');
|
2004-05-05 11:31:17 +02:00
|
|
|
show warnings;
|
|
|
|
select * from t1;
|
|
|
|
drop table t1;
|
2004-08-12 08:28:39 +02:00
|
|
|
|
|
|
|
#
|
|
|
|
# Bug #4878: LEFT() in integer/float context
|
|
|
|
#
|
|
|
|
|
|
|
|
select left(1234, 3) + 0;
|
2004-12-09 23:17:43 +01:00
|
|
|
|
|
|
|
#
|
|
|
|
# Bug #7101: bug with LEFT() when used as a field in GROUP BY aggregation
|
|
|
|
#
|
|
|
|
create table t1 (a int not null primary key, b varchar(40), c datetime);
|
2004-12-11 09:39:29 +01:00
|
|
|
insert into t1 (a,b,c) values (1,'Tom','2004-12-10 12:13:14'),(2,'ball games','2004-12-10 12:13:14'), (3,'Basil','2004-12-10 12:13:14'), (4,'Dean','2004-12-10 12:13:14'),(5,'Ellis','2004-12-10 12:13:14'), (6,'Serg','2004-12-10 12:13:14'), (7,'Sergei','2004-12-10 12:13:14'),(8,'Georg','2004-12-10 12:13:14'),(9,'Salle','2004-12-10 12:13:14'),(10,'Sinisa','2004-12-10 12:13:14');
|
2004-12-09 23:17:43 +01:00
|
|
|
select count(*) as total, left(c,10) as reg from t1 group by reg order by reg desc limit 0,12;
|
|
|
|
drop table t1;
|
2004-12-28 10:57:56 +01:00
|
|
|
|
|
|
|
#
|
|
|
|
# Bug#7455 unexpected result: TRIM(<NULL> FROM <whatever>) gives NOT NULL
|
|
|
|
# According to ANSI if one of the TRIM arguments is NULL, then the result
|
|
|
|
# must be NULL too.
|
|
|
|
#
|
|
|
|
select trim(null from 'kate') as "must_be_null";
|
|
|
|
select trim('xyz' from null) as "must_be_null";
|
2005-01-02 22:31:37 +01:00
|
|
|
select trim(leading NULL from 'kate') as "must_be_null";
|
|
|
|
select trim(trailing NULL from 'xyz') as "must_be_null";
|
2005-02-02 08:34:31 +01:00
|
|
|
|
|
|
|
#
|
|
|
|
# Bug #7751 - conversion for a bigint unsigned constant
|
|
|
|
#
|
|
|
|
|
|
|
|
CREATE TABLE t1 (
|
|
|
|
id int(11) NOT NULL auto_increment,
|
|
|
|
a bigint(20) unsigned default NULL,
|
|
|
|
PRIMARY KEY (id)
|
|
|
|
) ENGINE=MyISAM;
|
|
|
|
|
|
|
|
INSERT INTO t1 VALUES
|
|
|
|
('0','16307858876001849059');
|
|
|
|
|
|
|
|
SELECT CONV('e251273eb74a8ee3', 16, 10);
|
|
|
|
|
|
|
|
EXPLAIN
|
|
|
|
SELECT id
|
|
|
|
FROM t1
|
|
|
|
WHERE a = 16307858876001849059;
|
|
|
|
|
|
|
|
EXPLAIN
|
|
|
|
SELECT id
|
|
|
|
FROM t1
|
|
|
|
WHERE a = CONV('e251273eb74a8ee3', 16, 10);
|
|
|
|
|
|
|
|
DROP TABLE t1;
|
2005-02-23 16:15:45 +01:00
|
|
|
|
|
|
|
#
|
|
|
|
# Bug #6317: string function CHAR, parameter is NULL, wrong result
|
|
|
|
#
|
|
|
|
SELECT CHAR(NULL,121,83,81,'76') as my_column;
|
|
|
|
SELECT CHAR_LENGTH(CHAR(NULL,121,83,81,'76')) as my_column;
|
2005-03-09 09:15:51 +01:00
|
|
|
#
|
|
|
|
# Test case for bug #8669: null aes_decrypt result in order by query
|
|
|
|
#
|
|
|
|
|
|
|
|
CREATE TABLE t1 (id int PRIMARY KEY, str char(255) NOT NULL);
|
|
|
|
CREATE TABLE t2 (id int NOT NULL UNIQUE);
|
|
|
|
INSERT INTO t2 VALUES (1),(2);
|
|
|
|
INSERT INTO t1 VALUES (1, aes_encrypt('foo', 'bar'));
|
|
|
|
INSERT INTO t1 VALUES (2, 'not valid');
|
|
|
|
|
|
|
|
SELECT t1.id, aes_decrypt(str, 'bar') FROM t1, t2 WHERE t1.id = t2.id;
|
|
|
|
SELECT t1.id, aes_decrypt(str, 'bar') FROM t1, t2 WHERE t1.id = t2.id
|
|
|
|
ORDER BY t1.id;
|
|
|
|
|
|
|
|
DROP TABLE t1, t2;
|
|
|
|
|
2005-06-01 18:48:25 +02:00
|
|
|
#
|
|
|
|
# Bug #10944: Mishandling of NULL arguments in FIELD()
|
|
|
|
#
|
|
|
|
select field(0,NULL,1,0), field("",NULL,"bar",""), field(0.0,NULL,1.0,0.0);
|
|
|
|
select field(NULL,1,2,NULL), field(NULL,1,2,0);
|
func_str.result, func_str.test:
Added a test case for bug #10124.
sql_select.h, item_subselect.cc, sql_select.cc:
Fixed bug #10124.
The copy method of the store_key classes can return
STORE_KEY_OK=0, STORE_KEY_FATAL=1, STORE_KEY_CONV=2 now.
field.cc:
Fixed bug #10124.
When ussuing a warning the store methods return 2 instead of 1 now.
sql/field.cc:
Fixed bug #10124.
When ussuing a warning the store methods return 2 instead of 1 now.
sql/sql_select.cc:
Fixed bug #10124.
The copy method of the store_key classes can return
STORE_KEY_OK=0, STORE_KEY_FATAL=1, STORE_KEY_CONV=2 now.
sql/item_subselect.cc:
Fixed bug #10124.
The copy method of the store_key classes can return
STORE_KEY_OK=0, STORE_KEY_FATAL=1, STORE_KEY_CONV=2 now.
sql/sql_select.h:
Fixed bug #10124.
The copy method of the store_key classes can return
STORE_KEY_OK=0, STORE_KEY_FATAL=1, STORE_KEY_CONV=2 now.
mysql-test/t/func_str.test:
Added a test case for bug #10124.
mysql-test/r/func_str.result:
Added a test case for bug #10124.
2005-06-23 15:15:50 +02:00
|
|
|
|
|
|
|
#
|
|
|
|
# Bug #10124: access by integer index with a string key that is not a number
|
|
|
|
#
|
|
|
|
|
|
|
|
CREATE TABLE t1 (str varchar(20) PRIMARY KEY);
|
|
|
|
CREATE TABLE t2 (num int primary key);
|
|
|
|
INSERT INTO t1 VALUES ('notnumber');
|
|
|
|
INSERT INTO t2 VALUES (0), (1);
|
|
|
|
|
|
|
|
SELECT * FROM t1, t2 WHERE num=str;
|
|
|
|
SELECT * FROM t1, t2 WHERE num=substring(str from 1 for 6);
|
|
|
|
|
|
|
|
DROP TABLE t1,t2;
|
2005-06-29 11:40:25 +02:00
|
|
|
|
|
|
|
#
|
|
|
|
# Bug #11469: NOT NULL optimization wrongly used for arguments of CONCAT_WS
|
|
|
|
#
|
|
|
|
|
|
|
|
CREATE TABLE t1(
|
|
|
|
id int(11) NOT NULL auto_increment,
|
|
|
|
pc int(11) NOT NULL default '0',
|
|
|
|
title varchar(20) default NULL,
|
|
|
|
PRIMARY KEY (id)
|
|
|
|
);
|
|
|
|
|
|
|
|
INSERT INTO t1 VALUES
|
|
|
|
(1, 0, 'Main'),
|
|
|
|
(2, 1, 'Toys'),
|
|
|
|
(3, 1, 'Games');
|
|
|
|
|
|
|
|
SELECT t1.id, CONCAT_WS('->', t3.title, t2.title, t1.title) as col1
|
|
|
|
FROM t1 LEFT JOIN t1 AS t2 ON t1.pc=t2.id
|
|
|
|
LEFT JOIN t1 AS t3 ON t2.pc=t3.id;
|
|
|
|
SELECT t1.id, CONCAT_WS('->', t3.title, t2.title, t1.title) as col1
|
|
|
|
FROM t1 LEFT JOIN t1 AS t2 ON t1.pc=t2.id
|
|
|
|
LEFT JOIN t1 AS t3 ON t2.pc=t3.id
|
|
|
|
WHERE CONCAT_WS('->', t3.title, t2.title, t1.title) LIKE '%Toys%';
|
|
|
|
|
|
|
|
DROP TABLE t1;
|
|
|
|
|
|
|
|
|
|
|
|
CREATE TABLE t1(
|
|
|
|
trackid int(10) unsigned NOT NULL auto_increment,
|
|
|
|
trackname varchar(100) NOT NULL default '',
|
|
|
|
PRIMARY KEY (trackid)
|
|
|
|
);
|
|
|
|
|
|
|
|
CREATE TABLE t2(
|
|
|
|
artistid int(10) unsigned NOT NULL auto_increment,
|
|
|
|
artistname varchar(100) NOT NULL default '',
|
|
|
|
PRIMARY KEY (artistid)
|
|
|
|
);
|
|
|
|
|
|
|
|
CREATE TABLE t3(
|
|
|
|
trackid int(10) unsigned NOT NULL,
|
|
|
|
artistid int(10) unsigned NOT NULL,
|
|
|
|
PRIMARY KEY (trackid,artistid)
|
|
|
|
);
|
|
|
|
|
|
|
|
INSERT INTO t1 VALUES (1, 'April In Paris'), (2, 'Autumn In New York');
|
|
|
|
INSERT INTO t2 VALUES (1, 'Vernon Duke');
|
|
|
|
INSERT INTO t3 VALUES (1,1);
|
|
|
|
|
|
|
|
SELECT CONCAT_WS(' ', trackname, artistname) trackname, artistname
|
|
|
|
FROM t1 LEFT JOIN t3 ON t1.trackid=t3.trackid
|
|
|
|
LEFT JOIN t2 ON t2.artistid=t3.artistid
|
|
|
|
WHERE CONCAT_WS(' ', trackname, artistname) LIKE '%In%';
|
|
|
|
|
|
|
|
DROP TABLE t1,t2,t3;
|
2005-07-06 10:36:27 +02:00
|
|
|
|
2005-06-28 20:45:11 +02:00
|
|
|
#
|
|
|
|
# Correct length reporting from substring() (BUG#10269)
|
|
|
|
#
|
|
|
|
create table t1 (b varchar(5));
|
|
|
|
insert t1 values ('ab'), ('abc'), ('abcd'), ('abcde');
|
|
|
|
select *,substring(b,1),substring(b,-1),substring(b,-2),substring(b,-3),substring(b,-4),substring(b,-5) from t1;
|
|
|
|
select * from (select *,substring(b,1),substring(b,-1),substring(b,-2),substring(b,-3),substring(b,-4),substring(b,-5) from t1) t;
|
|
|
|
drop table t1;
|
2005-07-13 11:23:09 +02:00
|
|
|
|
|
|
|
#
|
|
|
|
# Bug #9854 hex() and out of range handling
|
|
|
|
#
|
|
|
|
select hex(29223372036854775809), hex(-29223372036854775809);
|
2005-07-22 20:46:29 +02:00
|
|
|
|
|
|
|
#
|
|
|
|
# Bug #11311: Incorrect length returned from LPAD() and RPAD()
|
|
|
|
#
|
|
|
|
create table t1 (i int);
|
|
|
|
insert into t1 values (1000000000),(1);
|
|
|
|
--enable_metadata
|
|
|
|
select lpad(i, 7, ' ') as t from t1;
|
|
|
|
select rpad(i, 7, ' ') as t from t1;
|
|
|
|
--disable_metadata
|
|
|
|
drop table t1;
|
2005-07-28 02:22:47 +02:00
|
|
|
|
2006-05-08 04:37:58 +02:00
|
|
|
#
|
|
|
|
# Bug #10418: LOAD_FILE does not behave like in manual if file does not exist
|
|
|
|
#
|
|
|
|
|
|
|
|
select load_file("lkjlkj");
|
|
|
|
select ifnull(load_file("lkjlkj"),"it's null");
|
|
|
|
|
2006-05-28 20:01:38 +02:00
|
|
|
#
|
|
|
|
# Bug#15351: Wrong collation used for comparison of md5() and sha()
|
|
|
|
# parameter can lead to a wrong result.
|
|
|
|
#
|
|
|
|
create table t1 (f1 varchar(4), f2 varchar(64), unique key k1 (f1,f2));
|
|
|
|
insert into t1 values ( 'test',md5('test')), ('test', sha('test'));
|
|
|
|
select * from t1 where f1='test' and (f2= md5("test") or f2= md5("TEST"));
|
|
|
|
select * from t1 where f1='test' and (f2= md5("TEST") or f2= md5("test"));
|
|
|
|
select * from t1 where f1='test' and (f2= sha("test") or f2= sha("TEST"));
|
|
|
|
select * from t1 where f1='test' and (f2= sha("TEST") or f2= sha("test"));
|
|
|
|
drop table t1;
|
|
|
|
|
2006-07-06 20:11:49 +02:00
|
|
|
#
|
|
|
|
# Bug#18243: REVERSE changes its argument
|
|
|
|
#
|
|
|
|
|
|
|
|
CREATE TABLE t1 (a varchar(10));
|
|
|
|
INSERT INTO t1 VALUES ('abc'), ('xyz');
|
|
|
|
|
|
|
|
SELECT a, CONCAT(a,' ',a) AS c FROM t1
|
|
|
|
HAVING LEFT(c,LENGTH(c)-INSTR(REVERSE(c)," ")) = a;
|
|
|
|
|
|
|
|
SELECT a, CONCAT(a,' ',a) AS c FROM t1
|
|
|
|
HAVING LEFT(CONCAT(a,' ',a),
|
|
|
|
LENGTH(CONCAT(a,' ',a))-
|
|
|
|
INSTR(REVERSE(CONCAT(a,' ',a))," ")) = a;
|
|
|
|
|
|
|
|
DROP TABLE t1;
|
2006-07-19 21:36:55 +02:00
|
|
|
|
|
|
|
#
|
|
|
|
# Bug#17526: WRONG PRINT for TRIM FUNCTION with two arguments
|
|
|
|
#
|
|
|
|
|
|
|
|
CREATE TABLE t1 (s varchar(10));
|
|
|
|
INSERT INTO t1 VALUES ('yadda'), ('yaddy');
|
|
|
|
|
|
|
|
EXPLAIN EXTENDED SELECT s FROM t1 WHERE TRIM(s) > 'ab';
|
|
|
|
EXPLAIN EXTENDED SELECT s FROM t1 WHERE TRIM('y' FROM s) > 'ab';
|
|
|
|
EXPLAIN EXTENDED SELECT s FROM t1 WHERE TRIM(LEADING 'y' FROM s) > 'ab';
|
|
|
|
EXPLAIN EXTENDED SELECT s FROM t1 WHERE TRIM(TRAILING 'y' FROM s) > 'ab';
|
|
|
|
EXPLAIN EXTENDED SELECT s FROM t1 WHERE TRIM(BOTH 'y' FROM s) > 'ab';
|
|
|
|
|
|
|
|
DROP TABLE t1;
|
2006-07-06 20:11:49 +02:00
|
|
|
|
2007-01-11 14:45:38 +01:00
|
|
|
#
|
|
|
|
# Bug#23409: ENCODE() and DECODE() functions aren't printed correctly
|
|
|
|
#
|
|
|
|
create table t1(f1 varchar(4));
|
|
|
|
explain extended select encode(f1,'zxcv') as 'enc' from t1;
|
|
|
|
explain extended select decode(f1,'zxcv') as 'enc' from t1;
|
|
|
|
drop table t1;
|
|
|
|
|
2007-10-30 09:35:03 +01:00
|
|
|
#
|
|
|
|
# Bug #31758 inet_ntoa, oct, crashes server with null + filesort
|
|
|
|
#
|
|
|
|
create table t1 (a bigint not null)engine=myisam;
|
|
|
|
insert into t1 set a = 1024*1024*1024*4;
|
|
|
|
delete from t1 order by (inet_ntoa(a)) desc limit 10;
|
|
|
|
drop table t1;
|
|
|
|
create table t1 (a char(36) not null)engine=myisam;
|
|
|
|
insert ignore into t1 set a = ' ';
|
|
|
|
insert ignore into t1 set a = ' ';
|
|
|
|
select * from t1 order by (oct(a));
|
|
|
|
drop table t1;
|
|
|
|
|
2006-05-08 04:37:58 +02:00
|
|
|
--echo End of 4.1 tests
|
2005-09-22 20:40:22 +02:00
|
|
|
|
|
|
|
#
|
|
|
|
# Bug #13361: SELECT FORMAT(<decimal field with null>, 2) crashes
|
|
|
|
#
|
|
|
|
create table t1 (d decimal default null);
|
|
|
|
insert into t1 values (null);
|
|
|
|
select format(d, 2) from t1;
|
|
|
|
drop table t1;
|
|
|
|
|
2005-11-24 01:49:07 +01:00
|
|
|
#
|
|
|
|
# Bug #14676: substring_index() returns incorrect results
|
|
|
|
#
|
|
|
|
create table t1 (c varchar(40));
|
|
|
|
insert into t1 values ('y,abc'),('y,abc');
|
|
|
|
select c, substring_index(lcase(c), @q:=',', -1) as res from t1;
|
|
|
|
drop table t1;
|
|
|
|
|
2006-03-14 11:04:43 +01:00
|
|
|
#
|
|
|
|
# Bug #17043: Casting trimmed string to decimal loses precision
|
|
|
|
#
|
|
|
|
select cast(rtrim(' 20.06 ') as decimal(19,2));
|
|
|
|
select cast(ltrim(' 20.06 ') as decimal(19,2));
|
|
|
|
select cast(rtrim(ltrim(' 20.06 ')) as decimal(19,2));
|
|
|
|
|
2006-05-18 19:34:01 +02:00
|
|
|
#
|
|
|
|
# Bug #13975: "same string" + 0 has 2 different results
|
|
|
|
#
|
|
|
|
select conv("18383815659218730760",10,10) + 0;
|
|
|
|
select "18383815659218730760" + 0;
|
|
|
|
|
2006-09-07 20:06:37 +02:00
|
|
|
#
|
|
|
|
# Bug #21698: substitution of a string field for a constant under a function
|
|
|
|
#
|
|
|
|
|
|
|
|
CREATE TABLE t1 (code varchar(10));
|
|
|
|
INSERT INTO t1 VALUES ('a12'), ('A12'), ('a13');
|
|
|
|
|
|
|
|
SELECT ASCII(code), code FROM t1 WHERE code='A12';
|
|
|
|
SELECT ASCII(code), code FROM t1 WHERE code='A12' AND ASCII(code)=65;
|
|
|
|
|
|
|
|
INSERT INTO t1 VALUES ('a12 '), ('A12 ');
|
|
|
|
|
|
|
|
SELECT LENGTH(code), code FROM t1 WHERE code='A12';
|
|
|
|
SELECT LENGTH(code), code FROM t1 WHERE code='A12' AND LENGTH(code)=5;
|
|
|
|
|
|
|
|
ALTER TABLE t1 ADD INDEX (code);
|
|
|
|
CREATE TABLE t2 (id varchar(10) PRIMARY KEY);
|
|
|
|
INSERT INTO t2 VALUES ('a11'), ('a12'), ('a13'), ('a14');
|
|
|
|
|
|
|
|
SELECT * FROM t1 INNER JOIN t2 ON t1.code=t2.id
|
2006-09-09 18:43:09 +02:00
|
|
|
WHERE t2.id='a12' AND (LENGTH(code)=5 OR code < 'a00');
|
2006-09-07 20:06:37 +02:00
|
|
|
EXPLAIN EXTENDED
|
|
|
|
SELECT * FROM t1 INNER JOIN t2 ON code=id
|
2006-09-09 18:43:09 +02:00
|
|
|
WHERE id='a12' AND (LENGTH(code)=5 OR code < 'a00');
|
2006-09-07 20:06:37 +02:00
|
|
|
|
|
|
|
DROP TABLE t1,t2;
|
|
|
|
|
Bug#22684 (BENCHMARK, ENCODE, DECODE and FORMAT are not real functions)
Before this change, the functions BENCHMARK, ENCODE, DECODE and FORMAT could
only accept a constant for some parameters.
After this change, this restriction has been removed. An implication is that
these functions can also be used in prepared statements.
The change consist of changing the following classes:
- Item_func_benchmark
- Item_func_encode
- Item_func_decode
- Item_func_format
to:
- only accept Item* in the constructor,
- and evaluate arguments during calls to val_xxx()
which fits the general design of all the other functions.
The 'TODO' items identified in item_create.cc during the work done for
Bug 21114 are addressed by this fix, as a natural consequence of aligning
the design.
In the 'func_str' test, a single very long test line involving an explain
extended select with many functions has been rewritten into multiple
separate tests, to improve maintainability.
The result of explain extended select decode(encode(...)) has changed,
since the encode and decode functions now print all their parameters.
mysql-test/r/func_str.result:
Bug#22684 (BENCHMARK, ENCODE, DECODE and FORMAT are not real functions)
mysql-test/r/parser.result:
Bug#22684 (BENCHMARK, ENCODE, DECODE and FORMAT are not real functions)
mysql-test/r/ps.result:
Bug#22684 (BENCHMARK, ENCODE, DECODE and FORMAT are not real functions)
mysql-test/t/func_str.test:
Bug#22684 (BENCHMARK, ENCODE, DECODE and FORMAT are not real functions)
mysql-test/t/parser.test:
Bug#22684 (BENCHMARK, ENCODE, DECODE and FORMAT are not real functions)
mysql-test/t/ps.test:
Bug#22684 (BENCHMARK, ENCODE, DECODE and FORMAT are not real functions)
sql/item_create.cc:
Bug#22684 (BENCHMARK, ENCODE, DECODE and FORMAT are not real functions)
sql/item_func.cc:
Bug#22684 (BENCHMARK, ENCODE, DECODE and FORMAT are not real functions)
sql/item_func.h:
Bug#22684 (BENCHMARK, ENCODE, DECODE and FORMAT are not real functions)
sql/item_strfunc.cc:
Bug#22684 (BENCHMARK, ENCODE, DECODE and FORMAT are not real functions)
sql/item_strfunc.h:
Bug#22684 (BENCHMARK, ENCODE, DECODE and FORMAT are not real functions)
2006-11-16 17:03:47 +01:00
|
|
|
#
|
|
|
|
# Bug#22684: The Functions ENCODE, DECODE and FORMAT are not real functions
|
|
|
|
#
|
|
|
|
|
|
|
|
select encode(NULL, NULL);
|
|
|
|
select encode("data", NULL);
|
|
|
|
select encode(NULL, "password");
|
|
|
|
|
|
|
|
select decode(NULL, NULL);
|
|
|
|
select decode("data", NULL);
|
|
|
|
select decode(NULL, "password");
|
|
|
|
|
|
|
|
select format(NULL, NULL);
|
|
|
|
select format(pi(), NULL);
|
|
|
|
select format(NULL, 2);
|
|
|
|
|
|
|
|
select benchmark(NULL, NULL);
|
|
|
|
select benchmark(0, NULL);
|
|
|
|
select benchmark(100, NULL);
|
|
|
|
select benchmark(NULL, 1+1);
|
|
|
|
|
2008-02-24 01:31:54 +01:00
|
|
|
#
|
|
|
|
# Bug #20752: BENCHMARK with many iterations returns too quickly
|
|
|
|
#
|
|
|
|
|
|
|
|
# not a string, but belongs with the above Bug#22684
|
|
|
|
select benchmark(-1, 1);
|
|
|
|
|
Bug#22684 (BENCHMARK, ENCODE, DECODE and FORMAT are not real functions)
Before this change, the functions BENCHMARK, ENCODE, DECODE and FORMAT could
only accept a constant for some parameters.
After this change, this restriction has been removed. An implication is that
these functions can also be used in prepared statements.
The change consist of changing the following classes:
- Item_func_benchmark
- Item_func_encode
- Item_func_decode
- Item_func_format
to:
- only accept Item* in the constructor,
- and evaluate arguments during calls to val_xxx()
which fits the general design of all the other functions.
The 'TODO' items identified in item_create.cc during the work done for
Bug 21114 are addressed by this fix, as a natural consequence of aligning
the design.
In the 'func_str' test, a single very long test line involving an explain
extended select with many functions has been rewritten into multiple
separate tests, to improve maintainability.
The result of explain extended select decode(encode(...)) has changed,
since the encode and decode functions now print all their parameters.
mysql-test/r/func_str.result:
Bug#22684 (BENCHMARK, ENCODE, DECODE and FORMAT are not real functions)
mysql-test/r/parser.result:
Bug#22684 (BENCHMARK, ENCODE, DECODE and FORMAT are not real functions)
mysql-test/r/ps.result:
Bug#22684 (BENCHMARK, ENCODE, DECODE and FORMAT are not real functions)
mysql-test/t/func_str.test:
Bug#22684 (BENCHMARK, ENCODE, DECODE and FORMAT are not real functions)
mysql-test/t/parser.test:
Bug#22684 (BENCHMARK, ENCODE, DECODE and FORMAT are not real functions)
mysql-test/t/ps.test:
Bug#22684 (BENCHMARK, ENCODE, DECODE and FORMAT are not real functions)
sql/item_create.cc:
Bug#22684 (BENCHMARK, ENCODE, DECODE and FORMAT are not real functions)
sql/item_func.cc:
Bug#22684 (BENCHMARK, ENCODE, DECODE and FORMAT are not real functions)
sql/item_func.h:
Bug#22684 (BENCHMARK, ENCODE, DECODE and FORMAT are not real functions)
sql/item_strfunc.cc:
Bug#22684 (BENCHMARK, ENCODE, DECODE and FORMAT are not real functions)
sql/item_strfunc.h:
Bug#22684 (BENCHMARK, ENCODE, DECODE and FORMAT are not real functions)
2006-11-16 17:03:47 +01:00
|
|
|
#
|
|
|
|
# Please note:
|
|
|
|
# 1) The collation of the password is irrelevant, the encryption uses
|
|
|
|
# the binary representation of the string without charset/collation.
|
|
|
|
# 2) These tests can not print the encoded text directly, because it's binary,
|
|
|
|
# and doing this would cause problems with source control.
|
|
|
|
# Instead, an md5() checksum is used, to verify the result indirectly.
|
|
|
|
# 3) Each md5() result must be identical.
|
|
|
|
# 4) The md5() result must never change, and must be stable across releases.
|
|
|
|
#
|
|
|
|
set @password="password";
|
|
|
|
set @my_data="clear text to encode";
|
|
|
|
select md5(encode(@my_data, "password"));
|
|
|
|
select md5(encode(@my_data, _utf8 "password"));
|
|
|
|
select md5(encode(@my_data, binary "password"));
|
|
|
|
select md5(encode(@my_data, _latin1 "password"));
|
|
|
|
select md5(encode(@my_data, _koi8r "password"));
|
|
|
|
select md5(encode(@my_data, (select "password" from dual)));
|
|
|
|
select md5(encode(@my_data, concat("pass", "word")));
|
|
|
|
select md5(encode(@my_data, @password));
|
|
|
|
|
|
|
|
set @my_data="binary encoded data";
|
|
|
|
select md5(decode(@my_data, "password"));
|
|
|
|
select md5(decode(@my_data, _utf8 "password"));
|
|
|
|
select md5(decode(@my_data, binary "password"));
|
|
|
|
select md5(decode(@my_data, _latin1 "password"));
|
|
|
|
select md5(decode(@my_data, _koi8r "password"));
|
|
|
|
select md5(decode(@my_data, (select "password" from dual)));
|
|
|
|
select md5(decode(@my_data, concat("pass", "word")));
|
|
|
|
select md5(decode(@my_data, @password));
|
|
|
|
|
|
|
|
set @dec=5;
|
|
|
|
select format(pi(), (1+1));
|
|
|
|
select format(pi(), (select 3 from dual));
|
|
|
|
select format(pi(), @dec);
|
|
|
|
|
|
|
|
set @bench_count=10;
|
|
|
|
select benchmark(10, pi());
|
|
|
|
select benchmark(5+5, pi());
|
|
|
|
select benchmark((select 10 from dual), pi());
|
|
|
|
select benchmark(@bench_count, pi());
|
|
|
|
|
2006-11-16 12:06:51 +01:00
|
|
|
|
2006-11-08 16:11:02 +01:00
|
|
|
#
|
|
|
|
# Bug #10963
|
|
|
|
# 4294967296 18446744073709551616
|
|
|
|
|
|
|
|
select locate('he','hello',-2);
|
|
|
|
select locate('lo','hello',-4294967295);
|
|
|
|
select locate('lo','hello',4294967295);
|
|
|
|
select locate('lo','hello',-4294967296);
|
|
|
|
select locate('lo','hello',4294967296);
|
|
|
|
select locate('lo','hello',-4294967297);
|
|
|
|
select locate('lo','hello',4294967297);
|
|
|
|
select locate('lo','hello',-18446744073709551615);
|
|
|
|
select locate('lo','hello',18446744073709551615);
|
|
|
|
select locate('lo','hello',-18446744073709551616);
|
|
|
|
select locate('lo','hello',18446744073709551616);
|
|
|
|
select locate('lo','hello',-18446744073709551617);
|
|
|
|
select locate('lo','hello',18446744073709551617);
|
|
|
|
|
|
|
|
select left('hello', 10);
|
|
|
|
select left('hello', 0);
|
|
|
|
select left('hello', -1);
|
|
|
|
select left('hello', -4294967295);
|
|
|
|
select left('hello', 4294967295);
|
|
|
|
select left('hello', -4294967296);
|
|
|
|
select left('hello', 4294967296);
|
|
|
|
select left('hello', -4294967297);
|
|
|
|
select left('hello', 4294967297);
|
|
|
|
select left('hello', -18446744073709551615);
|
|
|
|
select left('hello', 18446744073709551615);
|
|
|
|
select left('hello', -18446744073709551616);
|
|
|
|
select left('hello', 18446744073709551616);
|
|
|
|
select left('hello', -18446744073709551617);
|
|
|
|
select left('hello', 18446744073709551617);
|
|
|
|
|
|
|
|
select right('hello', 10);
|
|
|
|
select right('hello', 0);
|
|
|
|
select right('hello', -1);
|
|
|
|
select right('hello', -4294967295);
|
|
|
|
select right('hello', 4294967295);
|
|
|
|
select right('hello', -4294967296);
|
|
|
|
select right('hello', 4294967296);
|
|
|
|
select right('hello', -4294967297);
|
|
|
|
select right('hello', 4294967297);
|
|
|
|
select right('hello', -18446744073709551615);
|
|
|
|
select right('hello', 18446744073709551615);
|
|
|
|
select right('hello', -18446744073709551616);
|
|
|
|
select right('hello', 18446744073709551616);
|
|
|
|
select right('hello', -18446744073709551617);
|
|
|
|
select right('hello', 18446744073709551617);
|
|
|
|
|
|
|
|
select substring('hello', 2, -1);
|
|
|
|
|
|
|
|
select substring('hello', -1, 1);
|
|
|
|
select substring('hello', -2, 1);
|
|
|
|
select substring('hello', -4294967295, 1);
|
|
|
|
select substring('hello', 4294967295, 1);
|
|
|
|
select substring('hello', -4294967296, 1);
|
|
|
|
select substring('hello', 4294967296, 1);
|
|
|
|
select substring('hello', -4294967297, 1);
|
|
|
|
select substring('hello', 4294967297, 1);
|
|
|
|
select substring('hello', -18446744073709551615, 1);
|
|
|
|
select substring('hello', 18446744073709551615, 1);
|
|
|
|
select substring('hello', -18446744073709551616, 1);
|
|
|
|
select substring('hello', 18446744073709551616, 1);
|
|
|
|
select substring('hello', -18446744073709551617, 1);
|
|
|
|
select substring('hello', 18446744073709551617, 1);
|
|
|
|
select substring('hello', 1, -1);
|
|
|
|
select substring('hello', 1, -4294967295);
|
|
|
|
select substring('hello', 1, 4294967295);
|
|
|
|
select substring('hello', 1, -4294967296);
|
|
|
|
select substring('hello', 1, 4294967296);
|
|
|
|
select substring('hello', 1, -4294967297);
|
|
|
|
select substring('hello', 1, 4294967297);
|
|
|
|
select substring('hello', 1, -18446744073709551615);
|
|
|
|
select substring('hello', 1, 18446744073709551615);
|
|
|
|
select substring('hello', 1, -18446744073709551616);
|
|
|
|
select substring('hello', 1, 18446744073709551616);
|
|
|
|
select substring('hello', 1, -18446744073709551617);
|
|
|
|
select substring('hello', 1, 18446744073709551617);
|
|
|
|
select substring('hello', -1, -1);
|
|
|
|
select substring('hello', -4294967295, -4294967295);
|
|
|
|
select substring('hello', 4294967295, 4294967295);
|
|
|
|
select substring('hello', -4294967296, -4294967296);
|
|
|
|
select substring('hello', 4294967296, 4294967296);
|
|
|
|
select substring('hello', -4294967297, -4294967297);
|
|
|
|
select substring('hello', 4294967297, 4294967297);
|
|
|
|
select substring('hello', -18446744073709551615, -18446744073709551615);
|
|
|
|
select substring('hello', 18446744073709551615, 18446744073709551615);
|
|
|
|
select substring('hello', -18446744073709551616, -18446744073709551616);
|
|
|
|
select substring('hello', 18446744073709551616, 18446744073709551616);
|
|
|
|
select substring('hello', -18446744073709551617, -18446744073709551617);
|
|
|
|
select substring('hello', 18446744073709551617, 18446744073709551617);
|
|
|
|
|
|
|
|
select insert('hello', -1, 1, 'hi');
|
|
|
|
select insert('hello', -4294967295, 1, 'hi');
|
|
|
|
select insert('hello', 4294967295, 1, 'hi');
|
|
|
|
select insert('hello', -4294967296, 1, 'hi');
|
|
|
|
select insert('hello', 4294967296, 1, 'hi');
|
|
|
|
select insert('hello', -4294967297, 1, 'hi');
|
|
|
|
select insert('hello', 4294967297, 1, 'hi');
|
|
|
|
select insert('hello', -18446744073709551615, 1, 'hi');
|
|
|
|
select insert('hello', 18446744073709551615, 1, 'hi');
|
|
|
|
select insert('hello', -18446744073709551616, 1, 'hi');
|
|
|
|
select insert('hello', 18446744073709551616, 1, 'hi');
|
|
|
|
select insert('hello', -18446744073709551617, 1, 'hi');
|
|
|
|
select insert('hello', 18446744073709551617, 1, 'hi');
|
|
|
|
select insert('hello', 1, -1, 'hi');
|
|
|
|
select insert('hello', 1, -4294967295, 'hi');
|
|
|
|
select insert('hello', 1, 4294967295, 'hi');
|
|
|
|
select insert('hello', 1, -4294967296, 'hi');
|
|
|
|
select insert('hello', 1, 4294967296, 'hi');
|
|
|
|
select insert('hello', 1, -4294967297, 'hi');
|
|
|
|
select insert('hello', 1, 4294967297, 'hi');
|
|
|
|
select insert('hello', 1, -18446744073709551615, 'hi');
|
|
|
|
select insert('hello', 1, 18446744073709551615, 'hi');
|
|
|
|
select insert('hello', 1, -18446744073709551616, 'hi');
|
|
|
|
select insert('hello', 1, 18446744073709551616, 'hi');
|
|
|
|
select insert('hello', 1, -18446744073709551617, 'hi');
|
|
|
|
select insert('hello', 1, 18446744073709551617, 'hi');
|
|
|
|
select insert('hello', -1, -1, 'hi');
|
|
|
|
select insert('hello', -4294967295, -4294967295, 'hi');
|
|
|
|
select insert('hello', 4294967295, 4294967295, 'hi');
|
|
|
|
select insert('hello', -4294967296, -4294967296, 'hi');
|
|
|
|
select insert('hello', 4294967296, 4294967296, 'hi');
|
|
|
|
select insert('hello', -4294967297, -4294967297, 'hi');
|
|
|
|
select insert('hello', 4294967297, 4294967297, 'hi');
|
|
|
|
select insert('hello', -18446744073709551615, -18446744073709551615, 'hi');
|
|
|
|
select insert('hello', 18446744073709551615, 18446744073709551615, 'hi');
|
|
|
|
select insert('hello', -18446744073709551616, -18446744073709551616, 'hi');
|
|
|
|
select insert('hello', 18446744073709551616, 18446744073709551616, 'hi');
|
|
|
|
select insert('hello', -18446744073709551617, -18446744073709551617, 'hi');
|
|
|
|
select insert('hello', 18446744073709551617, 18446744073709551617, 'hi');
|
|
|
|
|
|
|
|
select repeat('hello', -1);
|
|
|
|
select repeat('hello', -4294967295);
|
|
|
|
select repeat('hello', 4294967295);
|
|
|
|
select repeat('hello', -4294967296);
|
|
|
|
select repeat('hello', 4294967296);
|
|
|
|
select repeat('hello', -4294967297);
|
|
|
|
select repeat('hello', 4294967297);
|
|
|
|
select repeat('hello', -18446744073709551615);
|
|
|
|
select repeat('hello', 18446744073709551615);
|
|
|
|
select repeat('hello', -18446744073709551616);
|
|
|
|
select repeat('hello', 18446744073709551616);
|
|
|
|
select repeat('hello', -18446744073709551617);
|
|
|
|
select repeat('hello', 18446744073709551617);
|
|
|
|
|
|
|
|
select space(-1);
|
|
|
|
select space(-4294967295);
|
|
|
|
select space(4294967295);
|
|
|
|
select space(-4294967296);
|
|
|
|
select space(4294967296);
|
|
|
|
select space(-4294967297);
|
|
|
|
select space(4294967297);
|
|
|
|
select space(-18446744073709551615);
|
|
|
|
select space(18446744073709551615);
|
|
|
|
select space(-18446744073709551616);
|
|
|
|
select space(18446744073709551616);
|
|
|
|
select space(-18446744073709551617);
|
|
|
|
select space(18446744073709551617);
|
|
|
|
|
|
|
|
select rpad('hello', -1, '1');
|
|
|
|
select rpad('hello', -4294967295, '1');
|
|
|
|
select rpad('hello', 4294967295, '1');
|
|
|
|
select rpad('hello', -4294967296, '1');
|
|
|
|
select rpad('hello', 4294967296, '1');
|
|
|
|
select rpad('hello', -4294967297, '1');
|
|
|
|
select rpad('hello', 4294967297, '1');
|
|
|
|
select rpad('hello', -18446744073709551615, '1');
|
|
|
|
select rpad('hello', 18446744073709551615, '1');
|
|
|
|
select rpad('hello', -18446744073709551616, '1');
|
|
|
|
select rpad('hello', 18446744073709551616, '1');
|
|
|
|
select rpad('hello', -18446744073709551617, '1');
|
|
|
|
select rpad('hello', 18446744073709551617, '1');
|
|
|
|
|
|
|
|
select lpad('hello', -1, '1');
|
|
|
|
select lpad('hello', -4294967295, '1');
|
|
|
|
select lpad('hello', 4294967295, '1');
|
|
|
|
select lpad('hello', -4294967296, '1');
|
|
|
|
select lpad('hello', 4294967296, '1');
|
|
|
|
select lpad('hello', -4294967297, '1');
|
|
|
|
select lpad('hello', 4294967297, '1');
|
|
|
|
select lpad('hello', -18446744073709551615, '1');
|
|
|
|
select lpad('hello', 18446744073709551615, '1');
|
|
|
|
select lpad('hello', -18446744073709551616, '1');
|
|
|
|
select lpad('hello', 18446744073709551616, '1');
|
|
|
|
select lpad('hello', -18446744073709551617, '1');
|
|
|
|
select lpad('hello', 18446744073709551617, '1');
|
|
|
|
|
2006-11-16 12:19:37 +01:00
|
|
|
|
2006-11-16 12:06:51 +01:00
|
|
|
#
|
|
|
|
# BUG#17047: CHAR() and IN() can return NULL without signaling NULL
|
|
|
|
# result
|
|
|
|
#
|
|
|
|
SET @orig_sql_mode = @@SQL_MODE;
|
|
|
|
SET SQL_MODE=traditional;
|
|
|
|
|
|
|
|
SELECT CHAR(0xff,0x8f USING utf8);
|
|
|
|
SELECT CHAR(0xff,0x8f USING utf8) IS NULL;
|
|
|
|
|
|
|
|
SET SQL_MODE=@orig_sql_mode;
|
|
|
|
|
2006-12-19 23:54:12 +01:00
|
|
|
#
|
|
|
|
# Bug #24947: problem with some string function with unsigned int parameters
|
|
|
|
#
|
|
|
|
|
|
|
|
select substring('abc', cast(2 as unsigned int));
|
|
|
|
select repeat('a', cast(2 as unsigned int));
|
|
|
|
select rpad('abc', cast(5 as unsigned integer), 'x');
|
|
|
|
select lpad('abc', cast(5 as unsigned integer), 'x');
|
2006-11-16 12:06:51 +01:00
|
|
|
|
2007-03-10 17:55:34 +01:00
|
|
|
#
|
|
|
|
# Bug#15757: Wrong SUBSTRING() result when a tmp table was employed.
|
|
|
|
#
|
|
|
|
create table t1(f1 longtext);
|
|
|
|
insert into t1 values ("123"),("456");
|
|
|
|
select substring(f1,1,1) from t1 group by 1;
|
|
|
|
create table t2(f1 varchar(3));
|
|
|
|
insert into t1 values ("123"),("456");
|
|
|
|
select substring(f1,4,1), substring(f1,-4,1) from t2;
|
|
|
|
drop table t1,t2;
|
|
|
|
|
2007-02-23 10:28:50 +01:00
|
|
|
#
|
|
|
|
# Bug #25197 :repeat function returns null when using table field directly as count
|
|
|
|
#
|
|
|
|
|
|
|
|
--disable_warnings
|
|
|
|
DROP TABLE IF EXISTS t1;
|
|
|
|
--enable_warnings
|
|
|
|
|
|
|
|
CREATE TABLE `t1` (
|
|
|
|
`id` varchar(20) NOT NULL,
|
|
|
|
`tire` tinyint(3) unsigned NOT NULL,
|
|
|
|
PRIMARY KEY (`id`)
|
|
|
|
);
|
|
|
|
|
|
|
|
INSERT INTO `t1` (`id`, `tire`) VALUES ('A', 0), ('B', 1),('C', 2);
|
|
|
|
|
|
|
|
SELECT REPEAT( '#', tire ) AS A,
|
|
|
|
REPEAT( '#', tire % 999 ) AS B, tire FROM `t1`;
|
|
|
|
|
2007-03-28 09:32:49 +02:00
|
|
|
SELECT REPEAT('0', CAST(0 AS UNSIGNED));
|
|
|
|
SELECT REPEAT('0', -2);
|
|
|
|
SELECT REPEAT('0', 2);
|
|
|
|
|
2007-02-23 10:28:50 +01:00
|
|
|
DROP TABLE t1;
|
|
|
|
|
2007-03-02 11:14:50 +01:00
|
|
|
#
|
|
|
|
# Bug #26537: UNHEX() IS NULL comparison fails
|
|
|
|
#
|
|
|
|
SELECT UNHEX('G');
|
|
|
|
SELECT UNHEX('G') IS NULL;
|
|
|
|
|
2007-03-09 11:47:12 +01:00
|
|
|
#
|
|
|
|
# Bug #26281: INSERT() function mishandles NUL on boundary condition
|
|
|
|
#
|
|
|
|
SELECT INSERT('abc', 3, 3, '1234');
|
|
|
|
SELECT INSERT('abc', 4, 3, '1234');
|
|
|
|
SELECT INSERT('abc', 5, 3, '1234');
|
|
|
|
SELECT INSERT('abc', 6, 3, '1234');
|
|
|
|
|
2007-04-11 12:58:16 +02:00
|
|
|
#
|
|
|
|
# Bug #27530: Grouping on crc32, or create table select crc32
|
|
|
|
#
|
|
|
|
CREATE TABLE t1 (a INT);
|
|
|
|
CREATE VIEW v1 AS SELECT CRC32(a) AS C FROM t1;
|
|
|
|
|
|
|
|
INSERT INTO t1 VALUES (1),(2),(3),(4),(5),(6),(7),(8),(9),(10);
|
|
|
|
SELECT CRC32(a), COUNT(*) FROM t1 GROUP BY 1;
|
|
|
|
SELECT CRC32(a), COUNT(*) FROM t1 GROUP BY 1 ORDER BY 1;
|
|
|
|
SELECT * FROM (SELECT CRC32(a) FROM t1) t2;
|
|
|
|
CREATE TABLE t2 SELECT CRC32(a) FROM t1;
|
|
|
|
desc t2;
|
|
|
|
SELECT * FROM v1;
|
|
|
|
SELECT * FROM (SELECT * FROM v1) x;
|
|
|
|
|
|
|
|
DROP TABLE t1, t2;
|
|
|
|
DROP VIEW v1;
|
|
|
|
|
2007-06-15 03:55:07 +02:00
|
|
|
#
|
|
|
|
# Bug #27932: LOCATE with argument evaluated to NULL
|
|
|
|
#
|
|
|
|
|
|
|
|
SELECT LOCATE('foo', NULL) FROM DUAL;
|
|
|
|
SELECT LOCATE(NULL, 'o') FROM DUAL;
|
|
|
|
SELECT LOCATE(NULL, NULL) FROM DUAL;
|
|
|
|
SELECT LOCATE('foo', NULL) IS NULL FROM DUAL;
|
|
|
|
SELECT LOCATE(NULL, 'o') IS NULL FROM DUAL;
|
|
|
|
SELECT LOCATE(NULL, NULL) IS NULL FROM DUAL;
|
|
|
|
SELECT ISNULL(LOCATE('foo', NULL)) FROM DUAL;
|
|
|
|
SELECT ISNULL(LOCATE(NULL, 'o')) FROM DUAL;
|
|
|
|
SELECT ISNULL(LOCATE(NULL, NULL)) FROM DUAL;
|
|
|
|
SELECT LOCATE('foo', NULL) <=> NULL FROM DUAL;
|
|
|
|
SELECT LOCATE(NULL, 'o') <=> NULL FROM DUAL;
|
|
|
|
SELECT LOCATE(NULL, NULL) <=> NULL FROM DUAL;
|
|
|
|
|
|
|
|
CREATE TABLE t1 (id int NOT NULL PRIMARY KEY, a varchar(10), p varchar(10));
|
|
|
|
|
|
|
|
INSERT INTO t1 VALUES (1, 'foo', 'o');
|
|
|
|
INSERT INTO t1 VALUES (2, 'foo', NULL);
|
|
|
|
INSERT INTO t1 VALUES (3, NULL, 'o');
|
|
|
|
INSERT INTO t1 VALUES (4, NULL, NULL);
|
|
|
|
|
|
|
|
SELECT id, LOCATE(a,p) FROM t1;
|
|
|
|
SELECT id, LOCATE(a,p) IS NULL FROM t1;
|
|
|
|
SELECT id, ISNULL(LOCATE(a,p)) FROM t1;
|
|
|
|
SELECT id, LOCATE(a,p) <=> NULL FROM t1;
|
|
|
|
SELECT id FROM t1 WHERE LOCATE(a,p) IS NULL;
|
|
|
|
SELECT id FROM t1 WHERE LOCATE(a,p) <=> NULL;
|
|
|
|
|
|
|
|
DROP TABLE t1;
|
|
|
|
|
2007-06-17 20:23:19 +02:00
|
|
|
#
|
|
|
|
# Bug #27130: SUBSTR with UNSIGNED 0 as the last argument
|
|
|
|
#
|
|
|
|
|
|
|
|
SELECT SUBSTR('foo',1,0) FROM DUAL;
|
|
|
|
SELECT SUBSTR('foo',1,CAST(0 AS SIGNED)) FROM DUAL;
|
|
|
|
SELECT SUBSTR('foo',1,CAST(0 AS UNSIGNED)) FROM DUAL;
|
|
|
|
|
|
|
|
CREATE TABLE t1 (a varchar(10), len int unsigned);
|
|
|
|
INSERT INTO t1 VALUES ('bar', 2), ('foo', 0);
|
|
|
|
|
|
|
|
SELECT SUBSTR(a,1,len) FROM t1;
|
|
|
|
|
|
|
|
DROP TABLE t1;
|
|
|
|
|
2007-10-21 19:45:31 +02:00
|
|
|
#
|
|
|
|
# Bug #28850: Potential bugs related to the return type of the CHAR function
|
|
|
|
#
|
|
|
|
|
|
|
|
CREATE TABLE t1 AS SELECT CHAR(0x414243) as c1;
|
|
|
|
SELECT HEX(c1) from t1;
|
|
|
|
DROP TABLE t1;
|
|
|
|
|
|
|
|
CREATE VIEW v1 AS SELECT CHAR(0x414243) as c1;
|
|
|
|
SELECT HEX(c1) from v1;
|
|
|
|
DROP VIEW v1;
|
|
|
|
|
2008-12-09 11:00:43 +01:00
|
|
|
#
|
|
|
|
# Bug #35558 Wrong server metadata blows up the client
|
|
|
|
#
|
|
|
|
create table t1(a float);
|
|
|
|
insert into t1 values (1.33);
|
|
|
|
--enable_metadata
|
|
|
|
select format(a, 2) from t1;
|
|
|
|
--disable_metadata
|
|
|
|
drop table t1;
|
|
|
|
|
2009-02-10 13:38:56 +01:00
|
|
|
#
|
|
|
|
# Bug #41868: crash or memory overrun with concat + upper, date_format functions
|
|
|
|
#
|
|
|
|
|
|
|
|
CREATE TABLE t1 (c DATE, aa VARCHAR(30));
|
|
|
|
INSERT INTO t1 VALUES ('2008-12-31','aaaaaa');
|
|
|
|
SELECT DATE_FORMAT(c, GET_FORMAT(DATE, 'eur')) h, CONCAT(UPPER(aa),', ', aa) i FROM t1;
|
|
|
|
DROP TABLE t1;
|
|
|
|
|
2009-05-12 10:18:27 +02:00
|
|
|
|
|
|
|
--echo #
|
|
|
|
--echo # BUG#44774: load_file function produces valgrind warnings
|
|
|
|
--echo #
|
|
|
|
CREATE TABLE t1 (a TINYBLOB);
|
|
|
|
INSERT INTO t1 VALUES ('aaaaaaaa');
|
|
|
|
SELECT LOAD_FILE(a) FROM t1;
|
|
|
|
DROP TABLE t1;
|
|
|
|
|
2009-09-10 12:24:07 +02:00
|
|
|
#
|
|
|
|
# Bug#46815 CONCAT_WS returning wrong data
|
|
|
|
#
|
|
|
|
CREATE TABLE t1 (f2 VARCHAR(20));
|
|
|
|
CREATE TABLE t2 (f2 VARCHAR(20));
|
|
|
|
|
|
|
|
INSERT INTO t1 VALUES ('MIN'),('MAX');
|
|
|
|
INSERT INTO t2 VALUES ('LOAD');
|
|
|
|
|
|
|
|
SELECT CONCAT_WS('_', (SELECT t2.f2 FROM t2), t1.f2) AS concat_name FROM t1;
|
|
|
|
|
|
|
|
DROP TABLE t1, t2;
|
|
|
|
|
2009-05-12 10:18:27 +02:00
|
|
|
|
2006-03-14 11:04:43 +01:00
|
|
|
--echo End of 5.0 tests
|
2009-04-23 09:43:42 +02:00
|
|
|
|
|
|
|
#
|
|
|
|
# Bug#44358 valgrind errors with decode() function
|
|
|
|
#
|
|
|
|
--disable_warnings
|
|
|
|
drop table if exists t1;
|
|
|
|
--enable_warnings
|
|
|
|
create table t1(f1 tinyint default null)engine=myisam;
|
|
|
|
insert into t1 values (-1),(null);
|
|
|
|
explain select 1 as a from t1,(select decode(f1,f1) as b from t1) a;
|
|
|
|
explain select 1 as a from t1,(select encode(f1,f1) as b from t1) a;
|
|
|
|
drop table t1;
|
2009-10-05 17:06:04 +02:00
|
|
|
|
|
|
|
|
2009-12-04 16:36:58 +01:00
|
|
|
--echo #
|
|
|
|
--echo # Bug#49141: Encode function is significantly slower in 5.1 compared to 5.0
|
|
|
|
--echo #
|
|
|
|
|
|
|
|
--disable_warnings
|
|
|
|
DROP TABLE IF EXISTS t1, t2;
|
|
|
|
--enable_warnings
|
|
|
|
|
|
|
|
CREATE TABLE t1 (a VARCHAR(20), b INT);
|
|
|
|
CREATE TABLE t2 (a VARCHAR(20), b INT);
|
|
|
|
|
|
|
|
INSERT INTO t1 VALUES ('ABC', 1);
|
|
|
|
INSERT INTO t2 VALUES ('ABC', 1);
|
|
|
|
|
|
|
|
SELECT DECODE((SELECT ENCODE('secret', t1.a) FROM t1,t2 WHERE t1.a = t2.a GROUP BY t1.b), t2.a)
|
|
|
|
FROM t1,t2 WHERE t1.b = t1.b > 0 GROUP BY t2.b;
|
|
|
|
|
|
|
|
SELECT DECODE((SELECT ENCODE('secret', 'ABC') FROM t1,t2 WHERE t1.a = t2.a GROUP BY t1.b), t2.a)
|
|
|
|
FROM t1,t2 WHERE t1.b = t1.b > 0 GROUP BY t2.b;
|
|
|
|
|
|
|
|
SELECT DECODE((SELECT ENCODE('secret', t1.a) FROM t1,t2 WHERE t1.a = t2.a GROUP BY t1.b), 'ABC')
|
|
|
|
FROM t1,t2 WHERE t1.b = t1.b > 0 GROUP BY t2.b;
|
|
|
|
|
|
|
|
TRUNCATE TABLE t1;
|
|
|
|
TRUNCATE TABLE t2;
|
|
|
|
|
|
|
|
INSERT INTO t1 VALUES ('EDF', 3), ('BCD', 2), ('ABC', 1);
|
|
|
|
INSERT INTO t2 VALUES ('EDF', 3), ('BCD', 2), ('ABC', 1);
|
|
|
|
|
|
|
|
SELECT DECODE((SELECT ENCODE('secret', t1.a) FROM t1,t2 WHERE t1.a = t2.a GROUP BY t1.b LIMIT 1), t2.a)
|
|
|
|
FROM t2 WHERE t2.b = 1 GROUP BY t2.b;
|
|
|
|
|
|
|
|
DROP TABLE t1, t2;
|
2009-10-05 17:06:04 +02:00
|
|
|
|
2010-03-26 06:49:35 +01:00
|
|
|
--echo #
|
|
|
|
--echo # Bug#52164 Assertion failed: param.sort_length, file .\filesort.cc, line 149
|
|
|
|
--echo #
|
|
|
|
CREATE TABLE t1 (a LONGBLOB NOT NULL);
|
|
|
|
INSERT INTO t1 VALUES (''),('');
|
|
|
|
SELECT 1 FROM t1, t1 t2
|
|
|
|
ORDER BY QUOTE(t1.a);
|
|
|
|
DROP TABLE t1;
|
|
|
|
|
2010-12-14 17:08:25 +01:00
|
|
|
--echo #
|
|
|
|
--echo # Bug#57913 large negative number to string conversion functions crash
|
|
|
|
--echo # Bug#57810 case/when/then : Assertion failed: length || !scale
|
|
|
|
--echo #
|
|
|
|
SELECT '1' IN ('1', SUBSTRING(-9223372036854775809, 1));
|
|
|
|
SELECT CONVERT(('' IN (REVERSE(CAST(('') AS DECIMAL)), '')), CHAR(3));
|
|
|
|
|
2011-01-13 08:57:15 +01:00
|
|
|
--echo #
|
|
|
|
--echo # Bug#58165: "my_empty_string" gets modified and causes LOAD DATA to fail
|
|
|
|
--echo # and other crashes
|
|
|
|
--echo #
|
|
|
|
CREATE TABLE t1 ( a TEXT );
|
|
|
|
SELECT 'aaaaaaaaaaaaaa' INTO OUTFILE 'bug58165.txt';
|
|
|
|
SELECT insert( substring_index( 'a', 'a', 'b' ), 1, 0, 'x' );
|
|
|
|
LOAD DATA INFILE 'bug58165.txt' INTO TABLE t1;
|
|
|
|
SELECT * FROM t1;
|
|
|
|
DROP TABLE t1;
|
|
|
|
|
2010-03-26 06:49:35 +01:00
|
|
|
--echo End of 5.1 tests
|
2010-04-02 17:17:43 +02:00
|
|
|
|
2009-10-05 17:06:04 +02:00
|
|
|
--echo Start of 5.4 tests
|
|
|
|
#
|
|
|
|
# WL#4584 Internationalized number format
|
|
|
|
#
|
|
|
|
SELECT format(12345678901234567890.123, 3);
|
|
|
|
SELECT format(12345678901234567890.123, 3, NULL);
|
|
|
|
SELECT format(12345678901234567890.123, 3, 'ar_AE');
|
|
|
|
SELECT format(12345678901234567890.123, 3, 'ar_SA');
|
|
|
|
SELECT format(12345678901234567890.123, 3, 'be_BY');
|
|
|
|
SELECT format(12345678901234567890.123, 3, 'de_DE');
|
|
|
|
SELECT format(12345678901234567890.123, 3, 'en_IN');
|
|
|
|
SELECT format(12345678901234567890.123, 3, 'en_US');
|
|
|
|
SELECT format(12345678901234567890.123, 3, 'it_CH');
|
|
|
|
SELECT format(12345678901234567890.123, 3, 'ru_RU');
|
|
|
|
SELECT format(12345678901234567890.123, 3, 'ta_IN');
|
|
|
|
|
|
|
|
CREATE TABLE t1 (fmt CHAR(5) NOT NULL);
|
|
|
|
INSERT INTO t1 VALUES ('ar_AE');
|
|
|
|
INSERT INTO t1 VALUES ('ar_SA');
|
|
|
|
INSERT INTO t1 VALUES ('be_BY');
|
|
|
|
INSERT INTO t1 VALUES ('de_DE');
|
|
|
|
INSERT INTO t1 VALUES ('en_IN');
|
|
|
|
INSERT INTO t1 VALUES ('en_US');
|
|
|
|
INSERT INTO t1 VALUES ('it_CH');
|
|
|
|
INSERT INTO t1 VALUES ('ru_RU');
|
|
|
|
INSERT INTO t1 VALUES ('ta_IN');
|
|
|
|
SELECT fmt, format(12345678901234567890.123, 3, fmt) FROM t1 ORDER BY fmt;
|
|
|
|
SELECT fmt, format(12345678901234567890.123, 0, fmt) FROM t1 ORDER BY fmt;
|
|
|
|
SELECT fmt, format(12345678901234567890, 3, fmt) FROM t1 ORDER BY fmt;
|
|
|
|
SELECT fmt, format(-12345678901234567890, 3, fmt) FROM t1 ORDER BY fmt;
|
|
|
|
SELECT fmt, format(-02345678901234567890, 3, fmt) FROM t1 ORDER BY fmt;
|
|
|
|
SELECT fmt, format(-00345678901234567890, 3, fmt) FROM t1 ORDER BY fmt;
|
|
|
|
SELECT fmt, format(-00045678901234567890, 3, fmt) FROM t1 ORDER BY fmt;
|
|
|
|
DROP TABLE t1;
|
|
|
|
|
|
|
|
SELECT format(123, 1, 'Non-existent-locale');
|
|
|
|
|
|
|
|
--echo End of 5.4 tests
|
|
|
|
|
2010-08-20 13:14:11 +02:00
|
|
|
--echo #
|
|
|
|
--echo # Start of 5.5 tests
|
|
|
|
--echo #
|
|
|
|
|
|
|
|
--echo #
|
|
|
|
--echo # Bug#55912 FORMAT with locale set fails for numbers < 1000
|
|
|
|
--echo #
|
|
|
|
SELECT FORMAT(123.33, 2, 'no_NO'), FORMAT(1123.33, 2, 'no_NO');
|
|
|
|
SELECT FORMAT(12333e-2, 2, 'no_NO'), FORMAT(112333e-2, 2, 'no_NO');
|
|
|
|
CREATE TABLE t1 AS SELECT format(123,2,'no_NO');
|
|
|
|
SHOW CREATE TABLE t1;
|
|
|
|
SELECT * FROM t1;
|
|
|
|
DROP TABLE t1;
|
|
|
|
|
|
|
|
--echo #
|
|
|
|
--echo # End of 5.5 tests
|
|
|
|
--echo #
|