Commit b3c2bc8c authored by tnurnberg@white.intern.koehntopp.de's avatar tnurnberg@white.intern.koehntopp.de
Browse files

Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 

into  mysql.com:/scratch/tnurnberg/20901/51-20901
parents e9229319 017ba8da

mysql-test/r/func_misc.result

+6 −0
Original line number Diff line number Diff line
@@ -190,6 +190,12 @@ ERROR 21000: Operand should contain 1 column(s) 
drop table table_26093;

drop function func_26093_a;

drop function func_26093_b;

create table t1 (a int not null);

insert into t1 values (-1), (-2);

select min(a) from t1 group by inet_ntoa(a);

min(a)

-2

drop table t1;

End of 5.0 tests

select connection_id() > 0;

connection_id() > 0

mysql-test/r/insert.result

+14 −0
Original line number Diff line number Diff line
@@ -499,4 +499,18 @@ i 
2

2

DROP TABLE t1, t2;

CREATE TABLE t1 (c1 INT NOT NULL);

INSERT INTO t1 VALUES(4188.32999999999992724042385816574096679687500),

('4188.32999999999992724042385816574096679687500'), (4188);

SELECT * FROM t1;

c1

4188

4188

4188

CREATE TABLE t2 (c1 BIGINT);

INSERT INTO t2 VALUES('15449237462.0000000000');

SELECT * FROM t2;

c1

15449237462

DROP TABLE t1, t2;

End of 5.0 tests.

mysql-test/r/log_state.result

+13 −0
Original line number Diff line number Diff line
@@ -175,3 +175,16 @@ SET GLOBAL slow_query_log = ON; 
SET GLOBAL READ_ONLY = OFF;

SET GLOBAL general_log = @old_general_log_state;

SET GLOBAL slow_query_log = @old_slow_log_state;

set @old_general_log_file= @@global.general_log_file;

set @old_slow_query_log_file= @@global.slow_query_log_file;

set global general_log_file= concat('/not exiting path/log.maste', 'r');

ERROR 42000: Variable 'general_log_file' can't be set to the value of '/not exiting path/log.master'

set global general_log_file= NULL;

ERROR 42000: Variable 'general_log_file' can't be set to the value of 'NULL'

set global slow_query_log_file= concat('/not exiting path/log.maste', 'r');

ERROR 42000: Variable 'slow_query_log_file' can't be set to the value of '/not exiting path/log.master'

set global slow_query_log_file= NULL;

ERROR 42000: Variable 'slow_query_log_file' can't be set to the value of 'NULL'

set global general_log_file= @old_general_log_file;

set global slow_query_log_file= @old_slow_query_log_file;

End of 5.1 tests

mysql-test/r/status.result

+3 −0
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ VARIABLE_NAME VARIABLE_VALUE 
TABLE_LOCKS_IMMEDIATE	2

TABLE_LOCKS_WAITED	0

SET SQL_LOG_BIN=0;

set @old_general_log = @@global.general_log;

set global general_log = 'OFF';

drop table if exists t1;

create table t1(n int) engine=myisam;

insert into t1 values(1);
@@ -20,6 +22,7 @@ show status like 'Table_locks_waited'; 
Variable_name	Value

Table_locks_waited	1

drop table t1;

set global general_log = @old_general_log;

select 1;

1

1

mysql-test/t/func_misc.test

+8 −0
Original line number Diff line number Diff line
@@ -198,6 +198,14 @@ drop table table_26093; 
drop function func_26093_a;

drop function func_26093_b;



#

# Bug #31349: ERROR 1062 (23000): Duplicate entry '' for key 'group_key'

#

create table t1 (a int not null);

insert into t1 values (-1), (-2);

select min(a) from t1 group by inet_ntoa(a);

drop table t1;



--echo End of 5.0 tests



#