database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge work:/my/mysql-4.0 into hundin.mysql.fi:/my/mysql-4.0

Browse Source 
sql/field.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
This commit is contained in:
unknown
2002-11-07 04:03:44 +02:00
parent b0da9dbd24 72413e7f81
commit 4060f08307
29 changed files with 342 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/rpl_log.result
View File

@ -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)

4
mysql-test/r/variables.result
View File

@ -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";

4
mysql-test/t/variables.test
View File

@ -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