From 72413e7f81cb87327d8bb2094a43d66578cd1632 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 7 Nov 2002 04:02:37 +0200 Subject: Put temporary files in binlog cache when using BEGIN/COMMIT Let MySQL 4.0 read 4.1 .frm files without 4.1 specific extensions New variables @@rand_seed1 and @@rand_seed2 (used by replication) DROP TEMPORARY TABLE mysql-test/r/rpl_log.result: Update of results after last replication change mysql-test/r/variables.result: Test of new variables @@rand_seed1 and @@rand_seed2 mysql-test/t/variables.test: Test of new variables @@rand_seed1 and @@rand_seed2 sql/field.cc: Let MySQL 4.0 read 4.1 .frm files without 4.1 specific extensions sql/field.h: Let MySQL 4.0 read 4.1 .frm files without 4.1 specific extensions sql/item_func.cc: Put temporary files in binlog cache when using BEGIN/COMMIT sql/log.cc: Put temporary files in binlog cache when using BEGIN/COMMIT More debug information sql/log_event.cc: Put temporary files in binlog cache when using BEGIN/COMMIT sql/log_event.h: Put temporary files in binlog cache when using BEGIN/COMMIT sql/set_var.cc: Add system variables @@rand_seed1 and @@rand_seed2 sql/set_var.h: Add system variables @@rand_seed1 and @@rand_seed2 sql/slave.cc: Put temporary files in binlog cache when using BEGIN/COMMIT sql/sql_acl.cc: Put temporary files in binlog cache when using BEGIN/COMMIT sql/sql_base.cc: Store DROP of temporary tables in binlog cache sql/sql_class.h: Put temporary files in binlog cache when using BEGIN/COMMIT sql/sql_db.cc: Put temporary files in binlog cache when using BEGIN/COMMIT sql/sql_delete.cc: Put temporary files in binlog cache when using BEGIN/COMMIT sql/sql_insert.cc: Put temporary files in binlog cache when using BEGIN/COMMIT sql/sql_lex.h: DROP TEMPORARY TABLE sql/sql_load.cc: Put temporary files in binlog cache when using BEGIN/COMMIT sql/sql_parse.cc: Put temporary files in binlog cache when using BEGIN/COMMIT sql/sql_rename.cc: Put temporary files in binlog cache when using BEGIN/COMMIT sql/sql_repl.cc: Put temporary files in binlog cache when using BEGIN/COMMIT sql/sql_repl.h: Put temporary files in binlog cache when using BEGIN/COMMIT sql/sql_table.cc: Put temporary files in binlog cache when using BEGIN/COMMIT sql/sql_update.cc: Put temporary files in binlog cache when using BEGIN/COMMIT sql/sql_yacc.yy: DROP TEMPORARY sql/table.cc: Let MySQL 4.0 read 4.1 .frm files without 4.1 specific extensions sql/unireg.cc: Let MySQL 4.0 read 4.1 .frm files without 4.1 specific extensions --- mysql-test/r/rpl_log.result | 2 +- mysql-test/r/variables.result | 4 ++++ mysql-test/t/variables.test | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) (limited to 'mysql-test') 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 -- cgit v1.2.1