Commit c1bcbe29 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.1 

into  bodhi.local:/opt/local/work/mysql-5.1-runtime


mysql-test/t/trigger.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
storage/csv/ha_tina.cc:
  Auto merged
mysql-test/r/csv.result:
  Manual merge.
mysql-test/t/csv.test:
  Manual merge.
parents bd27fcf8 5ed3d05e

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -1150,6 +1150,7 @@ libmysqld/sql_prepare.cc 
libmysqld/sql_rename.cc

libmysqld/sql_repl.cc

libmysqld/sql_select.cc

libmysqld/sql_servers.cc

libmysqld/sql_show.cc

libmysqld/sql_state.c

libmysqld/sql_string.cc

mysql-test/r/csv.result

+8 −0
Original line number Diff line number Diff line
@@ -5239,3 +5239,11 @@ id string 
0.67	string

9.67	string

drop table float_test;

CREATE TABLE `bug21328` (

`col1` int(11) DEFAULT NULL,

`col2` int(11) DEFAULT NULL,

`col3` int(11) DEFAULT NULL

) ENGINE=CSV;

insert into bug21328 values (1,NULL,NULL);

alter table bug21328 engine=myisam;

drop table bug21328;

mysql-test/r/log_tables.result

+0 −3
Original line number Diff line number Diff line
@@ -111,9 +111,6 @@ slow_log CREATE TABLE `slow_log` ( 
) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='Slow log'

alter table mysql.general_log engine=myisam;

alter table mysql.slow_log engine=myisam;

Warnings:

Warning	1366	Incorrect integer value: '' for column 'last_insert_id' at row 0

Warning	1366	Incorrect integer value: '' for column 'insert_id' at row 0

show create table mysql.general_log;

Table	Create Table

general_log	CREATE TABLE `general_log` (

mysql-test/r/read_only.result

+51 −1
Original line number Diff line number Diff line
@@ -39,11 +39,61 @@ delete t1 from t1,t3 where t1.a=t3.a; 
drop table t1;

insert into t1 values(1);

ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement

set global read_only=0;

lock table t1 write;

lock table t2 write;

set global read_only=1;

ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction

unlock tables ;

set global read_only=1;

select @@global.read_only;

@@global.read_only

0

unlock tables ;

select @@global.read_only;

@@global.read_only

1

set global read_only=0;

lock table t1 read;

lock table t2 read;

set global read_only=1;

ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction

unlock tables ;

set global read_only=1;

select @@global.read_only;

@@global.read_only

0

unlock tables ;

select @@global.read_only;

@@global.read_only

1

set global read_only=0;

BEGIN;

BEGIN;

set global read_only=1;

ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction

ROLLBACK;

set global read_only=1;

select @@global.read_only;

@@global.read_only

1

ROLLBACK;

set global read_only=0;

flush tables with read lock;

set global read_only=1;

unlock tables;

set global read_only=0;

flush tables with read lock;

set global read_only=1;

select @@global.read_only;

@@global.read_only

1

unlock tables;

drop temporary table ttt;

ERROR 42S02: Unknown table 'ttt'

drop temporary table if exists ttt;

Warnings:

Note	1051	Unknown table 'ttt'

set global read_only=0;

drop table t1,t2;

drop user test@localhost;
 
set global read_only=0;

mysql-test/r/read_only_innodb.result

0 → 100644
+18 −0
Original line number Diff line number Diff line 
DROP TABLE IF EXISTS table_11733 ;

grant CREATE, SELECT, DROP on *.* to test@localhost;

set global read_only=0;

create table table_11733 (a int) engine=InnoDb;

BEGIN;

insert into table_11733 values(11733);

set global read_only=1;

select @@global.read_only;

@@global.read_only

1

select * from table_11733 ;

a

11733

COMMIT;

ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement

set global read_only=0;

drop table table_11733 ;

drop user test@localhost;