Commit 7aafc414 authored by unknown's avatar unknown
Browse files

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

into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-engines-merge


sql/ha_federated.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_insert.cc:
  Auto merged
storage/myisam/mi_dynrec.c:
  Auto merged
storage/ndb/include/kernel/GlobalSignalNumbers.h:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
mysql-test/r/auto_increment.result:
  merge of 5.1-engines and 5.0-engines, hand merge
mysql-test/r/create.result:
  merge of 5.1-engines and 5.0-engines, hand merge
mysql-test/r/federated.result:
  merge of 5.1-engines and 5.0-engines, hand merge
mysql-test/r/insert.result:
  merge of 5.1-engines and 5.0-engines, hand merge
mysql-test/r/insert_select.result:
  merge of 5.1-engines and 5.0-engines, hand merge
mysql-test/r/key.result:
  merge of 5.1-engines and 5.0-engines, hand merge
mysql-test/r/null.result:
  merge of 5.1-engines and 5.0-engines, hand merge
mysql-test/r/null_key.result:
  merge of 5.1-engines and 5.0-engines, hand merge
mysql-test/r/ps_2myisam.result:
  merge of 5.1-engines and 5.0-engines, hand merge
mysql-test/r/ps_3innodb.result:
  merge of 5.1-engines and 5.0-engines, hand merge
mysql-test/r/ps_4heap.result:
  merge of 5.1-engines and 5.0-engines, hand merge
mysql-test/r/ps_5merge.result:
  merge of 5.1-engines and 5.0-engines, hand merge
mysql-test/r/ps_6bdb.result:
  merge of 5.1-engines and 5.0-engines, hand merge
mysql-test/r/ps_7ndb.result:
  merge of 5.1-engines and 5.0-engines, hand merge
mysql-test/r/strict.result:
  merge of 5.1-engines and 5.0-engines, hand merge
mysql-test/r/view.result:
  merge of 5.1-engines and 5.0-engines, hand merge
mysql-test/r/warnings.result:
  merge of 5.1-engines and 5.0-engines, hand merge
mysql-test/t/federated.test:
  merge of 5.1-engines and 5.0-engines, hand merge
sql/ha_federated.h:
  merge of 5.1-engines and 5.0-engines, hand merge
storage/csv/ha_tina.cc:
  merge of 5.1-engines and 5.0-engines, hand merge
parents 2f48a591 afa49a59

mysql-test/r/federated.result

+27 −1
Original line number Diff line number Diff line
@@ -1784,7 +1784,33 @@ length(a) 
5000

drop table t1;

drop table t1;

End of 5.0 tests

DROP TABLE IF EXISTS federated.test;

CREATE TABLE federated.test (

`i` int(11) NOT NULL,

`j` int(11) NOT NULL,

`c` varchar(30) default NULL,

PRIMARY KEY  (`i`,`j`),

UNIQUE KEY `i` (`i`,`c`)

) ENGINE=InnoDB DEFAULT CHARSET=latin1;

DROP TABLE IF EXISTS federated.test1;

DROP TABLE IF EXISTS federated.test2;

create table federated.test1 (

i int not null,

j int not null,

c varchar(30),

primary key (i,j),

unique key (i, c))

engine = federated

connection='mysql://root@127.0.0.1:SLAVE_PORT/federated/test';

create table federated.test2 (

i int default null,

j int not null,

c varchar(30),

key (i))

engine = federated

connection='mysql://root@127.0.0.1:SLAVE_PORT/federated/test';

drop table federated.test1, federated.test2;

drop table federated.test;

DROP TABLE IF EXISTS federated.t1;

DROP DATABASE IF EXISTS federated;

DROP TABLE IF EXISTS federated.t1;

mysql-test/r/warnings.result

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ drop table t1; 
create table t1(a tinyint, b int not null, c date, d char(5));

load data infile '../std_data_ln/warnings_loaddata.dat' into table t1 fields terminated by ',';

Warnings:

Warning	1263	Column set to default value; NULL supplied to NOT NULL column 'b' at row 2

Warning	1263	Column was set to data type implicit default; NULL supplied for NOT NULL column 'b' at row 2

Warning	1265	Data truncated for column 'd' at row 3

Warning	1265	Data truncated for column 'c' at row 4

Warning	1261	Row 5 doesn't contain data for all columns

mysql-test/t/federated.test

+45 −1
Original line number Diff line number Diff line
@@ -1553,5 +1553,49 @@ drop table t1; 
connection master;

drop table t1;



--echo End of 5.0 tests

#

# BUG #15133: unique index with nullable value not accepted in federated table 

#



connection slave;

--disable_warnings

DROP TABLE IF EXISTS federated.test;

CREATE TABLE federated.test (

  `i` int(11) NOT NULL,

  `j` int(11) NOT NULL,

  `c` varchar(30) default NULL,

  PRIMARY KEY  (`i`,`j`),

  UNIQUE KEY `i` (`i`,`c`)

) ENGINE=InnoDB DEFAULT CHARSET=latin1;

--enable_warnings



connection master;

--disable_warnings

DROP TABLE IF EXISTS federated.test1;

DROP TABLE IF EXISTS federated.test2;

--enable_warnings



--replace_result $SLAVE_MYPORT SLAVE_PORT

eval create table federated.test1 (

        i int not null,

        j int not null,

        c varchar(30),

        primary key (i,j),

        unique key (i, c))

engine = federated

connection='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/test';



--replace_result $SLAVE_MYPORT SLAVE_PORT

eval create table federated.test2 (

        i int default null,

        j int not null,

        c varchar(30),

        key (i))

engine = federated

connection='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/test';

drop table federated.test1, federated.test2;



connection slave;

drop table federated.test;



source include/federated_cleanup.inc;

sql/ha_federated.cc

+1 −0
Original line number Diff line number Diff line
@@ -332,6 +332,7 @@ 


*/





#include "mysql_priv.h"

#ifdef USE_PRAGMA_IMPLEMENTATION

#pragma implementation                          // gcc: Class implementation

sql/ha_federated.h

+4 −3
Original line number Diff line number Diff line
@@ -117,9 +117,10 @@ class ha_federated: public handler 
  ulonglong table_flags() const

  {

    /* fix server to be able to get remote server table flags */

    return (HA_PRIMARY_KEY_IN_READ_INDEX | HA_FILE_BASED | HA_REC_NOT_IN_SEQ |

            HA_AUTO_PART_KEY | HA_CAN_INDEX_BLOBS| HA_NO_PREFIX_CHAR_KEYS |

            HA_PRIMARY_KEY_REQUIRED_FOR_DELETE | HA_PARTIAL_COLUMN_READ);

    return (HA_NOT_EXACT_COUNT | HA_PRIMARY_KEY_IN_READ_INDEX | HA_FILE_BASED

            | HA_REC_NOT_IN_SEQ | HA_AUTO_PART_KEY | HA_CAN_INDEX_BLOBS |

            HA_NO_PREFIX_CHAR_KEYS | HA_PRIMARY_KEY_REQUIRED_FOR_DELETE |

            HA_PARTIAL_COLUMN_READ | HA_NULL_IN_KEY);

  }

  /*

    This is a bitmap of flags that says how the storage engine