Commit d7577ecb authored by unknown's avatar unknown
Browse files

Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base 

into  weblab.(none):/home/marcsql/TREE/mysql-5.1-merge


mysql-test/r/sp.result:
  Auto merged
server-tools/instance-manager/commands.cc:
  Auto merged
server-tools/instance-manager/commands.h:
  Auto merged
server-tools/instance-manager/guardian.cc:
  Auto merged
server-tools/instance-manager/guardian.h:
  Auto merged
server-tools/instance-manager/instance.cc:
  Auto merged
server-tools/instance-manager/instance.h:
  Auto merged
server-tools/instance-manager/instance_map.cc:
  Auto merged
server-tools/instance-manager/instance_map.h:
  Auto merged
server-tools/instance-manager/instance_options.h:
  Auto merged
server-tools/instance-manager/listener.cc:
  Auto merged
server-tools/instance-manager/manager.cc:
  Auto merged
server-tools/instance-manager/manager.h:
  Auto merged
server-tools/instance-manager/user_map.cc:
  Auto merged
sql/event_data_objects.cc:
  Auto merged
sql/event_queue.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/lock.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/csv/ha_tina.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
parents f20cb8d0 552d4ced

mysql-test/r/csv.result

+8 −0
Original line number Diff line number Diff line
@@ -5223,3 +5223,11 @@ check table bug22080_3; 
Table	Op	Msg_type	Msg_text

test.bug22080_3	check	error	Corrupt

drop tables bug22080_1,bug22080_2,bug22080_3;

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;

mysql-test/r/rpl_read_only.result

0 → 100644
+113 −0
Original line number Diff line number Diff line 
stop slave;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

reset master;

reset slave;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

start slave;

create table t1(a int) engine=InnoDB;

create table t2(a int) engine=MyISAM;

insert into t1 values(1001);

insert into t2 values(2001);

set global read_only=1;

select @@read_only;

@@read_only

1

select * from t1;

a

1001

select * from t2;

a

2001

select @@read_only;

@@read_only

0

select * from t1;

a

1001

select * from t2;

a

2001

set global read_only=0;

BEGIN;

insert into t1 values(1002);

insert into t2 values(2002);

BEGIN;

insert into t1 values(1003);

insert into t2 values(2003);

set global read_only=1;

COMMIT;

COMMIT;

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

set global read_only=0;

insert into t1 values(1004);

insert into t2 values(2004);

select * from t1;

a

1001

1002

1004

select * from t2;

a

2001

2002

2003

2004

select * from t1;

a

1001

1002

1004

select * from t2;

a

2001

2002

2003

2004

set global read_only=1;

select @@read_only;

@@read_only

1

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` int(11) DEFAULT NULL

) ENGINE=InnoDB DEFAULT CHARSET=latin1

show create table t2;

Table	Create Table

t2	CREATE TABLE `t2` (

  `a` int(11) DEFAULT NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

insert into t1 values(1005);

insert into t2 values(2005);

select * from t1;

a

1001

1002

1004

1005

select * from t2;

a

2001

2002

2003

2004

2005

select * from t1;

a

1001

1002

1004

1005

select * from t2;

a

2001

2002

2003

2004

2005

insert into t1 values(1006);

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

insert into t2 values(2006);

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

drop table t1;

drop table t2;