Commit f2d930c3 authored by monty@donna.mysql.com's avatar monty@donna.mysql.com
Browse files

Merge

parents b9fe1f14 2776500c

Docs/manual.ja.texi

0 → 100644
+38699 −0

File added.

Preview size limit exceeded, changes collapsed.

Docs/manual.texi

+203 −67

File changed.

Preview size limit exceeded, changes collapsed.

client/mysqladmin.c

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

#endif



#define ADMIN_VERSION "8.8"

#define ADMIN_VERSION "8.9"

#define MAX_MYSQL_VAR 64

#define MAX_TIME_TO_WAIT 3600			/* Wait for shutdown */

#define MAX_TRUNC_LENGTH 3
@@ -1077,9 +1077,11 @@ static my_bool get_pidfile(MYSQL *mysql, char *pidfile) 
  result = mysql_store_result(mysql);

  if (result)

  {

    strmov(pidfile, mysql_fetch_row(result)[1]);

    MYSQL_ROW row=mysql_fetch_row(result);

    if (row)

      strmov(pidfile, row[1]);

    mysql_free_result(result);

    return 0;

    return row == 0;				/* Error if row = 0 */

  }

  return 1;					/* Error */

}

client/mysqldump.c

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
**   Tnu Samuel  <tonu@please.do.not.remove.this.spam.ee>

**/



#define DUMP_VERSION "8.9"

#define DUMP_VERSION "8.10"



#include <global.h>

#include <my_sys.h>

configure.in

+2 −2
Original line number Diff line number Diff line
@@ -4,13 +4,13 @@ dnl Process this file with autoconf to produce a configure script. 
AC_INIT(sql/mysqld.cc)

AC_CANONICAL_SYSTEM

# The Docs Makefile.am parses this line!

AM_INIT_AUTOMAKE(mysql, 3.23.24-beta)

AM_INIT_AUTOMAKE(mysql, 3.23.25-beta)

AM_CONFIG_HEADER(config.h)



PROTOCOL_VERSION=10

DOT_FRM_VERSION=6

# See the libtool docs for information on how to do shared lib versions.

SHARED_LIB_VERSION=9:0:0

SHARED_LIB_VERSION=10:0:0



# Set all version vars based on $VERSION. How do we do this more elegant ?

# Remember that regexps needs to quote [ and ] since this is run through m4