Commit a660fd11 authored by unknown's avatar unknown
Browse files

Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1
parents b8c01c57 55ae27a5

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 change ndb version below and update version.c in ndb

AM_INIT_AUTOMAKE(mysql, 5.1.7-beta)

AM_INIT_AUTOMAKE(mysql, 5.1.8-beta)

AM_CONFIG_HEADER(config.h)



PROTOCOL_VERSION=10

scripts/make_binary_distribution.sh

+2 −1
Original line number Diff line number Diff line
@@ -131,7 +131,8 @@ BIN_FILES="extra/comp_err$BS extra/replace$BS extra/perror$BS \ 
  extra/resolve_stack_dump$BS extra/mysql_waitpid$BS \

  storage/myisam/myisamchk$BS storage/myisam/myisampack$BS \

  storage/myisam/myisamlog$BS storage/myisam/myisam_ftdump$BS \

  sql/mysqld$BS sql/mysqld-debug$BS sql/mysql_tzinfo_to_sql$BS \

  sql/mysqld$BS sql/mysqld-debug$BS sql/mysqld-max$BS \

  sql/mysql_tzinfo_to_sql$BS \

  server-tools/instance-manager/mysqlmanager$BS \

  client/mysql$BS client/mysqlshow$BS client/mysqladmin$BS \

  client/mysqlslap$BS \