Commit 4233d3a3 authored by monty@mashka.mysql.fi's avatar monty@mashka.mysql.fi
Browse files

merge

parents 7b838054 dddc20d9

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -480,3 +480,4 @@ mit-pthreads/machdep.c 
mit-pthreads/pg++

mit-pthreads/pgcc

scripts/mysql_tableinfo

libmysql/net.c

Docs/manual.texi

+528 −213

File changed.

Preview size limit exceeded, changes collapsed.

client/client_priv.h

+1 −1
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ 
#include <my_global.h>

#include <my_sys.h> 

#include <m_string.h>

#include <mysql_embed.h>

#include <mysql.h>

#include <mysql_embed.h>

#include <errmsg.h>

#include <my_getopt.h>

client/mysql.cc

+5 −5
Original line number Diff line number Diff line
@@ -1487,7 +1487,7 @@ com_go(String *buffer,char *line __attribute__((unused))) 


static void init_pager()

{

#if !defined( __WIN__) && !defined( OS2) && !(defined(HAVE_mit_thread) && defined(THREAD))

#if !defined( __WIN__) && !defined( OS2) && (!defined(HAVE_mit_thread) || !defined(THREAD))

  if (!opt_nopager)

  {

    if (!(PAGER= popen(pager, "w")))
@@ -2336,11 +2336,11 @@ com_status(String *buffer __attribute__((unused)), 


  if ((status=mysql_stat(&mysql)) && !mysql_error(&mysql)[0])

  {

    char *pos,buff[40];

    ulong sec;

    pos=strchr(status,' ');

    *pos++=0;

    tee_fprintf(stdout, "%s\t\t\t", status);	/* print label */

    char buff[40];

    const char *pos= strchr(status,' ');

    /* print label */

    tee_fprintf(stdout, "%.*s\t\t\t", (int) (pos-status), status);

    if ((status=str2int(pos,10,0,LONG_MAX,(long*) &sec)))

    {

      nice_time((double) sec,buff,0);

client/mysqladmin.c

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

#endif



#define ADMIN_VERSION "8.35"

#define ADMIN_VERSION "8.36"

#define MAX_MYSQL_VAR 128

#define SHUTDOWN_DEF_TIMEOUT 3600		/* Wait for shutdown */

#define MAX_TRUNC_LENGTH 3
@@ -588,7 +588,7 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv) 
      MYSQL_ROW row;



      new_line=1;

      if (mysql_query(mysql,"show variables") ||

      if (mysql_query(mysql,"show /*!40003 GLOBAL */ variables") ||

	  !(res=mysql_store_result(mysql)))

      {

	my_printf_error(0,"unable to show variables; error: '%s'",MYF(ME_BELL),