Commit 2a2f219c authored by unknown's avatar unknown
Browse files

Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


configure.in:
  Auto merged
client/mysqldump.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/table.cc:
  Auto merged
storage/ndb/include/util/OutputStream.hpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
parents 08f598a1 a47ef7fc

.bzrignore

+5 −0
Original line number Diff line number Diff line
@@ -212,6 +212,11 @@ bdb/dist/autom4te.cache/requests 
bdb/dist/autom4te.cache/traces.0

bdb/dist/config.hin

bdb/dist/configure

bdb/dist/db.h

bdb/dist/db_config.h

bdb/dist/db_cxx.h

bdb/dist/db_int.h

bdb/dist/include.tcl

bdb/dist/tags

bdb/dist/template/db_server_proc

bdb/dist/template/gen_client_ret

BUILD/compile-pentium-gcov

+3 −0
Original line number Diff line number Diff line
@@ -9,6 +9,9 @@ then 
  if test "$CCACHE_VER" == "2.4-gcov"

  then

    CCACHE_GCOV_VERSION_ENABLED=1

  else

    CCACHE_DISABLE=1

    export CCACHE_DISABLE

  fi

fi

export CCACHE_GCOV_VERSION_ENABLED

Makefile.am

+4 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ SUBDIRS = . include @docs_dirs@ @zlib_dir@ \ 
			@sql_union_dirs@ unittest storage plugin \

			@sql_server@ scripts @man_dirs@ tests \

			netware @libmysqld_dirs@ \

			mysql-test support-files @tools_dirs@ \

			mysql-test support-files sql-bench @tools_dirs@ \

			win



DIST_SUBDIRS =		$(SUBDIRS) BUILD
@@ -85,11 +85,14 @@ bin-dist: all 
# Create initial database files for Windows installations.

dist-hook:

	rm -rf `find $(distdir) -type d -name SCCS -print`

	rm -f  `find $(distdir) -type l -print`

	if echo "$(distdir)" | grep -q '^/' ; then \

          mkdir -p "$(distdir)/win" ; \

	  scripts/mysql_install_db --no-defaults --windows \

		--basedir=$(top_srcdir) \

		--datadir="$(distdir)/win/data"; \

	else \

          mkdir -p "$$(pwd)/$(distdir)/win" ; \

	  scripts/mysql_install_db --no-defaults --windows \

		 --basedir=$(top_srcdir) \

		 --datadir="$$(pwd)/$(distdir)/win/data"; \

client/mysql.cc

+0 −1
Original line number Diff line number Diff line
@@ -3437,7 +3437,6 @@ server_version_string(MYSQL *mysql) 
  {

    char *bufp = buf;

    MYSQL_RES *result;

    MYSQL_ROW cur;



    bufp = strnmov(buf, mysql_get_server_info(mysql), sizeof buf);

client/mysqldump.c

+1 −1
Original line number Diff line number Diff line
@@ -2157,7 +2157,7 @@ static uint get_table_structure(char *table, char *db, char *table_type, 
    write_footer(sql_file);

    my_fclose(sql_file, MYF(MY_WME));

  }

  DBUG_RETURN(num_fields);

  DBUG_RETURN((uint) num_fields);

} /* get_table_structure */