Commit 47e822ec authored by unknown's avatar unknown
Browse files

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 

into mysql.com:/Users/kent/mysql/bk/mysql-5.0


sql/handler.h:
  Auto merged
parents 0c5470aa 05df35e3

mysql-test/r/federated.result

+26 −0
Original line number Diff line number Diff line
@@ -1457,6 +1457,32 @@ federated.t1 repair status OK 
REPAIR TABLE federated.t1 USE_FRM;

Table	Op	Msg_type	Msg_text

federated.t1	repair	status	OK

DROP TABLE IF EXISTS federated.normal_table;

CREATE TABLE federated.normal_table (

`id` int(4) NOT NULL,

`name` varchar(10) default NULL

) DEFAULT CHARSET=latin1;

DROP TABLE IF EXISTS federated.alter_me;

CREATE TABLE federated.alter_me (

`id` int(4) NOT NULL,

`name` varchar(10) default NULL,

PRIMARY KEY (`id`)

) ENGINE="FEDERATED" DEFAULT CHARSET=latin1

CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT/federated/normal_table';

INSERT INTO federated.alter_me (id, name) VALUES (1, 'Monty');

INSERT INTO federated.alter_me (id, name) VALUES (2, 'David');

SELECT * FROM federated.alter_me;

id	name

1	Monty

2	David

ALTER TABLE federated.alter_me MODIFY COLUMN id int(16) NOT NULL;

ERROR HY000: Table storage engine for 'alter_me' doesn't have this option

SELECT * FROM federated.alter_me;

id	name

1	Monty

2	David

DROP TABLE federated.alter_me;

DROP TABLE federated.normal_table;

DROP TABLE IF EXISTS federated.t1;

DROP DATABASE IF EXISTS federated;

DROP TABLE IF EXISTS federated.t1;

mysql-test/t/federated.test

+43 −1
Original line number Diff line number Diff line
@@ -1137,11 +1137,53 @@ ORDER BY federated.t1.country_id; 


DROP TABLE federated.countries;



# optimize and repair tests

#BEGIN optimize and repair tests

OPTIMIZE TABLE federated.t1;

REPAIR TABLE federated.t1;

REPAIR TABLE federated.t1 QUICK;

REPAIR TABLE federated.t1 EXTENDED;

REPAIR TABLE federated.t1 USE_FRM;

#END optimize and repair tests





# BEGIN ALTER TEST

connection slave;

--disable_warnings

DROP TABLE IF EXISTS federated.normal_table;

--enable_warnings



CREATE TABLE federated.normal_table (

  `id` int(4) NOT NULL,

  `name` varchar(10) default NULL

  ) DEFAULT CHARSET=latin1;



connection master;

--disable_warnings

DROP TABLE IF EXISTS federated.alter_me;

--enable_warnings



--replace_result $SLAVE_MYPORT SLAVE_PORT

eval CREATE TABLE federated.alter_me (

  `id` int(4) NOT NULL,

  `name` varchar(10) default NULL,

  PRIMARY KEY (`id`)

  ) ENGINE="FEDERATED" DEFAULT CHARSET=latin1

  CONNECTION='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/normal_table';



INSERT INTO federated.alter_me (id, name) VALUES (1, 'Monty');

INSERT INTO federated.alter_me (id, name) VALUES (2, 'David');



SELECT * FROM federated.alter_me;



--error 1031

ALTER TABLE federated.alter_me MODIFY COLUMN id int(16) NOT NULL;



SELECT * FROM federated.alter_me;



DROP TABLE federated.alter_me;

connection slave;

DROP TABLE federated.normal_table;

# END ALTER TEST





source include/federated_cleanup.inc;

sql/examples/ha_example.cc

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ handlerton example_hton= { 
  NULL,    /* create_cursor_read_view */

  NULL,    /* set_cursor_read_view */

  NULL,    /* close_cursor_read_view */

  HTON_NO_FLAGS

  HTON_CAN_RECREATE

};



/* Variables for example share methods */

sql/examples/ha_tina.cc

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ handlerton tina_hton= { 
  NULL,    /* create_cursor_read_view */

  NULL,    /* set_cursor_read_view */

  NULL,    /* close_cursor_read_view */

  HTON_NO_FLAGS

  HTON_CAN_RECREATE

};



/*****************************************************************************

sql/ha_blackhole.cc

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ handlerton blackhole_hton= { 
  NULL,    /* create_cursor_read_view */

  NULL,    /* set_cursor_read_view */

  NULL,    /* close_cursor_read_view */

  HTON_NO_FLAGS

  HTON_CAN_RECREATE

};



/*****************************************************************************