Skip to content

M
MariaDB
Commit 4fd3b03e authored by dlenev@mockturtle.local's avatar dlenev@mockturtle.local
Browse files
Options

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

into  mockturtle.local:/home/dlenev/src/mysql-5.1-merge
parents 631d3c9c 70a74003
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
BUILD/SETUP.sh
View file @ 4fd3b03e
...@@ -92,7 +92,7 @@ if [ "x$warning_mode" != "xpedantic" ]; then ...@@ -92,7 +92,7 @@ if [ "x$warning_mode" != "xpedantic" ]; then
# Both C and C++ warnings # Both C and C++ warnings
warnings="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W" warnings="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W"
warnings="$warnings -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare" 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
c_warnings="$warnings -Wunused-parameter" c_warnings="$warnings -Wunused-parameter"
# C++ warnings # C++ warnings
......
configure.in
View file @ 4fd3b03e
...@@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc) ...@@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc)
AC_CANONICAL_SYSTEM AC_CANONICAL_SYSTEM
# The Docs Makefile.am parses this line! # The Docs Makefile.am parses this line!
# remember to also update version.c in ndb # 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) AM_CONFIG_HEADER(config.h)
PROTOCOL_VERSION=10 PROTOCOL_VERSION=10
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7