Commit 8b2d0133 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.1 

into  mockturtle.local:/home/dlenev/src/mysql-5.1-merge
parents 7f2a0175 61e67472

BUILD/SETUP.sh

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ if [ "x$warning_mode" != "xpedantic" ]; then 
# Both C and C++ warnings

  warnings="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W"

  warnings="$warnings -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare"

  warnings="$warnings -Wwrite-strings -Wunused-function -Wunused-label -Wunused-value -Wunused-variable -Wshadow"

  warnings="$warnings -Wwrite-strings -Wunused-function -Wunused-label -Wunused-value -Wunused-variable"

# C warnings

  c_warnings="$warnings -Wunused-parameter"

# C++ warnings

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc) 
AC_CANONICAL_SYSTEM

# The Docs Makefile.am parses this line!

# remember to also update version.c in ndb

AM_INIT_AUTOMAKE(mysql, 5.1.15-beta)

AM_INIT_AUTOMAKE(mysql, 5.1.16-beta)

AM_CONFIG_HEADER(config.h)



PROTOCOL_VERSION=10