diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-11-07 04:03:44 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-11-07 04:03:44 +0200 |
| commit | 4060f083076dcac09a37148d2f733b33fa825f2b (patch) | |
| tree | 3b9ae7230972e46b9789ccf84dbfed194cee9298 /mysql-test | |
| parent | b0da9dbd24a7fdd89a2471be1fdcf889c3dfc7d6 (diff) | |
| parent | 72413e7f81cb87327d8bb2094a43d66578cd1632 (diff) | |
| download | mariadb-git-4060f083076dcac09a37148d2f733b33fa825f2b.tar.gz | |
Merge work:/my/mysql-4.0 into hundin.mysql.fi:/my/mysql-4.0
sql/field.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/rpl_log.result | 2 | ||||
| -rw-r--r-- | mysql-test/r/variables.result | 4 | ||||
| -rw-r--r-- | mysql-test/t/variables.test | 4 |
3 files changed, 9 insertions, 1 deletions
diff --git a/mysql-test/r/rpl_log.result b/mysql-test/r/rpl_log.result index 7d1843f95fc..835b5d6629a 100644 --- a/mysql-test/r/rpl_log.result +++ b/mysql-test/r/rpl_log.result @@ -72,7 +72,7 @@ show binlog events in 'slave-bin.001' from 4; Log_name Pos Event_type Server_id Orig_log_pos Info slave-bin.001 4 Start 2 4 Server ver: VERSION, Binlog ver: 3 slave-bin.001 79 Query 1 79 use test; create table t1(n int not null auto_increment primary key) -slave-bin.001 172 Intvar 1 200 INSERT_ID=1 +slave-bin.001 172 Intvar 1 172 INSERT_ID=1 slave-bin.001 200 Query 1 200 use test; insert into t1 values (NULL) slave-bin.001 263 Query 1 263 use test; drop table t1 slave-bin.001 311 Query 1 311 use test; create table t1 (word char(20) not null) diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result index ff0f94ab4a6..f8ac13477a9 100644 --- a/mysql-test/r/variables.result +++ b/mysql-test/r/variables.result @@ -170,6 +170,10 @@ convert_character_set cp1251_koi8 select @@timestamp>0; @@timestamp>0 1 +set @@rand_seed1=10000000,@@rand_seed2=1000000; +select ROUND(RAND(),5); +ROUND(RAND(),5) +0.02887 set big_tables=OFFF; Variable 'big_tables' can't be set to the value of 'OFFF' set big_tables="OFFF"; diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test index e84a7fe404d..e21fbd975e6 100644 --- a/mysql-test/t/variables.test +++ b/mysql-test/t/variables.test @@ -93,6 +93,10 @@ set global character set default, session character set default; show variables like "convert_character_set"; select @@timestamp>0; +set @@rand_seed1=10000000,@@rand_seed2=1000000; +select ROUND(RAND(),5); + + # The following should give errors --error 1231 |