Commit 65492347 authored by unknown's avatar unknown
Browse files

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

into krsna.patg.net:/home/patg/mysql-5.0


sql/handler.cc:
  Auto merged
parents bf46e486 39e14ac1

include/mysql.h

+2 −0
Original line number Diff line number Diff line
@@ -499,6 +499,8 @@ MYSQL_FIELD_OFFSET STDCALL mysql_field_seek(MYSQL_RES *result, 
					   MYSQL_FIELD_OFFSET offset);

MYSQL_ROW	STDCALL mysql_fetch_row(MYSQL_RES *result);

unsigned long * STDCALL mysql_fetch_lengths(MYSQL_RES *result);

void            STDCALL cli_fetch_lengths(unsigned long *to, MYSQL_ROW column,

                                          unsigned int field_count);

MYSQL_FIELD *	STDCALL mysql_fetch_field(MYSQL_RES *result);

MYSQL_RES *     STDCALL mysql_list_fields(MYSQL *mysql, const char *table,

					  const char *wild);

mysql-test/r/federated.result

+19 −7
Original line number Diff line number Diff line
@@ -644,14 +644,19 @@ select * from federated.t1 where fileguts = 'jimbob'; 
id	code	fileguts	creation_date	entered_time

3	DEUEUEUEUEUEUEUEUEU	jimbob	2004-04-04 04:04:04	2004-04-04 04:04:04

drop table if exists federated.t1;

CREATE TABLE federated.t1 ( `id` int(20) NOT NULL auto_increment, `country_id` int(20) NOT NULL DEFAULT 0, `name` varchar(32), `other` varchar(20), PRIMARY KEY  (`id`), key (country_id));

CREATE TABLE federated.t1 (a BLOB);

drop table if exists federated.t1;

CREATE TABLE federated.t1 ( `id` int(20) NOT NULL auto_increment, `country_id` int(20) NOT NULL DEFAULT 0, `name` varchar(32), `other` varchar(20), PRIMARY KEY  (`id`), key (country_id) ) ENGINE="FEDERATED" DEFAULT CHARSET=latin1 COMMENT='mysql://root@127.0.0.1:9308/federated/t1';

insert into federated.t1 (name, country_id, other) values ('Kumar', 1, 11111);

insert into federated.t1 (name, country_id, other) values ('Lenz', 2, 22222);

insert into federated.t1 (name, country_id, other) values ('Marizio', 3, 33333);

insert into federated.t1 (name, country_id, other) values ('Monty', 4, 33333);

insert into federated.t1 (name, country_id, other) values ('Sanja', 5, 33333);

CREATE TABLE federated.t1 (a BLOB) ENGINE="FEDERATED" COMMENT='mysql://root@127.0.0.1:9308/federated/t1';

INSERT INTO federated.t1 VALUES (0x00);

INSERT INTO federated.t1 VALUES (0x0001);

INSERT INTO federated.t1 VALUES (0x0100);

SELECT HEX(a) FROM federated.t1;

HEX(a)

00

0001

0100

drop table if exists federated.t1;

CREATE TABLE federated.t1 ( `id` int(20) NOT NULL auto_increment, `country_id` int(20) NOT NULL DEFAULT 0, `name` varchar(32), `other` varchar(20), PRIMARY KEY  (`id`), key (country_id));

drop table if exists federated.countries;

Warnings:

Note	1051	Unknown table 'countries'
@@ -661,6 +666,13 @@ insert into federated.countries (country) values ('Germany'); 
insert into federated.countries (country) values ('Italy');

insert into federated.countries (country) values ('Finland');

insert into federated.countries (country) values ('Ukraine');

drop table if exists federated.t1;

CREATE TABLE federated.t1 ( `id` int(20) NOT NULL auto_increment, `country_id` int(20) NOT NULL DEFAULT 0, `name` varchar(32), `other` varchar(20), PRIMARY KEY  (`id`), key (country_id) ) ENGINE="FEDERATED" DEFAULT CHARSET=latin1 COMMENT='mysql://root@127.0.0.1:9308/federated/t1';

insert into federated.t1 (name, country_id, other) values ('Kumar', 1, 11111);

insert into federated.t1 (name, country_id, other) values ('Lenz', 2, 22222);

insert into federated.t1 (name, country_id, other) values ('Marizio', 3, 33333);

insert into federated.t1 (name, country_id, other) values ('Monty', 4, 33333);

insert into federated.t1 (name, country_id, other) values ('Sanja', 5, 33333);

select federated.t1.*, federated.countries.country from federated.t1 left join federated.countries on federated.t1.country_id = federated.countries.id;

id	country_id	name	other	country

1	1	Kumar	11111	India

mysql-test/t/federated.test

