Commit 8da148ab authored by unknown's avatar unknown
Browse files

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

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean


sql/mysqld.cc:
  Auto merged
parents 828cefb3 bfab8644

client/mysqladmin.cc

+9 −0
Original line number Diff line number Diff line
@@ -125,6 +125,10 @@ static TYPELIB command_typelib= 


static struct my_option my_long_options[] =

{

#ifdef __NETWARE__

  {"autoclose", 'a', " Auto close the screen on exit for NetWare",

   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},

#endif

  {"count", 'c',

   "Number of iterations to make. This works with -i (--sleep) only.",

   (gptr*) &nr_iterations, (gptr*) &nr_iterations, 0, GET_UINT,
@@ -218,6 +222,11 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), 
  int error = 0;



  switch(optid) {

#ifdef __NETWARE__

  case 'a':

   setscreenmode(SCR_AUTOCLOSE_ON_EXIT);      // auto close the screen /

   break;

#endif

  case 'c':

    opt_count_iterations= 1;

    break;

mysql-test/r/ndb_index_unique.result

+36 −0
Original line number Diff line number Diff line
@@ -574,3 +574,39 @@ uid gid rid cid 
1	1	2	3

1	1	2	4

drop table t1,t2,t3,t4,t5,t6,t7;

CREATE TABLE t1 (   

a int unsigned NOT NULL PRIMARY KEY,

b int unsigned,   

c int unsigned, 

UNIQUE bc(b,c) ) engine = ndb;

insert into t1 values(1,1,1),(2,NULL,2),(3,NULL,NULL),(4,4,NULL);

select * from t1 where b=1 and c=1;

a	b	c

1	1	1

select * from t1 where b is null and c is null;

a	b	c

3	NULL	NULL

select * from t1 where b is null and c = 2;

a	b	c

2	NULL	2

select * from t1 where b = 4 and c is null;

a	b	c

4	4	NULL

create table t8 as 

select * from t1 where (b = 1 and c = 1)

or (b is null and c is null) 

or (b is null and c = 2)

or (b = 4 and c is null);

select * from t8 order by a;

a	b	c

1	1	1

2	NULL	2

3	NULL	NULL

4	4	NULL

select * from t1 order by a;

a	b	c

1	1	1

2	NULL	2

3	NULL	NULL

4	4	NULL

drop table t1, t8;

mysql-test/t/ndb_index_unique.test

+20 −0
Original line number Diff line number Diff line
@@ -265,4 +265,24 @@ select * from t4 where rid = 2 order by cid; 


drop table t1,t2,t3,t4,t5,t6,t7;



# test null in indexes

CREATE TABLE t1 (   

   a int unsigned NOT NULL PRIMARY KEY,

   b int unsigned,   

   c int unsigned, 

   UNIQUE bc(b,c) ) engine = ndb;

 

insert into t1 values(1,1,1),(2,NULL,2),(3,NULL,NULL),(4,4,NULL);

select * from t1 where b=1 and c=1;

select * from t1 where b is null and c is null;

select * from t1 where b is null and c = 2;

select * from t1 where b = 4 and c is null;

create table t8 as 

select * from t1 where (b = 1 and c = 1)

                    or (b is null and c is null) 

                    or (b is null and c = 2)

                    or (b = 4 and c is null);

select * from t8 order by a;

select * from t1 order by a;

drop table t1, t8;

netware/comp_err.def

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
# MySQL Error File Compiler

#------------------------------------------------------------------------------

MODULE	libc.nlm

COPYRIGHT "(c) 2003 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."

COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."

DESCRIPTION "MySQL Error File Compiler"

VERSION 4, 0

XDCDATA ../netware/mysql.xdc

netware/isamchk.def

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#------------------------------------------------------------------------------

MODULE	libc.nlm

SCREENNAME "MySQL ISAM Table Check Tool"

COPYRIGHT "(c) 2003 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."

COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."

DESCRIPTION "MySQL ISAM Table Check Tool"

VERSION 4, 0

STACKSIZE 65536