Commit 2059908b authored by unknown's avatar unknown
Browse files

After merge fixes 


BitKeeper/deleted/.del-outfile2.result~fb702ee2518d8e6d:
  Delete: mysql-test/r/outfile2.result
libmysql/libmysql.c:
  Fix indentation for new function mysql_set_character_set()
mysql-test/r/alter_table.result:
  Fix test to be in same order as in 4.0
mysql-test/r/innodb.result:
  After merge fix
mysql-test/r/insert_update.result:
  Add extra test for insert into ... on duplicate key upate
mysql-test/r/outfile.result:
  After merge fix
mysql-test/t/alter_table.test:
  Fix test to be in same order as in 4.0
mysql-test/t/insert_update.test:
  Add extra test for insert into ... on duplicate key upate
mysql-test/t/outfile.test:
  After merge fix
sql/item_func.cc:
  After merge fix
sql/sql_table.cc:
  After merge fix
parent 037b0a7b

libmysql/libmysql.c

+17 −14
Original line number Diff line number Diff line
@@ -1509,6 +1509,7 @@ const char * STDCALL mysql_character_set_name(MYSQL *mysql) 
  return mysql->charset->csname;

}





int STDCALL mysql_set_character_set(MYSQL *mysql, char *cs_name)

{

  struct charset_info_st *cs;
@@ -1522,24 +1523,26 @@ int STDCALL mysql_set_character_set(MYSQL *mysql, char *cs_name) 
    char buff[MY_CS_NAME_SIZE + 10];

    charsets_dir= save_csdir;

    sprintf(buff, "SET NAMES %s", cs_name);

    if (!mysql_query(mysql, buff)) {

    if (!mysql_query(mysql, buff))

    {

      mysql->charset= cs;

    }

  } else {

  }

  else

  {

    char cs_dir_name[FN_REFLEN];

    get_charsets_dir(cs_dir_name);

    mysql->net.last_errno= CR_CANT_READ_CHARSET;

    strmov(mysql->net.sqlstate, unknown_sqlstate);

    my_snprintf(mysql->net.last_error, sizeof(mysql->net.last_error) - 1,

                ER(mysql->net.last_errno),

                cs_name,

                cs_dir_name);

		ER(mysql->net.last_errno), cs_name, cs_dir_name);



  }

  charsets_dir= save_csdir;

  return mysql->net.last_errno;

}





uint STDCALL mysql_thread_safe(void)

