Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26909/my50-bug26909
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
This commit is contained in:
commit
99af63e53d
@ -1843,6 +1843,43 @@ C3A4C3B6C3BCC39F
|
|||||||
D18DD184D184D0B5D0BAD182D0B8D0B2D0BDD183D18E
|
D18DD184D184D0B5D0BAD182D0B8D0B2D0BDD183D18E
|
||||||
drop table federated.t1;
|
drop table federated.t1;
|
||||||
drop table federated.t1;
|
drop table federated.t1;
|
||||||
|
CREATE TABLE federated.t1 (
|
||||||
|
categoryId int(11) NOT NULL AUTO_INCREMENT,
|
||||||
|
domainId varchar(745) NOT NULL DEFAULT '',
|
||||||
|
categoryName varchar(255) NOT NULL DEFAULT '',
|
||||||
|
PRIMARY KEY (categoryId),
|
||||||
|
UNIQUE KEY idx_unique_category_categoryName (domainId, categoryName),
|
||||||
|
KEY idx_category_domainId (domainId)
|
||||||
|
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
|
||||||
|
CREATE TABLE federated.t1 (
|
||||||
|
categoryId int(11) NOT NULL AUTO_INCREMENT,
|
||||||
|
domainId varchar(745) NOT NULL DEFAULT '',
|
||||||
|
categoryName varchar(255) NOT NULL DEFAULT '',
|
||||||
|
PRIMARY KEY (categoryId),
|
||||||
|
UNIQUE KEY idx_unique_category_categoryName (domainId, categoryName),
|
||||||
|
KEY idx_category_domainId (domainId)
|
||||||
|
) ENGINE=FEDERATED DEFAULT CHARSET=latin1
|
||||||
|
CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT/federated/t1';
|
||||||
|
insert into federated.t1 (domainId, categoryName) values ( '1231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231 300', '1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345 250');
|
||||||
|
insert into federated.t1 (domainId, categoryName) values ( '12312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312 301', '12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456 250');
|
||||||
|
insert into federated.t1 (domainId, categoryName) values ('a', 'b');
|
||||||
|
select categoryId from federated.t1 order by domainId, categoryName;
|
||||||
|
categoryId
|
||||||
|
1
|
||||||
|
2
|
||||||
|
3
|
||||||
|
select categoryId from federated.t1 where domainId='a' and categoryName='b' order by categoryId;
|
||||||
|
categoryId
|
||||||
|
3
|
||||||
|
select categoryId from federated.t1 where domainId='a' and categoryName='b' order by categoryId;
|
||||||
|
categoryId
|
||||||
|
3
|
||||||
|
select categoryId from federated.t1 where domainId<>'a' and categoryName<>'b' order by categoryId;
|
||||||
|
categoryId
|
||||||
|
1
|
||||||
|
2
|
||||||
|
drop table federated.t1;
|
||||||
|
drop table federated.t1;
|
||||||
DROP TABLE IF EXISTS federated.t1;
|
DROP TABLE IF EXISTS federated.t1;
|
||||||
DROP DATABASE IF EXISTS federated;
|
DROP DATABASE IF EXISTS federated;
|
||||||
DROP TABLE IF EXISTS federated.t1;
|
DROP TABLE IF EXISTS federated.t1;
|
||||||
|
@ -1575,5 +1575,45 @@ drop table federated.t1;
|
|||||||
connection slave;
|
connection slave;
|
||||||
drop table federated.t1;
|
drop table federated.t1;
|
||||||
|
|
||||||
|
#
|
||||||
|
# Bug#26909: Specified key was too long; max key length is 255 bytes
|
||||||
|
# when creating a table
|
||||||
|
#
|
||||||
|
connection slave;
|
||||||
|
CREATE TABLE federated.t1 (
|
||||||
|
categoryId int(11) NOT NULL AUTO_INCREMENT,
|
||||||
|
domainId varchar(745) NOT NULL DEFAULT '',
|
||||||
|
categoryName varchar(255) NOT NULL DEFAULT '',
|
||||||
|
PRIMARY KEY (categoryId),
|
||||||
|
UNIQUE KEY idx_unique_category_categoryName (domainId, categoryName),
|
||||||
|
KEY idx_category_domainId (domainId)
|
||||||
|
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
|
||||||
|
|
||||||
|
connection master;
|
||||||
|
--replace_result $SLAVE_MYPORT SLAVE_PORT
|
||||||
|
eval CREATE TABLE federated.t1 (
|
||||||
|
categoryId int(11) NOT NULL AUTO_INCREMENT,
|
||||||
|
domainId varchar(745) NOT NULL DEFAULT '',
|
||||||
|
categoryName varchar(255) NOT NULL DEFAULT '',
|
||||||
|
PRIMARY KEY (categoryId),
|
||||||
|
UNIQUE KEY idx_unique_category_categoryName (domainId, categoryName),
|
||||||
|
KEY idx_category_domainId (domainId)
|
||||||
|
) ENGINE=FEDERATED DEFAULT CHARSET=latin1
|
||||||
|
CONNECTION='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t1';
|
||||||
|
|
||||||
|
|
||||||
|
insert into federated.t1 (domainId, categoryName) values ( '1231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231 300', '1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345 250');
|
||||||
|
insert into federated.t1 (domainId, categoryName) values ( '12312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312 301', '12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456 250');
|
||||||
|
insert into federated.t1 (domainId, categoryName) values ('a', 'b');
|
||||||
|
|
||||||
|
select categoryId from federated.t1 order by domainId, categoryName;
|
||||||
|
select categoryId from federated.t1 where domainId='a' and categoryName='b' order by categoryId;
|
||||||
|
select categoryId from federated.t1 where domainId='a' and categoryName='b' order by categoryId;
|
||||||
|
select categoryId from federated.t1 where domainId<>'a' and categoryName<>'b' order by categoryId;
|
||||||
|
|
||||||
|
drop table federated.t1;
|
||||||
|
|
||||||
|
connection slave;
|
||||||
|
drop table federated.t1;
|
||||||
|
|
||||||
source include/federated_cleanup.inc;
|
source include/federated_cleanup.inc;
|
||||||
|
@ -37,6 +37,7 @@
|
|||||||
#define FEDERATED_QUERY_BUFFER_SIZE STRING_BUFFER_USUAL_SIZE * 5
|
#define FEDERATED_QUERY_BUFFER_SIZE STRING_BUFFER_USUAL_SIZE * 5
|
||||||
#define FEDERATED_RECORDS_IN_RANGE 2
|
#define FEDERATED_RECORDS_IN_RANGE 2
|
||||||
|
|
||||||
|
#define FEDERATED_MAX_KEY_LENGTH 3500 // Same as innodb
|
||||||
#define FEDERATED_INFO " SHOW TABLE STATUS LIKE "
|
#define FEDERATED_INFO " SHOW TABLE STATUS LIKE "
|
||||||
#define FEDERATED_INFO_LEN sizeof(FEDERATED_INFO)
|
#define FEDERATED_INFO_LEN sizeof(FEDERATED_INFO)
|
||||||
#define FEDERATED_SELECT "SELECT "
|
#define FEDERATED_SELECT "SELECT "
|
||||||
@ -217,7 +218,8 @@ public:
|
|||||||
uint max_supported_record_length() const { return HA_MAX_REC_LENGTH; }
|
uint max_supported_record_length() const { return HA_MAX_REC_LENGTH; }
|
||||||
uint max_supported_keys() const { return MAX_KEY; }
|
uint max_supported_keys() const { return MAX_KEY; }
|
||||||
uint max_supported_key_parts() const { return MAX_REF_PARTS; }
|
uint max_supported_key_parts() const { return MAX_REF_PARTS; }
|
||||||
uint max_supported_key_length() const { return MAX_KEY_LENGTH; }
|
uint max_supported_key_length() const { return FEDERATED_MAX_KEY_LENGTH; }
|
||||||
|
uint max_supported_key_part_length() const { return FEDERATED_MAX_KEY_LENGTH; }
|
||||||
/*
|
/*
|
||||||
Called in test_quick_select to determine if indexes should be used.
|
Called in test_quick_select to determine if indexes should be used.
|
||||||
Normally, we need to know number of blocks . For federated we need to
|
Normally, we need to know number of blocks . For federated we need to
|
||||||
|
Loading…
x
Reference in New Issue
Block a user