Commit 21e7c668 authored by monty@donna.mysql.fi's avatar monty@donna.mysql.fi
Browse files

Portability fixes for Ia64 and Sgi compiler 

DROP DATABASE in mysqladmin asks for confirmation (again)
Added examined_rows to slow query log
SHOW CREATE for TEMPORARY table
parent 97c39276

Docs/manual.texi

+152 −75

File changed.

Preview size limit exceeded, changes collapsed.

acinclude.m4

+4 −3
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ fi 


AC_DEFUN(MYSQL_PTHREAD_YIELD,

[AC_CACHE_CHECK([if pthread_yield takes zero arguments], ac_cv_pthread_yield_zero_arg,

[AC_TRY_COMPILE([#define _GNU_SOURCE

[AC_TRY_LINK([#define _GNU_SOURCE

#include <pthread.h>

#ifdef __cplusplus

extern "C"
@@ -214,7 +214,7 @@ then 
fi

]

[AC_CACHE_CHECK([if pthread_yield takes 1 argument], ac_cv_pthread_yield_one_arg,

[AC_TRY_COMPILE([#define _GNU_SOURCE

[AC_TRY_LINK([#define _GNU_SOURCE

#include <pthread.h>

#ifdef __cplusplus

extern "C"
@@ -550,7 +550,8 @@ AC_DEFUN(MYSQL_STACK_DIRECTION, 


AC_DEFUN(MYSQL_FUNC_ALLOCA,

[

# Since we have heard that alloca fails on IRIX never define it on a SGI machine

# Since we have heard that alloca fails on IRIX never define it on a

# SGI machine

if test ! "$host_vendor" = "sgi"

then

 AC_REQUIRE_CPP()dnl Set CPP; we run AC_EGREP_CPP conditionally.

client/errmsg.c

+9 −5
Original line number Diff line number Diff line
@@ -36,14 +36,16 @@ const char *client_errors[]= 
  "MySQL client got out of memory",

  "Wrong host info",

  "Localhost via UNIX socket",

  "%s via TCP/IP",

  "%-.64s via TCP/IP",

  "Error in server handshake",

  "Lost connection to MySQL server during query",

  "Commands out of sync; You can't run this command now",

  "Verbindung ueber Named Pipe; Host: %-.64s",

  "Kann nicht auf Named Pipe warten. Host: %-.64s  pipe: %-.32s (%lu)",

  "Kann Named Pipe nicht oeffnen. Host: %-.64s  pipe: %-.32s (%lu)",

  "Kann den Status der Named Pipe nicht setzen.  Host: %-.64s  pipe: %-.32s (%lu)"

  "Kann den Status der Named Pipe nicht setzen.  Host: %-.64s  pipe: %-.32s (%lu)",

  "Can't initialize character set %-.64s (path: %-.64s)",

  "Got packet bigger than 'max_allowed_packet'"

};



#else /* ENGLISH */
@@ -60,19 +62,21 @@ const char *client_errors[]= 
  "MySQL client run out of memory",

  "Wrong host info",

  "Localhost via UNIX socket",

  "%s via TCP/IP",

  "%-.64s via TCP/IP",

  "Error in server handshake",

  "Lost connection to MySQL server during query",

  "Commands out of sync;  You can't run this command now",

  "%s via named pipe",

  "%-.64s via named pipe",

  "Can't wait for named pipe to host: %-.64s  pipe: %-.32s (%lu)",

  "Can't open named pipe to host: %-.64s  pipe: %-.32s (%lu)",

  "Can't set state of named pipe to host: %-.64s  pipe: %-.32s (%lu)",

  "Can't initialize character set %-.64s (path: %-.64s)",

  "Got packet bigger than 'max_allowed_packet'"

};

#endif





void init_client_errs(void)

{

  errmsg[CLIENT_ERRMAP] = &client_errors[0];

  my_errmsg[CLIENT_ERRMAP] = &client_errors[0];

}

client/mysqladmin.c

+5 −9
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
#include <my_pthread.h>				/* because of signal()	*/

#endif



#define ADMIN_VERSION "8.19"

#define ADMIN_VERSION "8.20"

#define MAX_MYSQL_VAR 64

#define SHUTDOWN_DEF_TIMEOUT 3600		/* Wait for shutdown */

#define MAX_TRUNC_LENGTH 3
@@ -423,13 +423,8 @@ static my_bool execute_commands(MYSQL *mysql,int argc, char **argv) 
	my_printf_error(0,"Too few arguments to drop",MYF(ME_BELL));

	return 1;

      }

      sprintf(buff,"drop database `%.*s`",FN_REFLEN,argv[1]);

      if (mysql_query(mysql,buff))

      {

	my_printf_error(0,"DROP DATABASE failed; error: '%-.200s'",

			MYF(ME_BELL), mysql_error(mysql));

      if (drop_db(mysql,argv[1]))

	return 1;

      }

      argc--; argv++;

      break;

    }
@@ -867,7 +862,8 @@ static int drop_db(MYSQL *mysql, const char *db) 
  {

    puts("Dropping the database is potentially a very bad thing to do.");

    puts("Any data stored in the database will be destroyed.\n");

    printf("Do you really want to drop the '%s' database [y/N]\n",db);

    printf("Do you really want to drop the '%s' database [y/N] ",db);

    fflush(stdout);

    VOID(fgets(buf,sizeof(buf)-1,stdin));

    if ((*buf != 'y') && (*buf != 'Y'))

    {
@@ -878,7 +874,7 @@ static int drop_db(MYSQL *mysql, const char *db) 
  sprintf(name_buff,"drop database %.*s",FN_REFLEN,db);

  if (mysql_query(mysql,name_buff))

  {

    my_printf_error(0,"drop of '%s' failed;\nerror: '%s'",MYF(ME_BELL),

    my_printf_error(0,"DROP DATABASE %s failed;\nerror: '%s'",MYF(ME_BELL),

		    db,mysql_error(mysql));

    return 1;

  }

client/mysqltest.c

+1 −1
Original line number Diff line number Diff line
@@ -569,7 +569,7 @@ int eval_expr(VAR* v, const char* p, const char** p_end) 
  else

    {

      v->str_val = (char*)p;

      v->str_val_len = (p_end && *p_end) ? *p_end - p : strlen(p);

      v->str_val_len = (p_end && *p_end) ? (int) (*p_end - p) : (int) strlen(p);

      v->int_val=atoi(p);

      v->int_dirty=0;

      return 0;