mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 12:32:27 +01:00
33efc9677d
Fixed (together with Guilhem) bugs in mysqlbinlog regarding --offset Prefix addresses with 0x for easier comparisons of debug logs Fixed problem where MySQL choosed index-read even if there would be a much better range on the same index This fix changed some 'index' queries to 'range' queries in the test suite Don't create 'dummy' WHERE clause for trivial WHERE clauses where we can remove the WHERE clause. This fix removed of a lot of 'Using where' notes in the test suite. Give NOTE instead of WARNING if table/function doesn't exists when using DROP IF EXISTS Give NOTE instead of WARNING for safe field-type conversions Makefile.am: Don't automaticly update files from bk client/mysqlbinlog.cc: Merge with 4.1 (+ apply bug fixes for --offset and --start-position) include/my_sys.h: Faster clear_alloc_root() mysql-test/r/bdb.result: Updated results after merge mysql-test/r/create.result: Updated results after merge mysql-test/r/func_group.result: Updated results after merge mysql-test/r/func_if.result: Updated results after merge mysql-test/r/heap_btree.result: Updated results after merge mysql-test/r/index_merge.result: Updated results after merge mysql-test/r/index_merge_ror.result: Updated results after merge mysql-test/r/innodb.result: Updated results after merge mysql-test/r/join_outer.result: Updated results after merge mysql-test/r/mysqlbinlog2.result: Updated results after merge mysql-test/r/negation_elimination.result: Updated results after merge mysql-test/r/null.result: Updated results after merge Added more tests mysql-test/r/null_key.result: Updated results after merge Added more tests mysql-test/r/order_by.result: Updated results after merge mysql-test/r/range.result: Updated results after merge Added more tests mysql-test/r/rpl_charset.result: Updated results after merge mysql-test/r/sp-error.result: Updated results after merge mysql-test/r/sp.result: Updated results after merge Added delete of some stored procedures in an attempt to be able to re-run test even if it aborts in the middle mysql-test/r/type_blob.result: Updated results after merge (Some warnings are now notes) mysql-test/r/user_var.result: Updated results after merge Added more tests mysql-test/r/variables.result: Updated results after merge mysql-test/r/view.result: Updated results after merge mysql-test/t/mysqlbinlog2.test: Updated tests to use new positions mysql-test/t/null.test: More tests mysql-test/t/null_key.test: More tests mysql-test/t/range.test: More tests mysql-test/t/rpl_charset.test: Avoid big diffs in the future if tests changes mysql-test/t/sp-error.test: Updated error numbers mysql-test/t/sp-security.test: Updated error numbers mysql-test/t/sp.test: Updated results after merge Added delete of some stored procedures in an attempt to be able to re-run test even if it aborts in the middle mysql-test/t/user_var.test: More tests mysql-test/t/view.test: Updated error numbers mysys/my_alloc.c: Write into debug log the address of the allocated area sql/ha_isam.cc: Prefix addresses with 0x for easier comparisons of debug logs sql/ha_myisam.cc: Prefix addresses with 0x for easier comparisons of debug logs sql/ha_ndbcluster.cc: Add missing enum to switch sql/handler.cc: remove compiler warning sql/item.cc: More debugging Simple cleanup sql/item.h: Move Item::cleanup() to item.cc sql/item_cmpfunc.cc: Fix arena code sql/item_subselect.cc: After merge fixes sql/item_subselect.h: After merge fixes sql/item_sum.cc: Updated comment sql/log_event.cc: Remove wrong test sql/mysql_priv.h: Indentation fixes sql/mysqld.cc: After merge fixes Added 0x to pointers in debug log sql/opt_range.cc: Fixed problem where MySQL choosed index-read even if there would be a much better range on the same index This fix changed some 'index' queries to 'range' queries in the test suite sql/set_var.cc: Indentation fixes sql/sp_head.cc: Set state to INITIALIZED to make SP work with new arena code sql/sql_base.cc: After merge fixes sql/sql_class.cc: More debugging Use clear_alloc_root() instead of init_alloc_root() as the former is faster sql/sql_class.h: New method 'only_prepare()' sql/sql_lex.cc: After merge fixes sql/sql_lex.h: After merge fixes sql/sql_parse.cc: Fix for timezone tables. (The old way to add timezone tables to global list in 'create_total_list' doesn't work anymore) Give NOTE instead of WARNING if table/function doesn't exists when using DROP IF EXISTS sql/sql_prepare.cc: After merge fixes sql/sql_select.cc: Don't create 'dummy' WHERE clause for trivial WHERE clauses where we can remove the WHERE clause. This fix removed of a lot of 'Using where' notes in the test suite sql/sql_table.cc: Give NOTE instead of WARNING if table/function doesn't exists when using DROP IF EXISTS sql/sql_union.cc: After merge fix sql/sql_view.cc: After merge fix sql/table.cc: After merge fix sql/tztime.cc: Update timezone table handling to use new table lists structure sql/tztime.h: Update timezone table handling to use new table lists structure sql/unireg.cc: Use 0x before pointers
203 lines
6.1 KiB
Text
203 lines
6.1 KiB
Text
drop table if exists t1,t2;
|
|
set @a := foo;
|
|
ERROR 42S22: Unknown column 'foo' in 'field list'
|
|
set @a := connection_id() + 3;
|
|
select @a - connection_id();
|
|
@a - connection_id()
|
|
3
|
|
set @b := 1;
|
|
select @b;
|
|
@b
|
|
1
|
|
CREATE TABLE t1 ( i int not null, v int not null,index (i));
|
|
insert into t1 values (1,1),(1,3),(2,1);
|
|
create table t2 (i int not null, unique (i));
|
|
insert into t2 select distinct i from t1;
|
|
select * from t2;
|
|
i
|
|
1
|
|
2
|
|
select distinct t2.i,@vv1:=if(sv1.i,1,0),@vv2:=if(sv2.i,1,0),@vv3:=if(sv3.i,1,0), @vv1+@vv2+@vv3 from t2 left join t1 as sv1 on sv1.i=t2.i and sv1.v=1 left join t1 as sv2 on sv2.i=t2.i and sv2.v=2 left join t1 as sv3 on sv3.i=t2.i and sv3.v=3;
|
|
i @vv1:=if(sv1.i,1,0) @vv2:=if(sv2.i,1,0) @vv3:=if(sv3.i,1,0) @vv1+@vv2+@vv3
|
|
1 1 0 1 2
|
|
2 1 0 0 1
|
|
explain select * from t1 where i=@vv1;
|
|
id select_type table type possible_keys key key_len ref rows Extra
|
|
1 SIMPLE t1 ref i i 4 const 1
|
|
select @vv1,i,v from t1 where i=@vv1;
|
|
@vv1 i v
|
|
1 1 1
|
|
1 1 3
|
|
explain select * from t1 where @vv1:=@vv1+1 and i=@vv1;
|
|
id select_type table type possible_keys key key_len ref rows Extra
|
|
1 SIMPLE t1 ALL NULL NULL NULL NULL 3 Using where
|
|
explain select @vv1:=i from t1 where i=@vv1;
|
|
id select_type table type possible_keys key key_len ref rows Extra
|
|
1 SIMPLE t1 index NULL i 4 NULL 3 Using where; Using index
|
|
explain select * from t1 where i=@vv1;
|
|
id select_type table type possible_keys key key_len ref rows Extra
|
|
1 SIMPLE t1 ref i i 4 const 1
|
|
drop table t1,t2;
|
|
set @a=0,@b=0;
|
|
select @a:=10, @b:=1, @a > @b, @a < @b;
|
|
@a:=10 @b:=1 @a > @b @a < @b
|
|
10 1 1 0
|
|
select @a:="10", @b:="1", @a > @b, @a < @b;
|
|
@a:="10" @b:="1" @a > @b @a < @b
|
|
10 1 1 0
|
|
select @a:=10, @b:=2, @a > @b, @a < @b;
|
|
@a:=10 @b:=2 @a > @b @a < @b
|
|
10 2 0 1
|
|
select @a:="10", @b:="2", @a > @b, @a < @b;
|
|
@a:="10" @b:="2" @a > @b @a < @b
|
|
10 2 1 0
|
|
select @a:=1;
|
|
@a:=1
|
|
1
|
|
select @a, @a:=1;
|
|
@a @a:=1
|
|
1 1
|
|
create table t1 (id int, d double, c char(10));
|
|
insert into t1 values (1,2.0, "test");
|
|
select @c:=0;
|
|
@c:=0
|
|
0
|
|
update t1 SET id=(@c:=@c+1);
|
|
select @c;
|
|
@c
|
|
1
|
|
select @c:=0;
|
|
@c:=0
|
|
0
|
|
update t1 set id=(@c:=@c+1);
|
|
select @c;
|
|
@c
|
|
1
|
|
select @c:=0;
|
|
@c:=0
|
|
0
|
|
select @c:=@c+1;
|
|
@c:=@c+1
|
|
1
|
|
select @d,(@d:=id),@d from t1;
|
|
@d (@d:=id) @d
|
|
NULL 1 1
|
|
select @e,(@e:=d),@e from t1;
|
|
@e (@e:=d) @e
|
|
NULL 2 2
|
|
select @f,(@f:=c),@f from t1;
|
|
@f (@f:=c) @f
|
|
NULL test test
|
|
set @g=1;
|
|
select @g,(@g:=c),@g from t1;
|
|
@g (@g:=c) @g
|
|
1 test test
|
|
select @c, @d, @e, @f;
|
|
@c @d @e @f
|
|
1 1 2 test
|
|
select @d:=id, @e:=id, @f:=id, @g:=@id from t1;
|
|
@d:=id @e:=id @f:=id @g:=@id
|
|
1 1 1 NULL
|
|
select @c, @d, @e, @f, @g;
|
|
@c @d @e @f @g
|
|
1 1 1 1 NULL
|
|
drop table t1;
|
|
select @a:=10, @b:=2, @a>@b, @a:="10", @b:="2", @a>@b, @a:=10, @b:=2, @a>@b, @a:="10", @b:="2", @a>@b;
|
|
@a:=10 @b:=2 @a>@b @a:="10" @b:="2" @a>@b @a:=10 @b:=2 @a>@b @a:="10" @b:="2" @a>@b
|
|
10 2 1 10 2 1 10 2 1 10 2 1
|
|
create table t1 (i int not null);
|
|
insert t1 values (1),(2),(2),(3),(3),(3);
|
|
select @a:=0;
|
|
@a:=0
|
|
0
|
|
select @a, @a:=@a+count(*), count(*), @a from t1 group by i;
|
|
@a @a:=@a+count(*) count(*) @a
|
|
0 1 1 0
|
|
0 2 2 0
|
|
0 3 3 0
|
|
select @a:=0;
|
|
@a:=0
|
|
0
|
|
select @a+0, @a:=@a+0+count(*), count(*), @a+0 from t1 group by i;
|
|
@a+0 @a:=@a+0+count(*) count(*) @a+0
|
|
0 1 1 0
|
|
1 3 2 0
|
|
3 6 3 0
|
|
drop table t1;
|
|
set @a=_latin2'test';
|
|
select charset(@a),collation(@a),coercibility(@a);
|
|
charset(@a) collation(@a) coercibility(@a)
|
|
latin2 latin2_general_ci 3
|
|
select @a=_latin2'TEST';
|
|
@a=_latin2'TEST'
|
|
1
|
|
select @a=_latin2'TEST' collate latin2_bin;
|
|
@a=_latin2'TEST' collate latin2_bin
|
|
0
|
|
set @a=_latin2'test' collate latin2_general_ci;
|
|
select charset(@a),collation(@a),coercibility(@a);
|
|
charset(@a) collation(@a) coercibility(@a)
|
|
latin2 latin2_general_ci 0
|
|
select @a=_latin2'TEST';
|
|
@a=_latin2'TEST'
|
|
1
|
|
select @a=_latin2'TEST' collate latin2_bin;
|
|
ERROR HY000: Illegal mix of collations (latin2_general_ci,EXPLICIT) and (latin2_bin,EXPLICIT) for operation '='
|
|
select charset(@a:=_latin2'test');
|
|
charset(@a:=_latin2'test')
|
|
latin2
|
|
select collation(@a:=_latin2'test');
|
|
collation(@a:=_latin2'test')
|
|
latin2_general_ci
|
|
select coercibility(@a:=_latin2'test');
|
|
coercibility(@a:=_latin2'test')
|
|
3
|
|
select collation(@a:=_latin2'test' collate latin2_bin);
|
|
collation(@a:=_latin2'test' collate latin2_bin)
|
|
latin2_bin
|
|
select coercibility(@a:=_latin2'test' collate latin2_bin);
|
|
coercibility(@a:=_latin2'test' collate latin2_bin)
|
|
0
|
|
select (@a:=_latin2'test' collate latin2_bin) = _latin2'TEST';
|
|
(@a:=_latin2'test' collate latin2_bin) = _latin2'TEST'
|
|
0
|
|
select charset(@a),collation(@a),coercibility(@a);
|
|
charset(@a) collation(@a) coercibility(@a)
|
|
latin2 latin2_bin 0
|
|
select (@a:=_latin2'test' collate latin2_bin) = _latin2'TEST' collate latin2_general_ci;
|
|
ERROR HY000: Illegal mix of collations (latin2_bin,EXPLICIT) and (latin2_general_ci,EXPLICIT) for operation '='
|
|
create table t1 (a varchar(50));
|
|
reset master;
|
|
SET TIMESTAMP=10000;
|
|
SET @`a b`='hello';
|
|
INSERT INTO t1 VALUES(@`a b`);
|
|
set @var1= "';aaa";
|
|
insert into t1 values (@var1);
|
|
create table t2 (c char(30)) charset=ucs2;
|
|
set @v=convert('abc' using ucs2);
|
|
insert into t2 values (@v);
|
|
show binlog events from 95;
|
|
Log_name Pos Event_type Server_id End_log_pos Info
|
|
master-bin.000001 95 User var 1 136 @`a b`=_latin1 0x68656C6C6F COLLATE latin1_swedish_ci
|
|
master-bin.000001 136 Query 1 222 use `test`; INSERT INTO t1 VALUES(@`a b`)
|
|
master-bin.000001 222 User var 1 264 @`var1`=_latin1 0x273B616161 COLLATE latin1_swedish_ci
|
|
master-bin.000001 264 Query 1 350 use `test`; insert into t1 values (@var1)
|
|
master-bin.000001 350 Query 1 448 use `test`; create table t2 (c char(30)) charset=ucs2
|
|
master-bin.000001 448 User var 1 488 @`v`=_ucs2 0x006100620063 COLLATE ucs2_general_ci
|
|
master-bin.000001 488 Query 1 571 use `test`; insert into t2 values (@v)
|
|
/*!40019 SET @@session.max_insert_delayed_threads=0*/;
|
|
SET @`a b`:=_latin1 0x68656C6C6F COLLATE latin1_swedish_ci;
|
|
use test;
|
|
SET TIMESTAMP=10000;
|
|
SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1;
|
|
SET @@session.sql_mode=0;
|
|
INSERT INTO t1 VALUES(@`a b`);
|
|
SET @`var1`:=_latin1 0x273B616161 COLLATE latin1_swedish_ci;
|
|
SET TIMESTAMP=10000;
|
|
insert into t1 values (@var1);
|
|
SET TIMESTAMP=10000;
|
|
create table t2 (c char(30)) charset=ucs2;
|
|
SET @`v`:=_ucs2 0x006100620063 COLLATE ucs2_general_ci;
|
|
SET TIMESTAMP=10000;
|
|
insert into t2 values (@v);
|
|
drop table t1, t2;
|