Commit ae7cfe9e authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jwinstead2/mysql-4.1-clean 

into mysql.com:/home/jwinstead2/mysql-5.0


client/mysqladmin.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
include/my_pthread.h:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
parents 7826587d e50bfebe

client/mysqladmin.cc

+34 −2
Original line number Diff line number Diff line
@@ -33,7 +33,8 @@ 
#define SHUTDOWN_DEF_TIMEOUT 3600		/* Wait for shutdown */

#define MAX_TRUNC_LENGTH 3



char *host= NULL, *user= 0, *opt_password= 0;

char *host= NULL, *user= 0, *opt_password= 0,

     *default_charset= NULL;

char truncated_var_names[MAX_MYSQL_VAR][MAX_TRUNC_LENGTH];

char ex_var_names[MAX_MYSQL_VAR][FN_REFLEN];

ulonglong last_values[MAX_MYSQL_VAR];
@@ -145,6 +146,9 @@ static struct my_option my_long_options[] = 
  {"character-sets-dir", OPT_CHARSETS_DIR,

   "Directory where character sets are.", (gptr*) &charsets_dir,

   (gptr*) &charsets_dir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {"default-character-set", OPT_DEFAULT_CHARSET,

   "Set the default character set.", (gptr*) &default_charset,

   (gptr*) &default_charset, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {"help", '?', "Display this help and exit.", 0, 0, 0, GET_NO_ARG,

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

  {"host", 'h', "Connect to host.", (gptr*) &host, (gptr*) &host, 0, GET_STR,
@@ -343,6 +347,8 @@ int main(int argc,char *argv[]) 
  if (shared_memory_base_name)

    mysql_options(&mysql,MYSQL_SHARED_MEMORY_BASE_NAME,shared_memory_base_name);

#endif

  if (default_charset)

    mysql_options(&mysql, MYSQL_SET_CHARSET_NAME, default_charset);

  if (sql_connect(&mysql, option_wait))

  {

    unsigned int err= mysql_errno(&mysql);
@@ -827,13 +833,39 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv) 
      if (argv[1][0])

      {

        char *pw= argv[1];

        bool old= find_type(argv[0], &command_typelib, 2) == ADMIN_OLD_PASSWORD;

#ifdef __WIN__

        uint pw_len= strlen(pw);

        if (pw_len > 1 && pw[0] == '\'' && pw[pw_len-1] == '\'')

          printf("Warning: single quotes were not trimmed from the password by"

                 " your command\nline client, as you might have expected.\n");

#endif

        if (find_type(argv[0], &command_typelib, 2) == ADMIN_OLD_PASSWORD)

        /*

           If we don't already know to use an old-style password, see what

           the server is using

        */

        if (!old) {

          if (mysql_query(mysql, "SHOW VARIABLES LIKE 'old_passwords'")) {

            my_printf_error(0, "Could not determine old_passwords setting from server; error: '%s'",

                	    MYF(ME_BELL),mysql_error(mysql));

            return -1;

          } else {

            MYSQL_RES *res= mysql_store_result(mysql);

            if (!res) {

              my_printf_error(0, "Could not get old_passwords setting from server; error: '%s'",

        		      MYF(ME_BELL),mysql_error(mysql));

              return -1;

            }

            if (!mysql_num_rows(res)) {

              old= 1;

            } else {

              MYSQL_ROW row= mysql_fetch_row(res);

              old= !strncmp(row[1], "ON", 2);

            }

            mysql_free_result(res);

          }

        }

        if (old)

          make_scrambled_password_323(crypted_pw, pw);

        else

          make_scrambled_password(crypted_pw, pw);

client/mysqldump.c

+10 −2
Original line number Diff line number Diff line
@@ -106,7 +106,14 @@ FILE *md_result_file; 
static char *shared_memory_base_name=0;

#endif

static uint opt_protocol= 0;

static char *default_charset= (char*) MYSQL_UNIVERSAL_CLIENT_CHARSET;

/*

  Constant for detection of default value of default_charset.

  If default_charset is equal to mysql_universal_client_charset, then

  it is the default value which assigned at the very beginning of main().

*/

static const char *mysql_universal_client_charset=

  MYSQL_UNIVERSAL_CLIENT_CHARSET;

static char *default_charset;

static CHARSET_INFO *charset_info= &my_charset_latin1;

const char *default_dbug_option="d:t:o,/tmp/mysqldump.trace";

/* do we met VIEWs during tables scaning */
@@ -682,7 +689,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), 
        Set charset to the default compiled value if it hasn't

        been reset yet by --default-character-set=xxx.

      */

      if (default_charset == (char*) MYSQL_UNIVERSAL_CLIENT_CHARSET)

      if (default_charset == mysql_universal_client_charset)

        default_charset= (char*) MYSQL_DEFAULT_CHARSET_NAME;

      break;

    }
@@ -2610,6 +2617,7 @@ static my_bool getViewStructure(char *table, char* db) 
int main(int argc, char **argv)

{

  compatible_mode_normal_str[0]= 0;

  default_charset= (char *)mysql_universal_client_charset;



  MY_INIT(argv[0]);

  if (get_options(&argc, &argv))

scripts/mysql_config.sh

+4 −2
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ client_libs='@CLIENT_LIBS@' 


libs="$ldflags -L$pkglibdir -lmysqlclient $client_libs"

libs=`echo "$libs" | sed -e 's;  \+; ;g' | sed -e 's;^ *;;' | sed -e 's; *\$;;'`

libs_r="$ldflags -L$pkglibdir -lmysqlclient_r @LIBS@ @openssl_libs@"

libs_r="$ldflags -L$pkglibdir -lmysqlclient_r @LIBS@ @ZLIB_LIBS@ @openssl_libs@"

libs_r=`echo "$libs_r" | sed -e 's;  \+; ;g' | sed -e 's;^ *;;' | sed -e 's; *\$;;'`

cflags="-I$pkgincludedir @CFLAGS@ " #note: end space!

include="-I$pkgincludedir"
@@ -100,6 +100,8 @@ for remove in DDBUG_OFF DSAFEMALLOC USAFEMALLOC DSAFE_MUTEX \ 
              DPEDANTIC_SAFEMALLOC DUNIV_MUST_NOT_INLINE DFORCE_INIT_OF_VARS \

              DEXTRA_DEBUG DHAVE_purify 'O[0-9]' 'W[-A-Za-z]*'

do

  # The first option we might strip will always have a space before it because

  # we set -I$pkgincludedir as the first option

  cflags=`echo "$cflags"|sed -e "s/ -$remove  */ /g"` 

done

cflags=`echo "$cflags"|sed -e 's/ *\$//'`

scripts/mysqld_safe.sh

+2 −2
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ parse_arguments() { 


MY_PWD=`pwd`

# Check if we are starting this relative (for the binary release)

if test -d $MY_PWD/data/mysql -a -f ./share/mysql/english/errmsg.sys -a \

if test -f ./share/mysql/english/errmsg.sys -a \

 -x ./bin/mysqld

then

  MY_BASEDIR_VERSION=$MY_PWD		# Where bin, share and data are
@@ -93,7 +93,7 @@ then 
    defaults="--defaults-extra-file=$DATADIR/my.cnf"

  fi

# Check if this is a 'moved install directory'

elif test -f ./var/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \

elif test -f ./share/mysql/english/errmsg.sys -a \

 -x ./libexec/mysqld

then

  MY_BASEDIR_VERSION=$MY_PWD		# Where libexec, share and var are