diff options
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/case.result | 8 | ||||
| -rw-r--r-- | mysql-test/r/insert.result | 9 | ||||
| -rw-r--r-- | mysql-test/r/multi_update.result | 10 | ||||
| -rw-r--r-- | mysql-test/r/rpl_failsafe.result | 1 | ||||
| -rw-r--r-- | mysql-test/r/rpl_log_pos.result | 4 | ||||
| -rw-r--r-- | mysql-test/r/variables.result | 5 |
6 files changed, 36 insertions, 1 deletions
diff --git a/mysql-test/r/case.result b/mysql-test/r/case.result index 18241a8fcc1..914e05efa7a 100644 --- a/mysql-test/r/case.result +++ b/mysql-test/r/case.result @@ -63,3 +63,11 @@ nothing 2 one 1 two 1 drop table t1; +create table t1 (row int not null, col int not null, val varchar(255) not null); +insert into t1 values (1,1,'orange'),(1,2,'large'),(2,1,'yellow'),(2,2,'medium'),(3,1,'green'),(3,2,'small'); +select max(case col when 1 then val else null end) as color from t1 group by row; +color +orange +yellow +green +drop table t1; diff --git a/mysql-test/r/insert.result b/mysql-test/r/insert.result index 2ffa9d88618..69b790ff35b 100644 --- a/mysql-test/r/insert.result +++ b/mysql-test/r/insert.result @@ -48,6 +48,15 @@ sid id skr 1 skr 2 test 1 +insert into t1 values ('rts',NULL),('rts',NULL),('test',NULL); +select * from t1; +sid id +rts 1 +rts 2 +skr 1 +skr 2 +test 1 +test 2 drop table t1; drop database if exists foo; create database foo; diff --git a/mysql-test/r/multi_update.result b/mysql-test/r/multi_update.result index dd2afc67e26..b037fc87996 100644 --- a/mysql-test/r/multi_update.result +++ b/mysql-test/r/multi_update.result @@ -251,3 +251,13 @@ n d select * from t2; n d drop table t1,t2; +drop table if exists t1,t2,t3; +CREATE TABLE t1 ( broj int(4) unsigned NOT NULL default '0', naziv char(25) NOT NULL default 'NEPOZNAT', PRIMARY KEY (broj)) TYPE=MyISAM; +INSERT INTO t1 VALUES (1,'jedan'),(2,'dva'),(3,'tri'),(4,'xxxxxxxxxx'),(5,'a'),(10,''),(11,''),(12,''),(13,''); +CREATE TABLE t2 ( broj int(4) unsigned NOT NULL default '0', naziv char(25) NOT NULL default 'NEPOZNAT', PRIMARY KEY (broj)) TYPE=MyISAM; +INSERT INTO t2 VALUES (1,'jedan'),(2,'dva'),(3,'tri'),(4,'xxxxxxxxxx'),(5,'a'); +CREATE TABLE t3 ( broj int(4) unsigned NOT NULL default '0', naziv char(25) NOT NULL default 'NEPOZNAT', PRIMARY KEY (broj)) TYPE=MyISAM; +INSERT INTO t3 VALUES (1,'jedan'),(2,'dva'); +update t1,t2 set t1.naziv="aaaa" where t1.broj=t2.broj; +update t1,t2,t3 set t1.naziv="bbbb", t2.naziv="aaaa" where t1.broj=t2.broj and t2.broj=t3.broj; +drop table if exists t1,t2,t3; diff --git a/mysql-test/r/rpl_failsafe.result b/mysql-test/r/rpl_failsafe.result index d122b13adc2..956555f9318 100644 --- a/mysql-test/r/rpl_failsafe.result +++ b/mysql-test/r/rpl_failsafe.result @@ -1,4 +1,5 @@ stop slave; +drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; reset master; reset slave; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; diff --git a/mysql-test/r/rpl_log_pos.result b/mysql-test/r/rpl_log_pos.result index b4dc132e046..fa38e42ae73 100644 --- a/mysql-test/r/rpl_log_pos.result +++ b/mysql-test/r/rpl_log_pos.result @@ -10,7 +10,9 @@ master-bin.000001 79 show slave status; Master_Host Master_User Master_Port Connect_retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space 127.0.0.1 root MASTER_PORT 1 master-bin.000001 79 slave-relay-bin.000002 123 master-bin.000001 Yes Yes 0 0 79 127 +stop slave; change master to master_log_pos=73; +start slave; stop slave; change master to master_log_pos=73; show slave status; @@ -20,6 +22,7 @@ start slave; show slave status; Master_Host Master_User Master_Port Connect_retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space 127.0.0.1 root MASTER_PORT 1 master-bin.000001 73 slave-relay-bin.000001 4 master-bin.000001 No Yes 0 0 73 4 +stop slave; change master to master_log_pos=173; start slave; show slave status; @@ -32,6 +35,7 @@ create table if not exists t1 (n int); drop table if exists t1; create table t1 (n int); insert into t1 values (1),(2),(3); +stop slave; change master to master_log_pos=79; start slave; select * from t1; diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result index fbbf7fcb8f4..ed477a8519b 100644 --- a/mysql-test/r/variables.result +++ b/mysql-test/r/variables.result @@ -48,6 +48,9 @@ set max_join_size=100; show variables like 'max_join_size'; Variable_name Value max_join_size 100 +show global variables like 'max_join_size'; +Variable_name Value +max_join_size HA_POS_ERROR set GLOBAL max_join_size=2000; show global variables like 'max_join_size'; Variable_name Value @@ -59,7 +62,7 @@ max_join_size 2000 set GLOBAL max_join_size=DEFAULT; show global variables like 'max_join_size'; Variable_name Value -max_join_size 18446744073709551615 +max_join_size HA_POS_ERROR set @@max_join_size=1000, @@global.max_join_size=2000; select @@local.max_join_size, @@global.max_join_size; @@session.max_join_size @@global.max_join_size |