mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 05:22:25 +01:00
b388eb004d
bmove_allign -> bmove_align Added OLAP function ROLLUP Split mysql_fix_privilege_tables to a script and a .sql data file Added new (MEMROOT*) functions to avoid calling current_thd() when creating some common objects. Added table_alias_charset, for easier --lower-case-table-name handling Better SQL_MODE handling (Setting complex options also sets sub options) New (faster) assembler string functions for x86 BitKeeper/etc/ignore: added libmysqld/sql_state.c client/mysql.cc: Added SQLSTATE to error messages Added new function put_error() to be able to clean up some old code. client/mysqltest.c: Write ERROR SQLSTATE for all errors dbug/dbug.c: Portability fixes include/m_string.h: Rename bmove_allign as bmove_align include/mysql.h: Added SQLSTATE (for embedded version) include/mysql_com.h: Send correct SQLSTATE for the error to the client libmysql/libmysql.c: Changed default error state to HY000 Applied code cleanup patch libmysqld/Makefile.am: Added sql_state.cc libmysqld/libmysqld.c: Added sqlstate mysql-test/r/analyse.result: Updated results mysql-test/r/ansi.result: Updated results mysql-test/r/auto_increment.result: Updated results mysql-test/r/bdb-deadlock.result: Updated results mysql-test/r/bdb.result: Updated results mysql-test/r/comments.result: Updated results mysql-test/r/create.result: Updated results mysql-test/r/ctype_collate.result: Updated results mysql-test/r/delayed.result: Updated results mysql-test/r/delete.result: Updated results mysql-test/r/derived.result: Updated results mysql-test/r/distinct.result: Updated results mysql-test/r/drop.result: Updated results mysql-test/r/err000001.result: Updated results mysql-test/r/explain.result: Updated results mysql-test/r/flush.result: Updated results mysql-test/r/fulltext.result: Updated results mysql-test/r/func_gconcat.result: Updated results mysql-test/r/func_system.result: Updated results mysql-test/r/grant_cache.result: Updated results mysql-test/r/group_by.result: Updated results mysql-test/r/handler.result: Updated results mysql-test/r/heap.result: Updated results mysql-test/r/heap_btree.result: Updated results mysql-test/r/heap_hash.result: Updated results mysql-test/r/innodb.result: Updated results mysql-test/r/innodb_handler.result: Updated results mysql-test/r/insert_select.result: Updated results mysql-test/r/insert_update.result: Updated results mysql-test/r/join.result: Updated results mysql-test/r/join_outer.result: Updated results mysql-test/r/key.result: Updated results mysql-test/r/lock.result: Updated results mysql-test/r/lock_multi.result: Updated results mysql-test/r/merge.result: Updated results mysql-test/r/multi_update.result: Updated results mysql-test/r/myisam.result: Updated results mysql-test/r/null.result: Updated results mysql-test/r/olap.result: Updated results mysql-test/r/order_by.result: Updated results mysql-test/r/packet.result: Updated results mysql-test/r/query_cache.result: Updated results mysql-test/r/row.result: Updated results mysql-test/r/rpl000001.result: Updated results mysql-test/r/rpl000009.result: Updated results mysql-test/r/rpl_empty_master_crash.result: Updated results mysql-test/r/rpl_log.result: Updated results mysql-test/r/rpl_replicate_do.result: Updated results mysql-test/r/rpl_rotate_logs.result: Updated results mysql-test/r/select.result: Updated results mysql-test/r/select_safe.result: Updated results mysql-test/r/show_check.result: Updated results mysql-test/r/sql_mode.result: Updated results mysql-test/r/subselect.result: Updated results mysql-test/r/temp_table.result: Updated results mysql-test/r/truncate.result: Updated results mysql-test/r/type_blob.result: Updated results mysql-test/r/type_decimal.result: Updated results mysql-test/r/type_float.result: Updated results mysql-test/r/type_ranges.result: Updated results mysql-test/r/union.result: Updated results mysql-test/r/update.result: Updated results mysql-test/r/user_var.result: Updated results mysql-test/r/varbinary.result: Updated results mysql-test/r/variables.result: Updated results mysql-test/t/ansi.test: Test of sql_mode mysql-test/t/derived.test: Updated results mysql-test/t/func_system.test: Make this independen of the MySQL server name mysql-test/t/lowercase_table.test: Cleanup mysql-test/t/olap.test: A lot of new tests mysql-test/t/sql_mode.test: More test for sql_mode mysql-test/t/subselect.test: Added a few new tests (to find a bug in the item_ref code) scripts/Makefile.am: Added mysql_fix_privilege_tables.sql scripts/mysql_fix_privilege_tables.sh: Totally new script. This bascily just pipes mysql_fix_privilege_tables.sql through 'mysql' to 'mysqld' sql/Makefile.am: Added sql_state.cc sql/item.cc: Extended Item_field::eq() to be able to better match GROUP BY fields on the command line. Needed for ROLLUP sql/item.h: Added function to be able to avoid calling current_thd() when doing new Item. sql/item_sum.cc: Moved copy_or_same() and some reset() functions from item_sum.h Needed to be able to access thd->mem_root. sql/item_sum.h: Moved some functions to item_sum.cc Added make_unique() for ROLLUP sql/item_uniq.h: Fixed return value sql/mysql_priv.h: Updated MODE flags sql/mysqld.cc: Added ANSI as it's own mode Moved charset_info variables here Cleaned up handler_count handling (for NT) Added table_alias_charset, for easier --lower-case-table-name handling sql/net_serv.cc: New comment sql/protocol.cc: Send SQLSTATE to client sql/set_var.cc: Better SQL_MODE handling (Setting complex options also sets sub options) sql/set_var.h: Better SQL_MODE handling sql/sql_base.cc: Make alias depend on --lower-case-table-names Make find_item_in_list also check database name sql/sql_cache.cc: Indentation cleanup sql/sql_list.h: Added safety assert Addes support of alloc without current_thd() sql/sql_prepare.cc: Update after prototype change sql/sql_select.cc: Added ROLLUP sql/sql_select.h: structures for rollup sql/sql_show.cc: Easier SQL_MODE handling sql/sql_string.cc: Move CHARSET_INFO to mysqld (to be together with all other global variables) sql/sql_string.h: Added function to be able to avoid calling current_thd() when doing new Item. sql/sql_table.cc: Simpler --lower-case-table-name handling sql/sql_union.cc: Update after prototype change sql/sql_yacc.yy: ROLLUP sql/unireg.h: bmove_allign ->bmove_align strings/Makefile.am: Fix to be able to compile str_test.c strings/ctype.c: Removed empty lines strings/str_test.c: Added test of bmove_align strings/strings-x86.s: Faster bmove_align, bmove_upp and strmake strings/strings.asm: move_allg
167 lines
4.8 KiB
Text
167 lines
4.8 KiB
Text
drop table if exists t1;
|
|
select (1,2,3) IN ((3,2,3), (1,2,3), (1,3,3));
|
|
(1,2,3) IN ((3,2,3), (1,2,3), (1,3,3))
|
|
1
|
|
select row(10,2,3) IN (row(3,2,3), row(1,2,3), row(1,3,3));
|
|
row(10,2,3) IN (row(3,2,3), row(1,2,3), row(1,3,3))
|
|
0
|
|
select row(1,2,3) IN (row(3,NULL,3), row(1,2,3), row(1,3,3));
|
|
row(1,2,3) IN (row(3,NULL,3), row(1,2,3), row(1,3,3))
|
|
1
|
|
select row(10,2,3) IN (row(3,NULL,3), row(1,2,3), row(1,3,3));
|
|
row(10,2,3) IN (row(3,NULL,3), row(1,2,3), row(1,3,3))
|
|
0
|
|
select row('a',1.5,3) IN (row(1,2,3), row('a',1.5,3), row('a','a','a'));
|
|
row('a',1.5,3) IN (row(1,2,3), row('a',1.5,3), row('a','a','a'))
|
|
1
|
|
select row('a',0,3) IN (row(3,2,3), row('a','0','3'), row(1,3,3));
|
|
row('a',0,3) IN (row(3,2,3), row('a','0','3'), row(1,3,3))
|
|
1
|
|
select row('a',0,3) IN (row(3,2,3), row('a','a','3'), row(1,3,3));
|
|
row('a',0,3) IN (row(3,2,3), row('a','a','3'), row(1,3,3))
|
|
1
|
|
select row('a',1.5,3) IN (row(3,NULL,3), row('a',1.5,3), row(1,3,3));
|
|
row('a',1.5,3) IN (row(3,NULL,3), row('a',1.5,3), row(1,3,3))
|
|
1
|
|
select row('b',1.5,3) IN (row(3,NULL,3), row('a',1.5,3), row(1,3,3));
|
|
row('b',1.5,3) IN (row(3,NULL,3), row('a',1.5,3), row(1,3,3))
|
|
0
|
|
select row('b',1.5,3) IN (row('b',NULL,3), row('a',1.5,3), row(1,3,3));
|
|
row('b',1.5,3) IN (row('b',NULL,3), row('a',1.5,3), row(1,3,3))
|
|
NULL
|
|
select row('b',1.5,3) IN (row('b',NULL,4), row('a',1.5,3), row(1,3,3));
|
|
row('b',1.5,3) IN (row('b',NULL,4), row('a',1.5,3), row(1,3,3))
|
|
0
|
|
select (1,2,(3,4)) IN ((3,2,(3,4)), (1,2,(3,4)));
|
|
(1,2,(3,4)) IN ((3,2,(3,4)), (1,2,(3,4)))
|
|
1
|
|
select row(1,2,row(3,4)) IN (row(3,2,row(3,4)), row(1,2,4));
|
|
ERROR 21000: Cardinality error (more/less than 2 columns)
|
|
select row(1,2,row(3,4)) IN (row(3,2,row(3,4)), row(1,2,row(3,NULL)));
|
|
row(1,2,row(3,4)) IN (row(3,2,row(3,4)), row(1,2,row(3,NULL)))
|
|
NULL
|
|
SELECT (1,2,3)=(0,NULL,3);
|
|
(1,2,3)=(0,NULL,3)
|
|
0
|
|
SELECT (1,2,3)=(1,NULL,3);
|
|
(1,2,3)=(1,NULL,3)
|
|
NULL
|
|
SELECT (1,2,3)=(1,NULL,0);
|
|
(1,2,3)=(1,NULL,0)
|
|
NULL
|
|
SELECT ROW(1,2,3)=ROW(1,2,3);
|
|
ROW(1,2,3)=ROW(1,2,3)
|
|
1
|
|
SELECT ROW(2,2,3)=ROW(1+1,2,3);
|
|
ROW(2,2,3)=ROW(1+1,2,3)
|
|
1
|
|
SELECT ROW(1,2,3)=ROW(1+1,2,3);
|
|
ROW(1,2,3)=ROW(1+1,2,3)
|
|
0
|
|
SELECT ROW(1,2,3)<ROW(1+1,2,3);
|
|
ROW(1,2,3)<ROW(1+1,2,3)
|
|
1
|
|
SELECT ROW(1,2,3)>ROW(1+1,2,3);
|
|
ROW(1,2,3)>ROW(1+1,2,3)
|
|
0
|
|
SELECT ROW(1,2,3)<=ROW(1+1,2,3);
|
|
ROW(1,2,3)<=ROW(1+1,2,3)
|
|
1
|
|
SELECT ROW(1,2,3)>=ROW(1+1,2,3);
|
|
ROW(1,2,3)>=ROW(1+1,2,3)
|
|
0
|
|
SELECT ROW(1,2,3)<>ROW(1+1,2,3);
|
|
ROW(1,2,3)<>ROW(1+1,2,3)
|
|
1
|
|
SELECT ROW(NULL,2,3)=ROW(NULL,2,3);
|
|
ROW(NULL,2,3)=ROW(NULL,2,3)
|
|
NULL
|
|
SELECT ROW(NULL,2,3)<=>ROW(NULL,2,3);
|
|
ROW(NULL,2,3)<=>ROW(NULL,2,3)
|
|
1
|
|
SELECT ROW(1,2,ROW(3,4,5))=ROW(1,2,ROW(3,4,5));
|
|
ROW(1,2,ROW(3,4,5))=ROW(1,2,ROW(3,4,5))
|
|
1
|
|
SELECT ROW('test',2,3.33)=ROW('test',2,3.33);
|
|
ROW('test',2,3.33)=ROW('test',2,3.33)
|
|
1
|
|
SELECT ROW('test',2,3.33)=ROW('test',2,3.33,4);
|
|
ERROR 21000: Cardinality error (more/less than 3 columns)
|
|
SELECT ROW('test',2,ROW(3,33))=ROW('test',2,ROW(3,33));
|
|
ROW('test',2,ROW(3,33))=ROW('test',2,ROW(3,33))
|
|
1
|
|
SELECT ROW('test',2,ROW(3,33))=ROW('test',2,ROW(3,3));
|
|
ROW('test',2,ROW(3,33))=ROW('test',2,ROW(3,3))
|
|
0
|
|
SELECT ROW('test',2,ROW(3,33))=ROW('test',2,ROW(3,NULL));
|
|
ROW('test',2,ROW(3,33))=ROW('test',2,ROW(3,NULL))
|
|
NULL
|
|
SELECT ROW('test',2,ROW(3,33))=ROW('test',2,4);
|
|
ERROR 21000: Cardinality error (more/less than 2 columns)
|
|
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);
|
|
a b c
|
|
1 2 3
|
|
select * from t1 where ROW(0,2,3)=ROW(a,b,c);
|
|
a b c
|
|
select * from t1 where ROW(1,2,3)<ROW(a,b,c);
|
|
a b c
|
|
2 3 1
|
|
3 2 1
|
|
select ROW(a,2,3) IN(row(1,b,c), row(2,3,1)) from t1;
|
|
ROW(a,2,3) IN(row(1,b,c), row(2,3,1))
|
|
1
|
|
0
|
|
0
|
|
NULL
|
|
select ROW(c,2,3) IN(row(1,b,a), row(2,3,1)) from t1;
|
|
ROW(c,2,3) IN(row(1,b,a), row(2,3,1))
|
|
0
|
|
0
|
|
1
|
|
NULL
|
|
select ROW(a,b,c) IN(row(1,2,3), row(3,2,1)) from t1;
|
|
ROW(a,b,c) IN(row(1,2,3), row(3,2,1))
|
|
1
|
|
0
|
|
1
|
|
NULL
|
|
select ROW(1,2,3) IN(row(a,b,c), row(1,2,3)) from t1;
|
|
ROW(1,2,3) IN(row(a,b,c), row(1,2,3))
|
|
1
|
|
1
|
|
1
|
|
1
|
|
drop table t1;
|
|
select ROW(1,1);
|
|
ERROR 21000: Cardinality error (more/less than 1 columns)
|
|
create table t1 (i int);
|
|
select 1 from t1 where ROW(1,1);
|
|
ERROR 21000: Cardinality error (more/less than 1 columns)
|
|
select count(*) from t1 order by ROW(1,1);
|
|
ERROR 21000: Cardinality error (more/less than 1 columns)
|
|
select count(*) from t1 having (1,1) order by i;
|
|
ERROR 21000: Cardinality error (more/less than 1 columns)
|
|
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;
|
|
a MAX(b) (1, MAX(b)) = (1, 4)
|
|
1 4 1
|
|
10 43 0
|
|
drop table t1;
|
|
SELECT ROW(2,10) <=> ROW(3,4);
|
|
ROW(2,10) <=> ROW(3,4)
|
|
0
|
|
SELECT ROW(NULL,10) <=> ROW(3,NULL);
|
|
ROW(NULL,10) <=> ROW(3,NULL)
|
|
0
|