mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
a07e48eca0
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
84 lines
3 KiB
Text
84 lines
3 KiB
Text
# Initialise
|
|
--disable_warnings
|
|
drop table if exists t1;
|
|
--enable_warnings
|
|
|
|
select (1,2,3) IN ((3,2,3), (1,2,3), (1,3,3));
|
|
select row(10,2,3) IN (row(3,2,3), row(1,2,3), row(1,3,3));
|
|
select row(1,2,3) IN (row(3,NULL,3), row(1,2,3), row(1,3,3));
|
|
select row(10,2,3) IN (row(3,NULL,3), row(1,2,3), row(1,3,3));
|
|
select row('a',1.5,3) IN (row(1,2,3), row('a',1.5,3), row('a','a','a'));
|
|
select row('a',0,3) IN (row(3,2,3), row('a','0','3'), row(1,3,3));
|
|
select row('a',0,3) IN (row(3,2,3), row('a','a','3'), row(1,3,3));
|
|
select row('a',1.5,3) IN (row(3,NULL,3), row('a',1.5,3), row(1,3,3));
|
|
select row('b',1.5,3) IN (row(3,NULL,3), row('a',1.5,3), row(1,3,3));
|
|
select row('b',1.5,3) IN (row('b',NULL,3), row('a',1.5,3), row(1,3,3));
|
|
select row('b',1.5,3) IN (row('b',NULL,4), row('a',1.5,3), row(1,3,3));
|
|
select (1,2,(3,4)) IN ((3,2,(3,4)), (1,2,(3,4)));
|
|
-- error 1241
|
|
select row(1,2,row(3,4)) IN (row(3,2,row(3,4)), row(1,2,4));
|
|
select row(1,2,row(3,4)) IN (row(3,2,row(3,4)), row(1,2,row(3,NULL)));
|
|
explain extended select row(1,2,row(3,4)) IN (row(3,2,row(3,4)), row(1,2,row(3,NULL)));
|
|
|
|
SELECT (1,2,3)=(0,NULL,3);
|
|
SELECT (1,2,3)=(1,NULL,3);
|
|
# here's something for Sanja to fix :)
|
|
SELECT (1,2,3)=(1,NULL,0);
|
|
|
|
SELECT ROW(1,2,3)=ROW(1,2,3);
|
|
SELECT ROW(2,2,3)=ROW(1+1,2,3);
|
|
SELECT ROW(1,2,3)=ROW(1+1,2,3);
|
|
SELECT ROW(1,2,3)<ROW(1+1,2,3);
|
|
SELECT ROW(1,2,3)>ROW(1+1,2,3);
|
|
SELECT ROW(1,2,3)<=ROW(1+1,2,3);
|
|
SELECT ROW(1,2,3)>=ROW(1+1,2,3);
|
|
SELECT ROW(1,2,3)<>ROW(1+1,2,3);
|
|
SELECT ROW(NULL,2,3)=ROW(NULL,2,3);
|
|
SELECT ROW(NULL,2,3)<=>ROW(NULL,2,3);
|
|
SELECT ROW(1,2,ROW(3,4,5))=ROW(1,2,ROW(3,4,5));
|
|
SELECT ROW('test',2,3.33)=ROW('test',2,3.33);
|
|
-- error 1241
|
|
SELECT ROW('test',2,3.33)=ROW('test',2,3.33,4);
|
|
SELECT ROW('test',2,ROW(3,33))=ROW('test',2,ROW(3,33));
|
|
SELECT ROW('test',2,ROW(3,33))=ROW('test',2,ROW(3,3));
|
|
SELECT ROW('test',2,ROW(3,33))=ROW('test',2,ROW(3,NULL));
|
|
-- error 1241
|
|
SELECT ROW('test',2,ROW(3,33))=ROW('test',2,4);
|
|
|
|
create table t1 ( a int, b int, c int);
|
|
insert into t1 values (1,2,3), (2,3,1), (3,2,1), (1,2,NULL);
|
|
select * from t1 where ROW(1,2,3)=ROW(a,b,c);
|
|
select * from t1 where ROW(0,2,3)=ROW(a,b,c);
|
|
select * from t1 where ROW(1,2,3)<ROW(a,b,c);
|
|
select ROW(a,2,3) IN(row(1,b,c), row(2,3,1)) from t1;
|
|
select ROW(c,2,3) IN(row(1,b,a), row(2,3,1)) from t1;
|
|
select ROW(a,b,c) IN(row(1,2,3), row(3,2,1)) from t1;
|
|
select ROW(1,2,3) IN(row(a,b,c), row(1,2,3)) from t1;
|
|
drop table t1;
|
|
|
|
-- error 1241
|
|
select ROW(1,1);
|
|
|
|
create table t1 (i int);
|
|
-- error 1241
|
|
select 1 from t1 where ROW(1,1);
|
|
-- error 1241
|
|
select count(*) from t1 order by ROW(1,1);
|
|
-- error 1241
|
|
select count(*) from t1 having (1,1) order by i;
|
|
drop table t1;
|
|
|
|
create table t1 (a int, b int);
|
|
insert into t1 values (1, 4);
|
|
insert into t1 values (10, 40);
|
|
insert into t1 values (1, 4);
|
|
insert into t1 values (10, 43);
|
|
insert into t1 values (1, 4);
|
|
insert into t1 values (10, 41);
|
|
insert into t1 values (1, 4);
|
|
insert into t1 values (10, 43);
|
|
insert into t1 values (1, 4);
|
|
select a, MAX(b), (1, MAX(b)) = (1, 4) from t1 group by a;
|
|
drop table t1;
|
|
SELECT ROW(2,10) <=> ROW(3,4);
|
|
SELECT ROW(NULL,10) <=> ROW(3,NULL);
|