Commit 04844921 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jonas/src/mysql-4.1 

into mysql.com:/home/jonas/src/mysql-4.1-ndb


ndb/src/ndbapi/ndberror.c:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
parents 76f06e4a 7df58b8c

BitKeeper/etc/logging_ok

+3 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ miguel@hegel.txg.br 
miguel@light.

miguel@light.local

miguel@sartre.local

mikael@mc04.(none)

mikron@c-fb0ae253.1238-1-64736c10.cust.bredbandsbolaget.se

mikron@mikael-ronstr-ms-dator.local

mleich@mysql.com
@@ -130,6 +131,7 @@ mwagner@here.mwagner.org 
mwagner@work.mysql.com

mydev@mysql.com

mysql@home.(none)

mysql@mc04.(none)

mysqldev@build.mysql2.com

mysqldev@melody.local

mysqldev@mysql.com
@@ -159,6 +161,7 @@ ram@ram.(none) 
ranger@regul.home.lan

rburnett@build.mysql.com

root@home.(none)

root@mc04.(none)

root@x3.internalnet

salle@banica.(none)

salle@geopard.(none)

acinclude.m4

+32 −18
Original line number Diff line number Diff line
@@ -1548,16 +1548,43 @@ dnl Sets HAVE_NDBCLUSTER_DB if --with-ndbcluster is used 
dnl ---------------------------------------------------------------------------

                                                                                

AC_DEFUN([MYSQL_CHECK_NDB_OPTIONS], [

  AC_ARG_WITH([ndb-sci],

              AC_HELP_STRING([--with-ndb-sci=DIR],

                             [Provide MySQL with a custom location of

                             sci library. Given DIR, sci library is 

                             assumed to be in $DIR/lib and header files

                             in $DIR/include.]),

              [mysql_sci_dir=${withval}],

              [mysql_sci_dir=""])



  case "$mysql_sci_dir" in

    "no" )

      have_ndb_sci=no

      AC_MSG_RESULT([-- not including sci transporter])

      ;;

    * )

      if test -f "$mysql_sci_dir/lib/libsisci.a" -a \ 

              -f "$mysql_sci_dir/include/sisci_api.h"; then

        NDB_SCI_INCLUDES="-I$mysql_sci_dir/include"

        NDB_SCI_LIBS="-L$mysql_sci_dir/lib -lsisci"

        AC_MSG_RESULT([-- including sci transporter])

        AC_DEFINE([NDB_SCI_TRANSPORTER], [1],

                  [Including Ndb Cluster DB sci transporter])

        AC_SUBST(NDB_SCI_INCLUDES)

        AC_SUBST(NDB_SCI_LIBS)

        have_ndb_sci="yes"

        AC_MSG_RESULT([found sci transporter in $mysql_sci_dir/{include, lib}])

      else

        AC_MSG_RESULT([could not find sci transporter in $mysql_sci_dir/{include, lib}])

      fi

      ;;

  esac



  AC_ARG_WITH([ndb-shm],

              [

  --with-ndb-shm        Include the NDB Cluster shared memory transporter],

              [ndb_shm="$withval"],

              [ndb_shm=no])

  AC_ARG_WITH([ndb-sci],

              [

  --with-ndb-sci        Include the NDB Cluster sci transporter],

              [ndb_sci="$withval"],

              [ndb_sci=no])

  AC_ARG_WITH([ndb-test],

              [

  --with-ndb-test       Include the NDB Cluster ndbapi test programs],
@@ -1590,19 +1617,6 @@ AC_DEFUN([MYSQL_CHECK_NDB_OPTIONS], [ 
      ;;

  esac



  have_ndb_sci=no

  case "$ndb_sci" in

    yes )

      AC_MSG_RESULT([-- including sci transporter])

      AC_DEFINE([NDB_SCI_TRANSPORTER], [1],

                [Including Ndb Cluster DB sci transporter])

      have_ndb_sci="yes"

      ;;

    * )

      AC_MSG_RESULT([-- not including sci transporter])

      ;;

  esac



  have_ndb_test=no

  case "$ndb_test" in

    yes )

configure.in

+2 −2
Original line number Diff line number Diff line
@@ -3024,11 +3024,11 @@ AC_SUBST([ndb_port_base]) 
ndb_transporter_opt_objs=""

if test X"$have_ndb_shm" = Xyes

then

  ndb_transporter_opt_objs="$(ndb_transporter_opt_objs) SHM_Transporter.lo SHM_Transporter.unix.lo"

  ndb_transporter_opt_objs="$ndb_transporter_opt_objs SHM_Transporter.lo SHM_Transporter.unix.lo"

fi

if test X"$have_ndb_sci" = Xyes

then

  ndb_transporter_opt_objs="$(ndb_transporter_opt_objs) SCI_Transporter.lo"

  ndb_transporter_opt_objs="$ndb_transporter_opt_objs SCI_Transporter.lo"

fi

AC_SUBST([ndb_transporter_opt_objs])

mysql-test/r/ndb_charset.result

0 → 100644
+191 −0
Original line number Diff line number Diff line 
drop table if exists t1;