{

#ifdef THREAD

mysql-test/r/alter_table.result

+114 −111
Original line number Diff line number Diff line
@@ -303,6 +303,120 @@ ALTER TABLE t1 DISABLE KEYS; 
INSERT DELAYED INTO t1 VALUES(1),(2),(3);

ALTER TABLE t1 ENABLE KEYS;

drop table t1;

CREATE TABLE t1 (

Host varchar(16) binary NOT NULL default '',

User varchar(16) binary NOT NULL default '',

PRIMARY KEY  (Host,User)

) ENGINE=MyISAM;

ALTER TABLE t1 DISABLE KEYS;

LOCK TABLES t1 WRITE;

INSERT INTO t1 VALUES ('localhost','root'),('localhost',''),('games','monty');

SHOW INDEX FROM t1;

Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment

t1	0	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE	

t1	0	PRIMARY	2	User	A	3	NULL	NULL		BTREE	

ALTER TABLE t1 ENABLE KEYS;

UNLOCK TABLES;

CHECK TABLES t1;

Table	Op	Msg_type	Msg_text

test.t1	check	status	OK

DROP TABLE t1;

CREATE TABLE t1 (

Host varchar(16) binary NOT NULL default '',

User varchar(16) binary NOT NULL default '',

PRIMARY KEY  (Host,User),

KEY  (Host)

) ENGINE=MyISAM;

ALTER TABLE t1 DISABLE KEYS;

SHOW INDEX FROM t1;

Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment

t1	0	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE	

t1	0	PRIMARY	2	User	A	0	NULL	NULL		BTREE	

t1	1	Host	1	Host	A	NULL	NULL	NULL		BTREE	disabled

LOCK TABLES t1 WRITE;

INSERT INTO t1 VALUES ('localhost','root'),('localhost','');

SHOW INDEX FROM t1;

Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment

t1	0	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE	

t1	0	PRIMARY	2	User	A	2	NULL	NULL		BTREE	

t1	1	Host	1	Host	A	NULL	NULL	NULL		BTREE	disabled

ALTER TABLE t1 ENABLE KEYS;

SHOW INDEX FROM t1;

Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment

t1	0	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE	

t1	0	PRIMARY	2	User	A	2	NULL	NULL		BTREE	

t1	1	Host	1	Host	A	1	NULL	NULL		BTREE	

UNLOCK TABLES;

CHECK TABLES t1;

Table	Op	Msg_type	Msg_text

test.t1	check	status	OK

LOCK TABLES t1 WRITE;

ALTER TABLE t1 RENAME t2;

UNLOCK TABLES;

select * from t2;

Host	User

localhost	

localhost	root

DROP TABLE t2;

CREATE TABLE t1 (

Host varchar(16) binary NOT NULL default '',

User varchar(16) binary NOT NULL default '',

PRIMARY KEY  (Host,User),

KEY  (Host)

) ENGINE=MyISAM;

LOCK TABLES t1 WRITE;

ALTER TABLE t1 DISABLE KEYS;

SHOW INDEX FROM t1;

Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment

t1	0	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE	

t1	0	PRIMARY	2	User	A	0	NULL	NULL		BTREE	

t1	1	Host	1	Host	A	NULL	NULL	NULL		BTREE	disabled

DROP TABLE t1;

create table t1 (a int);

alter table t1 rename to `t1\\`;

ERROR 42000: Incorrect table name 't1\\'

rename table t1 to `t1\\`;

ERROR 42000: Incorrect table name 't1\\'

drop table t1;

drop table if exists t1, t2;

Warnings:

Note	1051	Unknown table 't1'

Note	1051	Unknown table 't2'

create table t1 ( a varchar(10) not null primary key ) engine=myisam;

create table t2 ( a varchar(10) not null primary key ) engine=merge union=(t1);

flush tables;

alter table t1 modify a varchar(10);

show create table t2;

Table	Create Table

t2	CREATE TABLE `t2` (

  `a` varchar(10) NOT NULL default '',

  PRIMARY KEY  (`a`)

) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 UNION=(`t1`)

flush tables;

alter table t1 modify a varchar(10) not null;

show create table t2;

Table	Create Table

t2	CREATE TABLE `t2` (

  `a` varchar(10) NOT NULL default '',

  PRIMARY KEY  (`a`)

) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 UNION=(`t1`)

drop table if exists t1, t2;

create table t1 (a int, b int, c int, d int, e int, f int, g int, h int,i int, primary key (a,b,c,d,e,f,g,i,h)) engine=MyISAM;

insert into t1 (a) values(1);

show table status like 't1';

Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment

t1	MyISAM	9	Fixed	1	37	X	X	X	X	X	X	X	X	latin1_swedish_ci	NULL		

alter table t1 modify a int;

show table status like 't1';

Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment

t1	MyISAM	9	Fixed	1	37	X	X	X	X	X	X	X	X	latin1_swedish_ci	NULL		

drop table t1;

create table t1 (a int not null, b int not null, c int not null, d int not null, e int not null, f int not null, g int not null, h int not null,i int not null, primary key (a,b,c,d,e,f,g,i,h)) engine=MyISAM;

insert into t1 (a) values(1);

show table status like 't1';

Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment

t1	MyISAM	9	Fixed	1	37	X	X	X	X	X	X	X	X	latin1_swedish_ci	NULL		

drop table t1;

set names koi8r;

create table t1 (a char(10) character set koi8r);

insert into t1 values ('');
@@ -382,75 +496,6 @@ t1 CREATE TABLE `t1` ( 
  `mytext` longtext character set latin1 collate latin1_general_cs

) ENGINE=MyISAM DEFAULT CHARSET=latin2

drop table t1;

CREATE TABLE t1 (

Host varchar(16) binary NOT NULL default '',

User varchar(16) binary NOT NULL default '',

PRIMARY KEY  (Host,User)

) ENGINE=MyISAM;

ALTER TABLE t1 DISABLE KEYS;

LOCK TABLES t1 WRITE;

INSERT INTO t1 VALUES ('localhost','root'),('localhost',''),('games','monty');

SHOW INDEX FROM t1;

Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment

t1	0	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE	

t1	0	PRIMARY	2	User	A	3	NULL	NULL		BTREE	

ALTER TABLE t1 ENABLE KEYS;

UNLOCK TABLES;

CHECK TABLES t1;

Table	Op	Msg_type	Msg_text

test.t1	check	status	OK

DROP TABLE t1;

CREATE TABLE t1 (

Host varchar(16) binary NOT NULL default '',

User varchar(16) binary NOT NULL default '',

PRIMARY KEY  (Host,User),

KEY  (Host)

) ENGINE=MyISAM;

ALTER TABLE t1 DISABLE KEYS;

SHOW INDEX FROM t1;

Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment

t1	0	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE	

t1	0	PRIMARY	2	User	A	0	NULL	NULL		BTREE	

t1	1	Host	1	Host	A	NULL	NULL	NULL		BTREE	disabled

LOCK TABLES t1 WRITE;

INSERT INTO t1 VALUES ('localhost','root'),('localhost','');

SHOW INDEX FROM t1;

Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment

t1	0	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE	

t1	0	PRIMARY	2	User	A	2	NULL	NULL		BTREE	

t1	1	Host	1	Host	A	NULL	NULL	NULL		BTREE	disabled

ALTER TABLE t1 ENABLE KEYS;

SHOW INDEX FROM t1;

Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment

t1	0	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE	

t1	0	PRIMARY	2	User	A	2	NULL	NULL		BTREE	

t1	1	Host	1	Host	A	1	NULL	NULL		BTREE	

UNLOCK TABLES;

CHECK TABLES t1;

Table	Op	Msg_type	Msg_text

test.t1	check	status	OK

LOCK TABLES t1 WRITE;

ALTER TABLE t1 RENAME t2;

UNLOCK TABLES;

select * from t2;

Host	User

localhost	

localhost	root

DROP TABLE t2;

CREATE TABLE t1 (

Host varchar(16) binary NOT NULL default '',

User varchar(16) binary NOT NULL default '',

PRIMARY KEY  (Host,User),

KEY  (Host)

) ENGINE=MyISAM;

LOCK TABLES t1 WRITE;

ALTER TABLE t1 DISABLE KEYS;

SHOW INDEX FROM t1;

Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment

t1	0	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE	

t1	0	PRIMARY	2	User	A	0	NULL	NULL		BTREE	

t1	1	Host	1	Host	A	NULL	NULL	NULL		BTREE	disabled

DROP TABLE t1;

CREATE TABLE t1 (a int PRIMARY KEY, b INT UNIQUE);

ALTER TABLE t1 DROP PRIMARY KEY;

SHOW CREATE TABLE t1;
@@ -469,12 +514,6 @@ alter table t1 drop key no_such_key; 
ERROR 42000: Can't DROP 'no_such_key'; check that column/key exists

alter table t1 drop key a;

drop table t1;

create table t1 (a int);

alter table t1 rename to `t1\\`;

ERROR 42000: Incorrect table name 't1\\'

rename table t1 to `t1\\`;

ERROR 42000: Incorrect table name 't1\\'

drop table t1;

create table t1 (a text) character set koi8r;

insert into t1 values (_koi8r'');

select hex(a) from t1;
@@ -489,39 +528,3 @@ create table t1 ( a timestamp ); 
alter table t1 add unique ( a(1) );

ERROR HY000: Incorrect sub part key; the used key part isn't a string, the used length is longer than the key part, or the storage engine doesn't support unique sub keys

drop table t1;
 
drop table if exists t1, t2;

create table t1 ( a varchar(10) not null primary key ) engine=myisam;

create table t2 ( a varchar(10) not null primary key ) engine=merge union=(t1);

flush tables;

alter table t1 modify a varchar(10);

show create table t2;

Table	Create Table

t2	CREATE TABLE `t2` (

  `a` varchar(10) NOT NULL default '',

  PRIMARY KEY  (`a`)

) TYPE=MRG_MyISAM UNION=(t1)

flush tables;

alter table t1 modify a varchar(10) not null;

show create table t2;

Table	Create Table

t2	CREATE TABLE `t2` (

  `a` varchar(10) NOT NULL default '',

  PRIMARY KEY  (`a`)

) TYPE=MRG_MyISAM UNION=(t1)

drop table if exists t1, t2;

create table t1 (a int, b int, c int, d int, e int, f int, g int, h int,i int, primary key (a,b,c,d,e,f,g,i,h)) engine=MyISAM;

insert into t1 (a) values(1);

show table status like 't1';

Name	Type	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Create_options	Comment

t1	MyISAM	Fixed	1	37	37	X	X	X	X	X	X	X	X	

alter table t1 modify a int;

show table status like 't1';

Name	Type	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Create_options	Comment

t1	MyISAM	Fixed	1	37	37	X	X	X	X	X	X	X	X	

drop table t1;

create table t1 (a int not null, b int not null, c int not null, d int not null, e int not null, f int not null, g int not null, h int not null,i int not null, primary key (a,b,c,d,e,f,g,i,h)) engine=MyISAM;

insert into t1 (a) values(1);

show table status like 't1';

Name	Type	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Create_options	Comment

t1	MyISAM	Fixed	1	37	37	X	X	X	X	X	X	X	X	

drop table t1;

mysql-test/r/innodb.result

+1 −1
Original line number Diff line number Diff line
@@ -1645,5 +1645,5 @@ concat(a, b) 
drop table t1;

CREATE TABLE t1 ( a char(10) ) ENGINE=InnoDB;

SELECT a FROM t1 WHERE MATCH (a) AGAINST ('test' IN BOOLEAN MODE);

The used table type doesn't support FULLTEXT indexes

ERROR HY000: The used table type doesn't support FULLTEXT indexes

DROP TABLE t1;

mysql-test/r/insert_update.result

+8 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ a b c VALUES(a) 
2	1	11	NULL

DROP TABLE t1;

DROP TABLE t2;

create table t1 (a int not null unique);

create table t1 (a int not null unique) engine=myisam;

insert into t1 values (1),(2);

insert ignore into t1 select 1 on duplicate key update a=2;

select * from t1;
@@ -179,4 +179,11 @@ select * from t1; 
a

1

3

insert into t1 select 1 on duplicate key update a=2;

select * from t1;

a

2

3

insert into t1 select a from t1 on duplicate key update a=a+1 ;

ERROR 23000: Duplicate entry '3' for key 1

drop table t1;

mysql-test/r/outfile.result

+276 B (959 B)

File changed.

No diff preview for this file type.

View original file
View changed file