Commit fcbfb41f authored by unknown's avatar unknown
Browse files

Merge xiphis.org:/home/antony/work2/mysql-5.1-engines 

into  xiphis.org:/home/antony/work2/mysql-5.1-engines-merge


include/mysql.h:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
storage/federated/ha_federated.cc:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
storage/myisam/mi_dynrec.c:
  Auto merged
storage/myisam/mi_packrec.c:
  Auto merged
storage/myisam/mi_range.c:
  Auto merged
storage/myisam/mi_test1.c:
  Auto merged
storage/myisam/mi_write.c:
  Auto merged
storage/myisam/rt_split.c:
  Auto merged
configure.in:
  fix merge conflict
parents 4dabfa5d 901cbf03

include/mysql/plugin.h

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
  Plugin API. Common for all plugin types.

*/



#define MYSQL_PLUGIN_INTERFACE_VERSION 0x0002

#define MYSQL_PLUGIN_INTERFACE_VERSION 0x0100



/*

  The allowable types of plugins
@@ -98,7 +98,7 @@ struct st_mysql_plugin 
  const char *name;     /* plugin name                                  */

  const char *author;   /* plugin author (for SHOW PLUGINS)             */

  const char *descr;    /* general descriptive text (for SHOW PLUGINS ) */

  int license;             /* the plugin type (a MYSQL_XXX_PLUGIN value)   */

  int license;          /* the plugin license (PLUGIN_LICENSE_XXX)      */

  int (*init)(void *);  /* the function to invoke when plugin is loaded */

  int (*deinit)(void *);/* the function to invoke when plugin is unloaded */

  unsigned int version; /* plugin version (for SHOW PLUGINS)            */

mysql-test/include/index_merge_ror.inc

+15 −0
Original line number Diff line number Diff line
@@ -272,3 +272,18 @@ select count(a) from t2 ignore index(a,b) where a='AAAAAAAA' and b='AAAAAAAA'; 
insert into t2 values ('ab', 'ab', 'uh', 'oh');

explain select a from t2 where a='ab';

drop table t2;



#

# BUG#25048 - ERROR 126 : Incorrect key file for table '.XXXX.MYI'; try to

#             repair it

#

CREATE TABLE t1(c1 INT, c2 INT DEFAULT 0, c3 CHAR(255) DEFAULT '',

KEY(c1), KEY(c2), KEY(c3));

INSERT INTO t1(c1) VALUES(0),(0),(0),(0),(0),(0),(0),(0),(0),(0),(0),(0),(0),

(0),(0),(0),(0),(0),(0),(0),(0),(0),(0),(0),(0),(0),(0),(0),(0);

INSERT INTO t1 VALUES(0,0,0);

CREATE TABLE t2(c1 int);

INSERT INTO t2 VALUES(1);

DELETE t1 FROM t1,t2 WHERE t1.c1=0 AND t1.c2=0;

SELECT * FROM t1;

DROP TABLE t1,t2;

mysql-test/r/alter_table.result

+15 −0
Original line number Diff line number Diff line
@@ -677,6 +677,21 @@ ERROR 3D000: No database selected 
alter table test.t1 rename test.t1;

use test;

drop table t1;

CREATE TABLE t1(a INT) ROW_FORMAT=FIXED;

CREATE INDEX i1 ON t1(a);

SHOW CREATE TABLE t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` int(11) DEFAULT NULL,

  KEY `i1` (`a`)

) ENGINE=MyISAM DEFAULT CHARSET=latin1 ROW_FORMAT=FIXED

DROP INDEX i1 ON t1;

SHOW CREATE TABLE t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` int(11) DEFAULT NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1 ROW_FORMAT=FIXED

DROP TABLE t1;

DROP TABLE IF EXISTS bug24219;

DROP TABLE IF EXISTS bug24219_2;

CREATE TABLE bug24219 (a INT, INDEX(a));

mysql-test/r/federated.result

+28 −0
Original line number Diff line number Diff line
@@ -1815,6 +1815,34 @@ engine = federated 
connection='mysql://root@127.0.0.1:SLAVE_PORT/federated/test';

drop table federated.test1, federated.test2;

drop table federated.test;

set names utf8;

create table federated.t1 (a varchar(64)) DEFAULT CHARSET=utf8;

insert into federated.t1 values (0x6DC3A56E6164);

select hex(a) from federated.t1;

hex(a)

6DC3A56E6164

create table federated.t1 (a varchar(64))

ENGINE=FEDERATED 

connection='mysql://root@127.0.0.1:SLAVE_PORT/federated/t1'

DEFAULT CHARSET=utf8;

set names utf8;

select hex(a) from federated.t1;

hex(a)

6DC3A56E6164

insert into federated.t1 values (0xC3A4C3B6C3BCC39F);

insert into federated.t1 values (0xD18DD184D184D0B5D0BAD182D0B8D0B2D0BDD183D18E);

select hex(a) from federated.t1;

hex(a)

6DC3A56E6164

C3A4C3B6C3BCC39F

D18DD184D184D0B5D0BAD182D0B8D0B2D0BDD183D18E

select hex(a) from federated.t1;

hex(a)

6DC3A56E6164

C3A4C3B6C3BCC39F

D18DD184D184D0B5D0BAD182D0B8D0B2D0BDD183D18E

drop table federated.t1;

drop table federated.t1;

DROP TABLE IF EXISTS federated.t1;

DROP DATABASE IF EXISTS federated;

DROP TABLE IF EXISTS federated.t1;

mysql-test/r/index_merge_myisam.result

+12 −1
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ NULL UNION RESULT <union1,2> ALL NULL NULL NULL NULL NULL 
explain select * from (select * from t1 where key1 = 3 or key2 =3) as Z where key8 >5;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	PRIMARY	<derived2>	system	NULL	NULL	NULL	NULL	1	

2	DERIVED	t1	index_merge	i1,i2	i1,i2	4,4	NULL	2	Using union(i1,i2); Using where

2	DERIVED	t1	index_merge	i1,i2	i1,i2	4,4	NULL	2	Using union(i1,i2); Using where; Using index

create table t3 like t0;

insert into t3 select * from t0;

alter table t3 add key9 int not null, add index i9(key9);
@@ -696,6 +696,17 @@ explain select a from t2 where a='ab'; 
id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t2	ref	a	a	6	const	1	Using where

drop table t2;

CREATE TABLE t1(c1 INT, c2 INT DEFAULT 0, c3 CHAR(255) DEFAULT '',

KEY(c1), KEY(c2), KEY(c3));

INSERT INTO t1(c1) VALUES(0),(0),(0),(0),(0),(0),(0),(0),(0),(0),(0),(0),(0),

(0),(0),(0),(0),(0),(0),(0),(0),(0),(0),(0),(0),(0),(0),(0),(0);

INSERT INTO t1 VALUES(0,0,0);

CREATE TABLE t2(c1 int);

INSERT INTO t2 VALUES(1);

DELETE t1 FROM t1,t2 WHERE t1.c1=0 AND t1.c2=0;

SELECT * FROM t1;

c1	c2	c3

DROP TABLE t1,t2;

#---------------- Index merge test 2 -------------------------------------------

SET SESSION STORAGE_ENGINE = MyISAM;

drop table if exists t1,t2;