Commit 64b4131c authored by unknown's avatar unknown
Browse files

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

into serg.mylan:/usr/home/serg/Abk/mysql-4.1
parents 3cde2060 7233b5d5

VC++Files/libmysqld/libmysqld.dsp

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ LINK32=xilink6.exe 
# PROP Ignore_Export_Lib 0

# PROP Target_Dir ""

# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBMYSQLD_EXPORTS" /YX /FD /GZ /c

# ADD CPP /nologo /MT /W3 /Z7 /Od /I "../include" /I "../libmysqld" /I "../sql" /I "../regex" /I "../bdb/build_win32" /I "../zlib" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "HAVE_BERKELEY_DB" /D "USE_SYMDIR" /D "SIGNAL_WITH_VIO_CLOSE" /D "HAVE_DLOPEN" /D "EMBEDDED_LIBRARY" /D "HAVE_INNOBASE_DB" /D "USE_TLS" /D "__WIN__" /FD /GZ /c

# ADD CPP /nologo /MT /W3 /Z7 /Od /I "../include" /I "../libmysqld" /I "../sql" /I "../regex" /I "../bdb/build_win32" /I "../zlib" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "SAFEMALLOC" /D "HAVE_BERKELEY_DB" /D "USE_SYMDIR" /D "SIGNAL_WITH_VIO_CLOSE" /D "HAVE_DLOPEN" /D "EMBEDDED_LIBRARY" /D "HAVE_INNOBASE_DB" /D "USE_TLS" /D "__WIN__" /FD /GZ /c

# SUBTRACT CPP /X /Fr

# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

include/hash.h

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ my_bool _hash_init(HASH *hash, CHARSET_INFO *charset, 
		   uint key_length, hash_get_key get_key,

		   void (*free_element)(void*), uint flags CALLER_INFO_PROTO);

void hash_free(HASH *tree);

void hash_reset(HASH *hash);

void my_hash_reset(HASH *hash);

byte *hash_element(HASH *hash,uint idx);

gptr hash_search(HASH *info,const byte *key,uint length);

gptr hash_next(HASH *info,const byte *key,uint length);

mysql-test/r/ndb_index_ordered.result

+16 −0
Original line number Diff line number Diff line
@@ -420,3 +420,19 @@ count(*)-8 
select count(*)-9 from t1 use index (ti) where ti <= '23:59:59';

count(*)-9

0

drop table t1;

create table t1(a int primary key, b int not null, index(b));

insert into t1 values (1,1), (2,2);

set autocommit=0;

begin;

select count(*) from t1;

count(*)

2

ALTER TABLE t1 ADD COLUMN c int;

select a from t1 where b = 2;

a

2

show tables;

Tables_in_test

t1

drop table t1;

mysql-test/t/ndb_index_ordered.test

+18 −0
Original line number Diff line number Diff line
@@ -236,3 +236,21 @@ select count(*)-5 from t1 use index (ti) where ti < '10:11:11'; 
select count(*)-6 from t1 use index (ti) where ti <= '10:11:11';

select count(*)-8 from t1 use index (ti) where ti <  '23:59:59';

select count(*)-9 from t1 use index (ti) where ti <= '23:59:59';



drop table t1;



# bug#7798

create table t1(a int primary key, b int not null, index(b));

insert into t1 values (1,1), (2,2);

connect (con1,localhost,,,test);

connect (con2,localhost,,,test);

connection con1;

set autocommit=0;

begin;

select count(*) from t1;

connection con2;

ALTER TABLE t1 ADD COLUMN c int;

connection con1;

select a from t1 where b = 2;

show tables;

drop table t1;

mysys/hash.c

+3 −3
Original line number Diff line number Diff line
@@ -122,13 +122,13 @@ void hash_free(HASH *hash) 
  Delete all elements from the hash (the hash itself is to be reused).



  SYNOPSIS

    hash_reset()

    my_hash_reset()

    hash   the hash to delete elements of

*/



void hash_reset(HASH *hash)

void my_hash_reset(HASH *hash)

{

  DBUG_ENTER("hash_reset");

  DBUG_ENTER("my_hash_reset");

  DBUG_PRINT("enter",("hash: 0x%lxd",hash));



  hash_free_elements(hash);