Commit c9f8c87f authored by unknown's avatar unknown
Browse files

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

into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
parents 7b7f0e2f 29b3ae4d

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -140,6 +140,7 @@ msvensson@build.mysql.com 
mwagner@cash.mwagner.org

mwagner@evoq.mwagner.org

mwagner@here.mwagner.org

mwagner@mysql.com

mwagner@work.mysql.com

mydev@mysql.com

mysql@home.(none)

client/mysqladmin.cc

+18 −2
Original line number Diff line number Diff line
@@ -125,6 +125,10 @@ static TYPELIB command_typelib= 


static struct my_option my_long_options[] =

{

#ifdef __NETWARE__

  {"autoclose", 'a', " Auto close the screen on exit for NetWare",

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

#endif

  {"count", 'c',

   "Number of iterations to make. This works with -i (--sleep) only.",

   (gptr*) &nr_iterations, (gptr*) &nr_iterations, 0, GET_UINT,
@@ -218,6 +222,11 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), 
  int error = 0;



  switch(optid) {

#ifdef __NETWARE__

  case 'a':

   setscreenmode(SCR_AUTOCLOSE_ON_EXIT);      // auto close the screen /

   break;

#endif

  case 'c':

    opt_count_iterations= 1;

    break;
@@ -816,10 +825,17 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv) 
      }

      if (argv[1][0])

      {

        char *pw= argv[1];

#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)

          make_scrambled_password_323(crypted_pw, argv[1]);

          make_scrambled_password_323(crypted_pw, pw);

        else

          make_scrambled_password(crypted_pw, argv[1]);

          make_scrambled_password(crypted_pw, pw);

      }

      else

	crypted_pw[0]=0;			/* No password */

client/mysqldump.c

+1 −1
Original line number Diff line number Diff line
@@ -1890,7 +1890,7 @@ static int init_dumping(char *database) 
        MYSQL_ROW row;

        MYSQL_RES *dbinfo;



        sprintf(qbuf,"SHOW CREATE DATABASE WITH IF NOT EXISTS %s",

        sprintf(qbuf,"SHOW CREATE DATABASE IF NOT EXISTS %s",

		qdatabase);



        if (mysql_query_with_error_report(sock, &dbinfo, qbuf))

heap/hp_create.c

+7 −0
Original line number Diff line number Diff line
@@ -41,6 +41,13 @@ int heap_create(const char *name, uint keys, HP_KEYDEF *keydef, 
  {

    HP_KEYDEF *keyinfo;

    DBUG_PRINT("info",("Initializing new table"));

    

    /*

      We have to store sometimes byte* del_link in records,

      so the record length should be at least sizeof(byte*)

    */

    set_if_bigger(reclength, sizeof (byte*));

    

    for (i= key_segs= max_length= 0, keyinfo= keydef; i < keys; i++, keyinfo++)

    {

      bzero((char*) &keyinfo->block,sizeof(keyinfo->block));

innobase/configure.in

+3 −1
Original line number Diff line number Diff line
@@ -41,7 +41,9 @@ AC_CHECK_SIZEOF(long, 4) 
AC_CHECK_SIZEOF(void*, 4)

AC_CHECK_FUNCS(sched_yield)

AC_CHECK_FUNCS(fdatasync)

#AC_CHECK_FUNCS(localtime_r)	# Already checked by MySQL

AC_CHECK_FUNCS(localtime_r)

#AC_CHECK_FUNCS(readdir_r) MySQL checks that it has also the right args.

# Some versions of Unix only take 2 arguments.

#AC_C_INLINE  Already checked in MySQL

AC_C_BIGENDIAN