Commit eaa10e76 authored by Ramil Kalimullin's avatar Ramil Kalimullin
Browse files

merge

parents dc6a5ff8 bed942c9

.bzr-mysql/default.conf

+1 −1
Original line number Diff line number Diff line 
[MYSQL]

post_commit_to = "commits@lists.mysql.com"

post_push_to = "commits@lists.mysql.com"

tree_name = "mysql-5.1-bugteam"
 
tree_name = "mysql-5.0-bugteam"

configure.in

+5 −2
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.0.70)

AM_INIT_AUTOMAKE(mysql, 5.0.72)

AM_CONFIG_HEADER([include/config.h:config.h.in])



PROTOCOL_VERSION=10
@@ -23,7 +23,7 @@ NDB_SHARED_LIB_VERSION=$NDB_SHARED_LIB_MAJOR_VERSION:0:0 
# ndb version

NDB_VERSION_MAJOR=5

NDB_VERSION_MINOR=0

NDB_VERSION_BUILD=70

NDB_VERSION_BUILD=72

NDB_VERSION_STATUS=""



# Set all version vars based on $VERSION. How do we do this more elegant ?
@@ -2810,6 +2810,9 @@ EOF 
    AC_CONFIG_SUBDIRS(innobase)

  fi



  # "innochecksum" is not in the "innobase/" subdirectory, but should be switched

  AM_CONDITIONAL([BUILD_INNODB_TOOLS], [test X"$have_innodb" = Xyes])



case $SYSTEM_TYPE-$MACHINE_TYPE-$ac_cv_prog_gcc-$have_ndbcluster in

  *solaris*-i?86-no-yes)

  if $CC -xildon 2>&1 | grep "illegal option" >/dev/null

extra/Makefile.am

+6 −1
Original line number Diff line number Diff line
@@ -45,7 +45,12 @@ $(top_builddir)/include/mysqld_ername.h: $(top_builddir)/include/mysqld_error.h 
$(top_builddir)/include/sql_state.h: $(top_builddir)/include/mysqld_error.h



bin_PROGRAMS =		replace comp_err perror resolveip my_print_defaults \

			resolve_stack_dump mysql_waitpid innochecksum

			resolve_stack_dump mysql_waitpid 

# "innochecksum" should be switched

if BUILD_INNODB_TOOLS

bin_PROGRAMS += innochecksum

endif



noinst_PROGRAMS =	charset2html

EXTRA_DIST =	CMakeLists.txt

man/Makefile.am

+6 −0
Original line number Diff line number Diff line
@@ -21,5 +21,11 @@ man1_MANS = @man1_files@ 
man8_MANS =   @man8_files@

EXTRA_DIST =  $(man1_MANS) $(man8_MANS)



# 1) not needed in Unix binary packages,

# 2) programs not generated in 5.0:

install-data-hook:

	rm -f $(DESTDIR)$(manlibdir)/man1/make_win_*

	rm -f $(DESTDIR)$(manlibdir)/man1/ndb_print_*



# Don't update the files from bitkeeper

%::SCCS/s.%

mysql-test/include/ndb_backup_print.inc

+2 −1
Original line number Diff line number Diff line 
--exec $NDB_TOOLS_DIR/ndb_restore --no-defaults $ndb_restore_opts -b $the_backup_id -n 1 $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id $ndb_restore_filter > $MYSQLTEST_VARDIR/tmp/tmp.dat

--exec $NDB_TOOLS_DIR/ndb_restore --no-defaults $ndb_restore_opts -b $the_backup_id -n 2 $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id $ndb_restore_filter >> $MYSQLTEST_VARDIR/tmp/tmp.dat

--exec sort $MYSQLTEST_VARDIR/tmp/tmp.dat

--exec rm -f $MYSQLTEST_VARDIR/tmp/tmp.dat

--error 0,1

--remove_file $MYSQLTEST_VARDIR/tmp/tmp.dat

--let ndb_restore_opts=

--let ndb_restore_filter=