Commit fb89fac4 authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 

into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
parents 3d2949e5 25749c96

configure.in

+2 −1
Original line number Diff line number Diff line
@@ -378,7 +378,7 @@ then 
  # mysqld doesn't use run-time-type-checking, so we disable it.

  CXXFLAGS="$CXXFLAGS -fno-implicit-templates -fno-exceptions -fno-rtti"

  # ndb cannot be compiled with -fno-implicit-templaces

  ndb_cxxflags_fix=-fimplicit-templates

  ndb_cxxflags_fix="$ndb_cxxflags_fix -fimplicit-templates"



  # If you are using 'gcc' 3.0 (not g++) to compile C++ programs on Linux,

  # we will gets some problems when linking static programs.
@@ -1032,6 +1032,7 @@ case $SYSTEM_TYPE in 
      CXXFLAGS="$CXXFLAGS +O2"

      MAX_C_OPTIMIZE=""

      MAX_CXX_OPTIMIZE=""

      ndb_cxxflags_fix="$ndb_cxxflags_fix -Aa"

    fi

    ;;

  *rhapsody*)

mysql-test/ndb/ndb_config_2_node.ini

+1 −59
Original line number Diff line number Diff line
@@ -73,63 +73,5 @@ ExecuteOnComputer: 6 
Id: 14

ExecuteOnComputer: 7



# Mgmtsrvr connections



[TCP]

NodeId1: 1

NodeId2: 2

[TCP DEFAULT]

PortNumber: CHOOSE_PORT_BASE02
 


[TCP]

NodeId1: 1

NodeId2: 3

PortNumber: CHOOSE_PORT_BASE03



# Ndb nodes connections



[TCP]

NodeId1: 2

NodeId2: 3

PortNumber: CHOOSE_PORT_BASE04



# Api connections



[TCP]

NodeId1: 11

NodeId2: 2

PortNumber: CHOOSE_PORT_BASE05



[TCP]

NodeId1: 11

NodeId2: 3

PortNumber: CHOOSE_PORT_BASE06



[TCP]

NodeId1: 12

NodeId2: 2

PortNumber: CHOOSE_PORT_BASE07



[TCP]

NodeId1: 12

NodeId2: 3

PortNumber: CHOOSE_PORT_BASE08



[TCP]

NodeId1: 13

NodeId2: 2

PortNumber: CHOOSE_PORT_BASE09



[TCP]

NodeId1: 13

NodeId2: 3

PortNumber: CHOOSE_PORT_BASE10



[TCP]

NodeId1: 14

NodeId2: 2

PortNumber: CHOOSE_PORT_BASE11



[TCP]

NodeId1: 14

NodeId2: 3

PortNumber: CHOOSE_PORT_BASE12

mysql-test/r/subselect.result

+7 −7
Original line number Diff line number Diff line
@@ -1075,24 +1075,24 @@ CREATE TABLE t1 SELECT * FROM (SELECT 1 as a,(SELECT 1)) a; 
SHOW CREATE TABLE t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` bigint(1) NOT NULL default '0',

  `(SELECT 1)` bigint(1) NOT NULL default '0'

  `a` bigint(20) NOT NULL default '0',

  `(SELECT 1)` bigint(20) NOT NULL default '0'

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table t1;

CREATE TABLE t1 SELECT * FROM (SELECT 1 as a,(SELECT a)) a;

SHOW CREATE TABLE t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` bigint(1) NOT NULL default '0',

  `(SELECT a)` bigint(1) NOT NULL default '0'

  `a` bigint(20) NOT NULL default '0',

  `(SELECT a)` bigint(20) NOT NULL default '0'

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table t1;

CREATE TABLE t1 SELECT * FROM (SELECT 1 as a,(SELECT a+0)) a;

SHOW CREATE TABLE t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` bigint(1) NOT NULL default '0',

  `(SELECT a+0)` bigint(17) NOT NULL default '0'

  `a` bigint(20) NOT NULL default '0',

  `(SELECT a+0)` bigint(20) NOT NULL default '0'

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table t1;

CREATE TABLE t1 SELECT (SELECT 1 as a UNION SELECT 1+1 limit 1,1) as a;
@@ -1102,7 +1102,7 @@ a 
SHOW CREATE TABLE t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` bigint(17) NOT NULL default '0'

  `a` bigint(20) NOT NULL default '0'

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table t1;

create table t1 (a int);

mysql-test/r/union.result

+11 −4
Original line number Diff line number Diff line
@@ -546,7 +546,7 @@ aa 
show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` char(2) NOT NULL default ''

  `a` char(20) NOT NULL default ''

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table t1;

create table t1 SELECT 12 as a UNION select 12.2 as a;
@@ -557,7 +557,7 @@ a 
show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` double(4,1) NOT NULL default '0.0'

  `a` double(53,1) NOT NULL default '0.0'

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table t1;

create table t2 (it1 tinyint, it2 tinyint not null, i int not null, ib bigint, f float, d double, y year, da date, dt datetime, sc char(10), sv varchar(10), b blob, tx text);
@@ -647,7 +647,7 @@ f 
show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `f` binary(12) default NULL

  `f` binary(24) default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table t1;

create table t1 SELECT y from t2 UNION select da from t2;
@@ -795,7 +795,7 @@ select * from t1; 
show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `1` bigint(1) NOT NULL default '0'

  `1` bigint(20) NOT NULL default '0'

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table t1;

create table t1 select _latin1"test" union select _latin2"testt" ;
@@ -953,3 +953,10 @@ CREATE TABLE t2 (i int(11) default NULL,c char(1) default NULL,KEY i (i)); 
explain (select * from t1) union (select * from t2) order by not_existing_column;

ERROR 42S22: Unknown column 'not_existing_column' in 'order clause'

drop table t1, t2;

CREATE TABLE t1 (uid int(1));

INSERT INTO t1 SELECT 150;

SELECT 'a' UNION SELECT uid FROM t1;

a

a

150

drop table t1;

mysql-test/t/union.test

+8 −0
Original line number Diff line number Diff line
@@ -527,3 +527,11 @@ CREATE TABLE t2 (i int(11) default NULL,c char(1) default NULL,KEY i (i)); 
--error 1054

explain (select * from t1) union (select * from t2) order by not_existing_column;

drop table t1, t2;



#

# length detecting

#

CREATE TABLE t1 (uid int(1));

INSERT INTO t1 SELECT 150;

SELECT 'a' UNION SELECT uid FROM t1;

drop table t1;