+23 −10
Original line number Diff line number Diff line
@@ -522,8 +522,22 @@ insert into federated.t1 (code, fileguts, creation_date) values ('ASDFWERQWETWET 
insert into federated.t1 (code, fileguts, creation_date) values ('DEUEUEUEUEUEUEUEUEU', '*()w*09*$()*#)(*09*^90*d)(*s()d8g)(s*ned)(*)(s*d)(*hn(d*)(*sbn)D((#$*(#*%%&#&^$#&#&#&#&^&#*&*#$*&^*(&#(&Q*&&(*!&!(*&*(#&*(%&#<S-F8>*<S-F8><S-F8><S-F8>#<S-F8>#<S-F8>#<S-F8>[[', '2004-04-04 04:04:04');

insert into federated.t1 (code, fileguts, creation_date) values ('DEUEUEUEUEUEUEUEUEU', 'jimbob', '2004-04-04 04:04:04');

select * from federated.t1;

select * from federated.t1 where fileguts = 'jimbob';

# test blob indexes

select * from federated.t1 where fileguts = 'jimbob';



# test blob with binary

connection slave;

drop table if exists federated.t1;

CREATE TABLE federated.t1 (a BLOB);



connection master;

drop table if exists federated.t1;

CREATE TABLE federated.t1 (a BLOB) ENGINE="FEDERATED" COMMENT='mysql://root@127.0.0.1:9308/federated/t1';

INSERT INTO federated.t1 VALUES (0x00);

INSERT INTO federated.t1 VALUES (0x0001);

INSERT INTO federated.t1 VALUES (0x0100);

SELECT HEX(a) FROM federated.t1;





# TODO

#
@@ -559,15 +573,6 @@ drop table if exists federated.t1; 
CREATE TABLE federated.t1 ( `id` int(20) NOT NULL auto_increment, `country_id` int(20) NOT NULL DEFAULT 0, `name` varchar(32), `other` varchar(20), PRIMARY KEY  (`id`), key (country_id));



connection master;

drop table if exists federated.t1;

CREATE TABLE federated.t1 ( `id` int(20) NOT NULL auto_increment, `country_id` int(20) NOT NULL DEFAULT 0, `name` varchar(32), `other` varchar(20), PRIMARY KEY  (`id`), key (country_id) ) ENGINE="FEDERATED" DEFAULT CHARSET=latin1 COMMENT='mysql://root@127.0.0.1:9308/federated/t1';

insert into federated.t1 (name, country_id, other) values ('Kumar', 1, 11111);

insert into federated.t1 (name, country_id, other) values ('Lenz', 2, 22222);

insert into federated.t1 (name, country_id, other) values ('Marizio', 3, 33333);

insert into federated.t1 (name, country_id, other) values ('Monty', 4, 33333);

insert into federated.t1 (name, country_id, other) values ('Sanja', 5, 33333);





drop table if exists federated.countries;

CREATE TABLE federated.countries ( `id` int(20) NOT NULL auto_increment, `country` varchar(32), primary key (id));

insert into federated.countries (country) values ('India');
@@ -576,6 +581,14 @@ insert into federated.countries (country) values ('Italy'); 
insert into federated.countries (country) values ('Finland');

insert into federated.countries (country) values ('Ukraine');



drop table if exists federated.t1;

CREATE TABLE federated.t1 ( `id` int(20) NOT NULL auto_increment, `country_id` int(20) NOT NULL DEFAULT 0, `name` varchar(32), `other` varchar(20), PRIMARY KEY  (`id`), key (country_id) ) ENGINE="FEDERATED" DEFAULT CHARSET=latin1 COMMENT='mysql://root@127.0.0.1:9308/federated/t1';

insert into federated.t1 (name, country_id, other) values ('Kumar', 1, 11111);

insert into federated.t1 (name, country_id, other) values ('Lenz', 2, 22222);

insert into federated.t1 (name, country_id, other) values ('Marizio', 3, 33333);

insert into federated.t1 (name, country_id, other) values ('Monty', 4, 33333);

insert into federated.t1 (name, country_id, other) values ('Sanja', 5, 33333);



select federated.t1.*, federated.countries.country from federated.t1 left join federated.countries on federated.t1.country_id = federated.countries.id;



drop table federated.countries;

sql-common/client.c

+1 −1
Original line number Diff line number Diff line
@@ -1121,7 +1121,7 @@ void mysql_read_default_options(struct st_mysql_options *options, 
  else the lengths are calculated from the offset between pointers.

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



static void cli_fetch_lengths(ulong *to, MYSQL_ROW column,

void cli_fetch_lengths(ulong *to, MYSQL_ROW column,

			      unsigned int field_count)

{ 

  ulong *prev_length;

sql/ha_federated.cc

+442 −364

File changed.

Preview size limit exceeded, changes collapsed.