Commit 4ba66405 authored by unknown's avatar unknown
Browse files

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

into  eel.(none):/home/jonas/src/mysql-5.1-push


sql/ha_innodb.h:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/include/kernel/signaldata/AlterTable.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
storage/ndb/tools/Makefile.am:
  Auto merged
storage/ndb/tools/ndb_condig.cpp:
  Auto merged
parents 088e4afd 8d7cbdac

.bzrignore

+2 −0
Original line number Diff line number Diff line
@@ -1036,7 +1036,9 @@ support-files/MacOSX/Description.plist 
support-files/MacOSX/Info.plist

support-files/MacOSX/ReadMe.txt

support-files/MacOSX/StartupParameters.plist

support-files/MacOSX/postflight

support-files/MacOSX/postinstall

support-files/MacOSX/preflight

support-files/MacOSX/preinstall

support-files/binary-configure

support-files/my-huge.cnf

BUILD/Makefile.am

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 


EXTRA_DIST =		FINISH.sh \

			SETUP.sh \

			autorun.sh \

			check-cpu \

			compile-alpha \

			compile-alpha-ccc \

BUILD/check-cpu

+6 −0
Original line number Diff line number Diff line
@@ -90,6 +90,9 @@ case "$cpu_family--$model_name" in 
  *Athlon*)

    cpu_arg="athlon";

    ;;

  *Opteron*)

    cpu_arg="opteron";

    ;;



  # Intel ia64

  *Itanium*)
@@ -147,6 +150,9 @@ case "$cc_ver--$cc_verno" in 
        ppc-*)

		  check_cpu_args='-mcpu=$cpu_arg -mtune=$cpu_arg'

          ;;

        x86_64-*)

		  check_cpu_args='-mtune=$cpu_arg'

          ;;

        *)

          check_cpu_cflags=""

          return

BitKeeper/etc/config

+2 −0
Original line number Diff line number Diff line
@@ -71,6 +71,8 @@ hours: 
[arjen:]checkout:get

[kostja:]checkout:get

[nick:]checkout:get

[jonas:]checkout:get

[tomas:]checkout:get

checkout:edit

eoln:unix

VC++Files/client/mysqlclient.vcproj

+3 −0
Original line number Diff line number Diff line
@@ -2730,6 +2730,9 @@ 
					PreprocessorDefinitions=""/>

			</FileConfiguration>

		</File>

		<File

			RelativePath="..\strings\str_alloc.c">

		</File>

		<File

			RelativePath="..\strings\strcend.c">

			<FileConfiguration