Commit d049ec4a authored by unknown's avatar unknown
Browse files

Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0 

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb


mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/table.cc:
  Auto merged
parents 0125c351 4fc50652

.bzrignore

+20 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
*.bb

*.bbg

*.bin

*.cmake

*.core

*.d

*.da
@@ -17,6 +18,7 @@ 
*.map

*.o

*.obj

*.old

*.pch

*.pdb

*.reject
@@ -25,11 +27,23 @@ 
*.so

*.so.*

*.spec

*.user

*.vcproj

*/*.dir/*

*/*_pure_*warnings

*/.deps

*/.libs/*

*/.pure

*/debug/*

*/release/*

*~

.*.swp

./CMakeCache.txt

./MySql.ncb

./MySql.sln

./MySql.suo

./README.build-files

./cmakecache.txt

./config.h

./copy_mysql_files.bat

./fix-project-files
@@ -65,6 +79,7 @@ BitKeeper/post-commit-manual 
BitKeeper/tmp/*

BitKeeper/tmp/bkr3sAHD

BitKeeper/tmp/gone

CMakeFiles/*

COPYING

COPYING.LIB

Docs/#manual.texi#
@@ -1036,6 +1051,7 @@ ndbcluster-1186/ndb_3.pid 
ndbcluster-1186/ndb_3_cluster.log

ndbcluster-1186/ndb_3_out.log

ndbcluster-1186/ndbcluster.pid

netware/libmysql.imp

pack_isam/*.ds?

perror/*.ds?

perror/*.vcproj
@@ -1195,6 +1211,7 @@ strings/ctype_autoconf.c 
strings/ctype_extra_sources.c

strings/str_test

strings/test_decimal

support-files/*.ini

support-files/MacOSX/Description.plist

support-files/MacOSX/Info.plist

support-files/MacOSX/ReadMe.txt
@@ -1297,5 +1314,8 @@ vio/test-sslserver 
vio/viotest-ssl

vio/viotest-sslconnect.cpp

vio/viotest.cpp

win/configure.data

win/vs71cache.txt

win/vs8cache.txt

zlib/*.ds?

zlib/*.vcproj

BitKeeper/etc/collapsed

+5 −0
Original line number Diff line number Diff line
@@ -2,3 +2,8 @@ 
44ec850ac2k4y2Omgr92GiWPBAVKGQ

44edb86b1iE5knJ97MbliK_3lCiAXA

44f33f3aj5KW5qweQeekY1LU0E9ZCg

45001f7c3b2hhCXDKfUvzkX9TNe6VA

45002051rHJfMEXAIMiAZV0clxvKSA

4513d8e4Af4dQWuk13sArwofRgFDQw

4519a6c5BVUxEHTf5iJnjZkixMBs8g

451ab499rgdjXyOnUDqHu-wBDoS-OQ

BitKeeper/etc/config

+1 −0
Original line number Diff line number Diff line
@@ -75,5 +75,6 @@ hours: 
[tomas:]checkout:get

[guilhem:]checkout:get

[pekka:]checkout:get

[msvensson:]checkout:get

checkout:edit

eoln:unix

BitKeeper/triggers/post-commit

+15 −3
Original line number Diff line number Diff line
@@ -6,6 +6,13 @@ COMMITS=commits@lists.mysql.com 
DOCS=docs-commit@mysql.com

LIMIT=10000

VERSION="5.0"

BKROOT=`bk root`



if [ -x /usr/sbin/sendmail ]; then

  SENDMAIL=/usr/sbin/sendmail

else

  SENDMAIL=sendmail

fi



if [ "$REAL_EMAIL" = "" ]

then
@@ -58,7 +65,9 @@ $BH 
EOF

  bk changes -v -r+

  bk cset -r+ -d

 ) | /usr/sbin/sendmail -t

 ) > $BKROOT/BitKeeper/tmp/dev_public.txt



$SENDMAIL -t < $BKROOT/BitKeeper/tmp/dev_public.txt



#++

# commits@ mail
@@ -82,7 +91,9 @@ see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html 
EOF

  bk changes -v -r+

  bk cset -r+ -d

 ) | head -n $LIMIT | /usr/sbin/sendmail -t

 ) | bk sed -e ${LIMIT}q > $BKROOT/BitKeeper/tmp/commits.txt



$SENDMAIL -t < $BKROOT/BitKeeper/tmp/commits.txt



#++

# docs-commit@ mail
@@ -102,7 +113,8 @@ Subject: bk commit - $VERSION tree (Manual) ($CHANGESET)$BS 
EOF

  bk changes -v -r+

  bk cset -r+ -d

 ) | /usr/sbin/sendmail -t

 ) > $BKROOT/BitKeeper/tmp/docs.txt

 $SENDMAIL -t < $BKROOT/BitKeeper/tmp/docs.txt

 fi



else

CMakeLists.txt

+4 −2
Original line number Diff line number Diff line
@@ -29,8 +29,6 @@ IF (WITH_MYISAMMRG_STORAGE_ENGINE) 
ENDIF (WITH_MYISAMMRG_STORAGE_ENGINE)



IF(WITH_INNOBASE_STORAGE_ENGINE)

  CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/innobase/ib_config.h.in

               ${CMAKE_SOURCE_DIR}/innobase/ib_config.h @ONLY)

  ADD_DEFINITIONS(-D HAVE_INNOBASE_DB)

  ADD_DEFINITIONS(-D WITH_INNOBASE_STORAGE_ENGINE)

  SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_innobase_plugin")
@@ -123,8 +121,12 @@ ADD_SUBDIRECTORY(heap) 
ADD_SUBDIRECTORY(myisam)

ADD_SUBDIRECTORY(myisammrg)

ADD_SUBDIRECTORY(client)

IF(WITH_BERKELEY_STORAGE_ENGINE)

ADD_SUBDIRECTORY(bdb)

ENDIF(WITH_BERKELEY_STORAGE_ENGINE)

IF(WITH_INNOBASE_STORAGE_ENGINE)

ADD_SUBDIRECTORY(innobase)

ENDIF(WITH_INNOBASE_STORAGE_ENGINE)

ADD_SUBDIRECTORY(sql)

ADD_SUBDIRECTORY(sql/examples)

ADD_SUBDIRECTORY(server-tools/instance-manager)