Commit 5b9edfa1 authored by unknown's avatar unknown
Browse files

Merge mskold@build.mysql.com:/home/bk/mysql-4.1 

into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1


sql/ha_ndbcluster.cc:
  Auto merged
parents ad147662 ccf52b4f

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 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

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,

libmysql/libmysql.c

+21 −12
Original line number Diff line number Diff line
@@ -662,6 +662,7 @@ my_bool STDCALL mysql_change_user(MYSQL *mysql, const char *user, 
				  const char *passwd, const char *db)

{

  char buff[512],*end=buff;

  int rc;

  DBUG_ENTER("mysql_change_user");



  if (!user)
@@ -695,8 +696,15 @@ my_bool STDCALL mysql_change_user(MYSQL *mysql, const char *user, 
  /* Write authentication package */

  simple_command(mysql,COM_CHANGE_USER, buff,(ulong) (end-buff),1);



  if ((*mysql->methods->read_change_user_result)(mysql, buff, passwd))

    DBUG_RETURN(1);

  rc= (*mysql->methods->read_change_user_result)(mysql, buff, passwd);



  /*

    The server will close all statements no matter was the attempt

    to change user successful or not.

  */

  mysql_detach_stmt_list(&mysql->stmts);

  if (rc == 0)

  {

    /* Free old connect information */

    my_free(mysql->user,MYF(MY_ALLOW_ZERO_PTR));

    my_free(mysql->passwd,MYF(MY_ALLOW_ZERO_PTR));
@@ -706,7 +714,8 @@ my_bool STDCALL mysql_change_user(MYSQL *mysql, const char *user, 
    mysql->user=  my_strdup(user,MYF(MY_WME));

    mysql->passwd=my_strdup(passwd,MYF(MY_WME));

    mysql->db=    db ? my_strdup(db,MYF(MY_WME)) : 0;

  DBUG_RETURN(0);

  }

  DBUG_RETURN(rc);

}



#if defined(HAVE_GETPWUID) && defined(NO_GETPWUID_DECL)