Commit 089595c5 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  mysql.com:/mnt/raid/MySQL/devel/5.1-rt-wl3158-merged


BitKeeper/deleted/.del-im_options_set.result~59278f56be61d921:
  Auto merged
include/my_sys.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
BitKeeper/deleted/.del-im_options_unset.result~20a4790cd3c70a4f:
  Auto merged
mysql-test/r/im_daemon_life_cycle.result:
  Auto merged
mysql-test/r/im_life_cycle.result:
  Auto merged
server-tools/instance-manager/Makefile.am:
  Auto merged
server-tools/instance-manager/mysqlmanager.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/structs.h:
  Auto merged
mysql-test/r/im_utils.result:
  Auto merged
server-tools/instance-manager/instance_options.cc:
  Manually merged.
server-tools/instance-manager/instance_options.h:
  Manually merged.
server-tools/instance-manager/manager.cc:
  Manually merged.
server-tools/instance-manager/manager.h:
  Manually merged.
server-tools/instance-manager/options.cc:
  Manually merged.
server-tools/instance-manager/options.h:
  Manually merged.
parents 57b60b14 0276916b

client/get_password.c

+2 −2
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ 
/* were just going to fake it here and get input from

   the keyboard */



char *get_tty_password(char *opt_message)

char *get_tty_password(const char *opt_message)

{

  char to[80];

  char *pos=to,*end=to+sizeof(to)-1;
@@ -150,7 +150,7 @@ static void get_password(char *to,uint length,int fd,bool echo) 
#endif /* ! HAVE_GETPASS */





char *get_tty_password(char *opt_message)

char *get_tty_password(const char *opt_message)

{

#ifdef HAVE_GETPASS

  char *passbuff;

include/m_string.h

+18 −0
Original line number Diff line number Diff line
@@ -246,4 +246,22 @@ extern int my_snprintf(char* to, size_t n, const char* fmt, ...); 
#if defined(__cplusplus)

}

#endif



/*

  LEX_STRING -- a pair of a C-string and its length.



  NOTE: this exactly form of declaration is required for some C-compilers

  (for one, Sun C 5.7 2005/01/07). Unfortunatelt with such declaration

  LEX_STRING can not be forward declared.

*/



typedef struct

{

  char *str;

  uint length;

} LEX_STRING;



#define STRING_WITH_LEN(X) (X), ((uint) (sizeof(X) - 1))

#define C_STRING_WITH_SIZE(X) ((char *) (X)), ((uint) (sizeof(X) - 1))



#endif

include/my_sys.h

+4 −0
Original line number Diff line number Diff line
@@ -77,6 +77,10 @@ extern int NEAR my_errno; /* Last error in mysys */ 
#define MY_GIVE_INFO	2	/* Give time info about process*/

#define MY_DONT_FREE_DBUG 4     /* Do not call DBUG_END() in my_end() */



#define MY_REMOVE_NONE    0     /* Params for modify_defaults_file */

#define MY_REMOVE_OPTION  1

#define MY_REMOVE_SECTION 2



#define ME_HIGHBYTE	8	/* Shift for colours */

#define ME_NOCUR	1	/* Don't use curses message */

#define ME_OLDWIN	2	/* Use old window */

include/mysql_com.h

+1 −7
Original line number Diff line number Diff line
@@ -423,17 +423,11 @@ char *octet2hex(char *to, const char *str, unsigned int len); 


/* end of password.c */



char *get_tty_password(char *opt_message);

char *get_tty_password(const char *opt_message);

const char *mysql_errno_to_sqlstate(unsigned int mysql_errno);



/* Some other useful functions */



my_bool my_init(void);

extern int modify_defaults_file(const char *file_location, const char *option,

                                const char *option_value,

                                const char *section_name, int remove_option);

int load_defaults(const char *conf_file, const char **groups,

		  int *argc, char ***argv);

my_bool my_thread_init(void);

void my_thread_end(void);

libmysql/get_password.c

+2 −2
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ 
#define _cputs(A) putstring(A)

#endif



char *get_tty_password(char *opt_message)

char *get_tty_password(const char *opt_message)

{

  char to[80];

  char *pos=to,*end=to+sizeof(to)-1;
@@ -159,7 +159,7 @@ static void get_password(char *to,uint length,int fd,bool echo) 
#endif /* ! HAVE_GETPASS */





char *get_tty_password(char *opt_message)

char *get_tty_password(const char *opt_message)

{

#ifdef HAVE_GETPASS

  char *passbuff;