Commit 7d3c939e authored by unknown's avatar unknown
Browse files

Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.0 

into  mysql.com:/home/hartmut/projects/mysql/dev/5.0


ndb/tools/ndb_config.cpp:
  Auto merged
parents 0585fcbe 39ba8376

BUILD/SETUP.sh

+3 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ prefix_configs="--prefix=/usr/local/mysql" 
just_print=

just_configure=

full_debug=

if test ! -z $MYSQL_BUILD_PREFIX

if test -n "$MYSQL_BUILD_PREFIX"

then

  prefix_configs="--prefix=$MYSQL_BUILD_PREFIX"

fi
@@ -53,8 +53,10 @@ global_warnings="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wch 
c_warnings="$global_warnings -Wunused"

cxx_warnings="$global_warnings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor"

base_max_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-openssl --with-big-tables --with-blackhole-storage-engine --with-federated-storage-engine --with-csv-storage-engine"

base_max_no_ndb_configs="--with-innodb --with-berkeley-db --without-ndbcluster --with-archive-storage-engine --with-openssl --with-big-tables --with-blackhole-storage-engine --with-federated-storage-engine --with-csv-storage-engine"

max_leave_isam_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-federated-storage-engine --with-blackhole-storage-engine --with-csv-storage-engine --with-openssl --with-embedded-server --with-big-tables"

max_configs="$base_max_configs --with-embedded-server"

max_no_ndb_configs="$base_max_no_ndb_configs --with-embedded-server"



path=`dirname $0`

. "$path/check-cpu"

BUILD/compile-pentium-debug-max-no-ndb

0 → 100755
+11 −0
Original line number Diff line number Diff line 
#! /bin/sh



path=`dirname $0`

. "$path/SETUP.sh" $@ --with-debug=full



extra_flags="$pentium_cflags $debug_cflags $max_cflags"

c_warnings="$c_warnings $debug_extra_warnings"

cxx_warnings="$cxx_warnings $debug_extra_warnings"

extra_configs="$pentium_configs $debug_configs $max_no_ndb_configs"



. "$path/FINISH.sh"

BUILD/compile-ppc-debug-max-no-ndb

0 → 100755
+11 −0
Original line number Diff line number Diff line 
#! /bin/sh



path=`dirname $0`

. "$path/SETUP.sh"



extra_flags="$ppc_cflags $debug_cflags $max_cflags"

c_warnings="$c_warnings $debug_extra_warnings"

cxx_warnings="$cxx_warnings $debug_extra_warnings"

extra_configs="$debug_configs $max_no_ndb_configs"



. "$path/FINISH.sh"

Makefile.am

+15 −4
Original line number Diff line number Diff line
@@ -107,15 +107,26 @@ MYSQL_TEST_RUN_ARGS = --manager-port=$(MYSQL_TEST_MANAGER_PORT) \ 
				--master_port=$(MYSQL_TEST_MASTER_PORT) \

				--slave_port=$(MYSQL_TEST_SLAVE_PORT) \

				--ndbcluster_port=$(MYSQL_TEST_NDB_PORT)



test:

	cd mysql-test ; \

	./mysql-test-run.pl $(MYSQL_TEST_RUN_ARGS) && \

	./mysql-test-run.pl --ps-protocol $(MYSQL_TEST_RUN_ARGS)

	./mysql-test-run $(MYSQL_TEST_RUN_ARGS) && \

	./mysql-test-run $(MYSQL_TEST_RUN_ARGS) --ps-protocol



test-force:

	cd mysql-test ; \

	./mysql-test-run --force $(MYSQL_TEST_RUN_ARGS) ; \

	./mysql-test-run --ps-protocol --force $(MYSQL_TEST_RUN_ARGS)

	./mysql-test-run $(MYSQL_TEST_RUN_ARGS) --force ; \

	./mysql-test-run $(MYSQL_TEST_RUN_ARGS) --ps-protocol --force



test-pl:

	cd mysql-test ; \

	./mysql-test-run.pl $(MYSQL_TEST_RUN_ARGS) && \

	./mysql-test-run.pl $(MYSQL_TEST_RUN_ARGS) --ps-protocol



test-force-pl:

	cd mysql-test ; \

	./mysql-test-run.pl $(MYSQL_TEST_RUN_ARGS) --force ; \

	./mysql-test-run.pl $(MYSQL_TEST_RUN_ARGS) --ps-protocol --force



# Don't update the files from bitkeeper

%::SCCS/s.%

client/mysql.cc

+2 −2
Original line number Diff line number Diff line
@@ -1014,13 +1014,13 @@ static int read_and_execute(bool interactive) 
      unsigned long clen;

      do

      {

        line= my_cgets(tmpbuf.c_ptr(), tmpbuf.alloced_length(), &clen);

        line= my_cgets(tmpbuf.ptr(), tmpbuf.alloced_length()-1, &clen);

        buffer.append(line, clen);

        /* 

           if we got buffer fully filled than there is a chance that

           something else is still in console input buffer

        */

      } while (tmpbuf.alloced_length() <= clen + 1);

      } while (tmpbuf.alloced_length() <= clen);

      line= buffer.c_ptr();

#else /* OS2 */

      buffer.length(0);