Commit 1dd76e19 authored by unknown's avatar unknown
Browse files

Merge 


BitKeeper/etc/logging_ok:
  auto-union
mysql-test/mysql-test-run.sh:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  SCCS merged
parents 5077ba47 a64953ed

BitKeeper/etc/logging_ok

+2 −0
Original line number Diff line number Diff line
@@ -24,12 +24,14 @@ bar@bar.udmsearch.izhnet.ru 
bar@deer.(none)

bar@gw.udmsearch.izhnet.ru

bar@mysql.com

bar@noter.intranet.mysql.r18.ru

bell@laptop.sanja.is.com.ua

bell@sanja.is.com.ua

bk@admin.bk

bk@mysql.r18.ru

brian@avenger.(none)

brian@brian-akers-computer.local

brian@private-client-ip-101.oz.net

carsten@tsort.bitbybit.dk

davida@isil.mysql.com

dlenev@brandersnatch.localdomain

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ dnl Process this file with autoconf to produce a configure script. 
AC_INIT(sql/mysqld.cc)

AC_CANONICAL_SYSTEM

# The Docs Makefile.am parses this line!

AM_INIT_AUTOMAKE(mysql, 4.1.5-gamma)

AM_INIT_AUTOMAKE(mysql, 4.1.6-gamma)

AM_CONFIG_HEADER(config.h)



PROTOCOL_VERSION=10

include/hash.h

+1 −1
Original line number Diff line number Diff line
@@ -47,6 +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);

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);
@@ -56,7 +57,6 @@ my_bool hash_update(HASH *hash,byte *record,byte *old_key,uint old_key_length); 
void hash_replace(HASH *hash, uint idx, byte *new_row);

my_bool hash_check(HASH *hash);			/* Only in debug library */



#define hash_clear(H) bzero((char*) (H),sizeof(*(H)))

#define hash_inited(H) ((H)->array.buffer != 0)



#ifdef	__cplusplus

include/my_sys.h

+2 −1
Original line number Diff line number Diff line
@@ -725,7 +725,8 @@ extern void my_free_lock(byte *ptr,myf flags); 
#define my_free_lock(A,B) my_free((A),(B))

#endif

#define alloc_root_inited(A) ((A)->min_malloc != 0)

#define clear_alloc_root(A) bzero((void *) (A), sizeof(MEM_ROOT))

#define ALLOC_ROOT_MIN_BLOCK_SIZE (MALLOC_OVERHEAD + sizeof(USED_MEM) + 8)

#define clear_alloc_root(A) do { (A)->free= (A)->used= (A)->pre_alloc= 0; } while(0)

extern void init_alloc_root(MEM_ROOT *mem_root, uint block_size,

			    uint pre_alloc_size);

extern gptr alloc_root(MEM_ROOT *mem_root,unsigned int Size);

libmysql/client_settings.h

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ my_bool handle_local_infile(MYSQL *mysql, const char *net_filename); 


void mysql_read_default_options(struct st_mysql_options *options,

				const char *filename,const char *group);

void mysql_detach_stmt_list(LIST **stmt_list);

MYSQL * STDCALL

cli_mysql_real_connect(MYSQL *mysql,const char *host, const char *user,

		       const char *passwd, const char *db,