create table t1 (

a char(3) character set latin1 collate latin1_bin primary key

) engine=ndb;

insert into t1 values('aAa');

insert into t1 values('aaa');

insert into t1 values('AAA');

select * from t1 order by a;

a

AAA

aAa

aaa

select * from t1 where a = 'aAa';

a

aAa

select * from t1 where a = 'aaa';

a

aaa

select * from t1 where a = 'AaA';

a

select * from t1 where a = 'AAA';

a

AAA

drop table t1;

create table t1 (

a char(3) character set latin1 collate latin1_swedish_ci primary key

) engine=ndb;

insert into t1 values('aAa');

insert into t1 values('aaa');

ERROR 23000: Duplicate entry 'aaa' for key 1

insert into t1 values('AAA');

ERROR 23000: Duplicate entry 'AAA' for key 1

select * from t1 order by a;

a

aAa

select * from t1 where a = 'aAa';

a

aAa

select * from t1 where a = 'aaa';

a

aAa

select * from t1 where a = 'AaA';

a

aAa

select * from t1 where a = 'AAA';

a

aAa

drop table t1;

create table t1 (

p int primary key,

a char(3) character set latin1 collate latin1_bin not null,

unique key(a)

) engine=ndb;

insert into t1 values(1, 'aAa');

insert into t1 values(2, 'aaa');

insert into t1 values(3, 'AAA');

select * from t1 order by p;

p	a

1	aAa

2	aaa

3	AAA

select * from t1 where a = 'aAa';

p	a

1	aAa

select * from t1 where a = 'aaa';

p	a

2	aaa

select * from t1 where a = 'AaA';

p	a

select * from t1 where a = 'AAA';

p	a

3	AAA

drop table t1;

create table t1 (

p int primary key,

a char(3) character set latin1 collate latin1_swedish_ci not null,

unique key(a)

) engine=ndb;

insert into t1 values(1, 'aAa');

insert into t1 values(2, 'aaa');

ERROR 23000: Can't write, because of unique constraint, to table 't1'

insert into t1 values(3, 'AAA');

ERROR 23000: Can't write, because of unique constraint, to table 't1'

select * from t1 order by p;

p	a

1	aAa

select * from t1 where a = 'aAa';

p	a

1	aAa

select * from t1 where a = 'aaa';

p	a

1	aAa

select * from t1 where a = 'AaA';

p	a

1	aAa

select * from t1 where a = 'AAA';

p	a

1	aAa

drop table t1;

create table t1 (

p int primary key,

a char(3) character set latin1 collate latin1_bin not null,

index(a)

) engine=ndb;

insert into t1 values(1, 'aAa');

insert into t1 values(2, 'aaa');

insert into t1 values(3, 'AAA');

insert into t1 values(4, 'aAa');

insert into t1 values(5, 'aaa');

insert into t1 values(6, 'AAA');

select * from t1 order by p;

p	a

1	aAa

2	aaa

3	AAA

4	aAa

5	aaa

6	AAA

explain select * from t1 where a = 'zZz' order by p;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ref	a	a	3	const	10	Using where; Using filesort

select * from t1 where a = 'aAa' order by p;

p	a

1	aAa

4	aAa

select * from t1 where a = 'aaa' order by p;

p	a

2	aaa

5	aaa

select * from t1 where a = 'AaA' order by p;

p	a

select * from t1 where a = 'AAA' order by p;

p	a

3	AAA

6	AAA

drop table t1;

create table t1 (

p int primary key,

a char(3) character set latin1 collate latin1_swedish_ci not null,

index(a)

) engine=ndb;

insert into t1 values(1, 'aAa');

insert into t1 values(2, 'aaa');

insert into t1 values(3, 'AAA');

insert into t1 values(4, 'aAa');

insert into t1 values(5, 'aaa');

insert into t1 values(6, 'AAA');

select * from t1 order by p;

p	a

1	aAa

2	aaa

3	AAA

4	aAa

5	aaa

6	AAA

explain select * from t1 where a = 'zZz' order by p;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ref	a	a	3	const	10	Using where; Using filesort

select * from t1 where a = 'aAa' order by p;

p	a

1	aAa

2	aaa

3	AAA

4	aAa

5	aaa

6	AAA

select * from t1 where a = 'aaa' order by p;

p	a

1	aAa

2	aaa

3	AAA

4	aAa

5	aaa

6	AAA

select * from t1 where a = 'AaA' order by p;

p	a

1	aAa

2	aaa

3	AAA

4	aAa

5	aaa

6	AAA

select * from t1 where a = 'AAA' order by p;

p	a

1	aAa

2	aaa

3	AAA

4	aAa

5	aaa

6	AAA

drop table t1;

mysql-test/r/ndb_index.result

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ PORT varchar(16) NOT NULL, 
ACCESSNODE varchar(16) NOT NULL,

POP varchar(48) NOT NULL,

ACCESSTYPE int unsigned NOT NULL,

CUSTOMER_ID varchar(20) NOT NULL,

CUSTOMER_ID varchar(20) collate latin1_bin NOT NULL,

PROVIDER varchar(16),

TEXPIRE int unsigned,

NUM_IP int unsigned,