mirror of
https://github.com/MariaDB/server.git
synced 2025-01-25 00:04:33 +01:00
2901c3b8fa
Use server character set if --default-character-set is not used Added convert_string() for more efficient alloc+character-set convert of strings BitKeeper/deleted/.del-convert.result~a3b56e1db6f498e9: Delete: mysql-test/r/convert.result BitKeeper/deleted/.del-convert.test~f4ceb743194dfe72: Delete: mysql-test/t/convert.test BitKeeper/deleted/.del-make_win_src_distribution.old~5c9ebdc4a852b43b: Delete: scripts/make_win_src_distribution.old client/mysql.cc: Use server character set if --default-character-set is not used client/mysqltest.c: Code cleanup (merge identical code) More debug messages heap/hp_create.c: After merge fix include/m_ctype.h: After merge fix include/my_global.h: Remove size_str (we already have size_s) include/mysql_com.h: After merge fix libmysql/libmysql.c: After merge fix libmysqld/Makefile.am: After merge fix mysql-test/r/auto_increment.result: After merge fix mysql-test/r/create.result: After merge fix mysql-test/r/ctype_latin1_de.result: After merge fix mysql-test/r/distinct.result: After merge fix mysql-test/r/drop.result: After merge fix mysql-test/r/fulltext.result: After merge fix mysql-test/r/func_gconcat.result: After merge fix mysql-test/r/func_str.result: After merge fix mysql-test/r/func_test.result: After merge fix mysql-test/r/grant.result: After merge fix mysql-test/r/group_by.result: After merge fix mysql-test/r/handler.result: After merge fix mysql-test/r/heap.result: After merge fix mysql-test/r/heap_btree.result: After merge fix mysql-test/r/heap_hash.result: After merge fix mysql-test/r/innodb.result: After merge fix mysql-test/r/insert.result: After merge fix mysql-test/r/insert_select.result: After merge fix mysql-test/r/join_outer.result: After merge fix mysql-test/r/key.result: After merge fix mysql-test/r/key_cache.result: After merge fix mysql-test/r/loaddata.result: After merge fix mysql-test/r/myisam.result: After merge fix mysql-test/r/null.result: After merge fix mysql-test/r/null_key.result: After merge fix mysql-test/r/order_by.result: After merge fix mysql-test/r/rpl_do_grant.result: After merge fix mysql-test/r/rpl_error_ignored_table.result: After merge fix mysql-test/r/rpl_ignore_grant.result: After merge fix mysql-test/r/rpl_loaddata.result: After merge fix mysql-test/r/rpl_log.result: After merge fix mysql-test/r/rpl_log_pos.result: After merge fix mysql-test/r/rpl_max_relay_size.result: After merge fix mysql-test/r/rpl_replicate_do.result: After merge fix mysql-test/r/rpl_reset_slave.result: After merge fix mysql-test/r/rpl_rotate_logs.result: After merge fix mysql-test/r/rpl_user_variables.result: After merge fix mysql-test/r/select.result: After merge fix mysql-test/r/select_safe.result: After merge fix mysql-test/r/subselect.result: After merge fix mysql-test/r/type_blob.result: After merge fix mysql-test/r/type_decimal.result: After merge fix mysql-test/r/type_float.result: After merge fix mysql-test/r/type_ranges.result: After merge fix mysql-test/r/type_time.result: After merge fix mysql-test/r/type_uint.result: After merge fix mysql-test/r/union.result: After merge fix mysql-test/r/warnings.result: After merge fix mysql-test/t/auto_increment.test: After merge fix mysql-test/t/case.test: After merge fix mysql-test/t/ctype_collate.test: After merge fix mysql-test/t/ctype_latin1_de.test: After merge fix mysql-test/t/drop.test: After merge fix mysql-test/t/func_in.test: After merge fix mysql-test/t/func_set.test: After merge fix mysql-test/t/func_str.test: After merge fix mysql-test/t/func_test.test: After merge fix mysql-test/t/grant.test: After merge fix mysql-test/t/group_by.test: After merge fix mysql-test/t/handler.test: After merge fix mysql-test/t/heap.test: After merge fix mysql-test/t/heap_btree.test: After merge fix mysql-test/t/heap_hash.test: After merge fix mysql-test/t/innodb.test: After merge fix mysql-test/t/insert_select.test: After merge fix mysql-test/t/key.test: After merge fix mysql-test/t/key_cache.test: After merge fix mysql-test/t/lock_tables_lost_commit-master.opt: After merge fix mysql-test/t/lock_tables_lost_commit.test: After merge fix mysql-test/t/myisam.test: After merge fix mysql-test/t/row.test: After merge fix mysql-test/t/subselect.test: After merge fix mysql-test/t/type_decimal.test: After merge fix mysql-test/t/type_ranges.test: After merge fix mysql-test/t/type_uint.test: After merge fix mysql-test/t/variables.test: After merge fix mysql-test/t/warnings.test: After merge fix scripts/make_win_src_distribution.sh: after merge fixes sql-common/client.c: After merge fix Change my_connect() to use poll() If character set is not given, use servers character set. sql/field.cc: After merge fix Don't give warnings when storing data in fields in optimizer. sql/ha_myisammrg.h: After merge fix sql/log.cc: After merge fix sql/log_event.cc: After merge fix sql/mysqld.cc: After merge fix sql/opt_range.cc: After merge fix sql/set_var.cc: Code cleanup Fixed wrong usage of base_names (like medium.key_buffer) that caused core dumps sql/set_var.h: Fixed wrong usage of base_names (like medium.key_buffer) that caused core dumps sql/slave.cc: After merge fix sql/sql_acl.cc: After merge fix Code cleanup sql/sql_class.cc: Added convert_string() for more efficient alloc+character-set convert of strings Add cached flags to avoid calling mysql_charset_same() during parsing. sql/sql_class.h: Added convert_string() for more efficient alloc+character-set convert of strings Add cached flags to avoid calling mysql_charset_same() during parsing. sql/sql_handler.cc: After merge fix sql/sql_lex.h: After merge fix sql/sql_parse.cc: Optimize and fix memory reference errors reported by valgrind sql/sql_repl.cc: After merge fix sql/sql_yacc.yy: After merge fix Avoid calling mysql_charset_same() when parsing identifiers strings/ctype-latin1.c: Port latin_de conversion code from 4.0
83 lines
2.9 KiB
Text
83 lines
2.9 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 1240
|
|
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)));
|
|
|
|
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 1240
|
|
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 1240
|
|
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 1240
|
|
select ROW(1,1);
|
|
|
|
create table t1 (i int);
|
|
-- error 1240
|
|
select 1 from t1 where ROW(1,1);
|
|
-- error 1240
|
|
select count(*) from t1 order by ROW(1,1);
|
|
-- error 1240
|
|
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);
|