Commit cafae817 authored by unknown's avatar unknown
Browse files

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

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


BitKeeper/etc/logging_ok:
  auto-union
mysql-test/mysql-test-run.sh:
  Auto merged
ndb/include/ndbapi/NdbScanOperation.hpp:
  Auto merged
ndb/include/ndbapi/NdbTransaction.hpp:
  Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
ndb/test/ndbapi/testOIBasic.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
parents 2118de03 6bed3ee9

.bzrignore

+3 −0
Original line number Diff line number Diff line
@@ -1107,3 +1107,6 @@ vio/test-sslclient 
vio/test-sslserver

vio/viotest-ssl

VC++Files/client/mysql_amd64.dsp

client/mysqltestmanager-pwgen

client/mysqltestmanagerc

tools/mysqltestmanager

BUILD/compile-pentium-cybozu

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



path=`dirname $0`

. "$path/SETUP.sh"



extra_flags="$pentium_cflags $fast_cflags -g"

extra_configs="$pentium_configs --with-charset=utf8 --with-collation=utf8_general_cs"



. "$path/FINISH.sh"

BitKeeper/etc/logging_ok

+2 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ Sinisa@sinisa.nasamreza.org 
WAX@sergbook.mysql.com

acurtis@ltantony.rdg.cyberkinetica.homeunix.net

acurtis@pcgem.rdg.cyberkinetica.com

acurtis@xiphis.org

administrador@light.hegel.local

ahlentz@co3064164-a.rochd1.qld.optusnet.com.au

akishkin@work.mysql.com
@@ -59,6 +60,7 @@ gerberb@ou800.zenez.com 
gluh@eagle.intranet.mysql.r18.ru

gluh@gluh.(none)

gluh@gluh.mysql.r18.ru

gluh@mysql.com

gordon@zero.local.lan

greg@gcw.ath.cx

greg@mysql.com

BitKeeper/triggers/post-commit

+3 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ then 
fi



CHANGESET=`bk -R prs -r+ -h -d':P:::I:' ChangeSet`

CSETKEY=`bk -R prs -r+ -h -d':KEY:' ChangeSet`

BUG=`bk -R prs -r+ -h -d':C:' ChangeSet | sed -ne 's/^.*[Bb][Uu][Gg] *# *\([0-9][0-9]*\).*$/\1/p'`

WL=`bk -R prs -r+ -h -d':C:' ChangeSet | sed -ne 's/^.*[Ww][Ll] *# *\([0-9][0-9]*\).*$/ WL#\1/p'`
@@ -52,6 +53,7 @@ List-ID: <bk.mysql-$VERSION> 
From: $FROM

To: $TO

Subject: bk commit - $VERSION tree ($CHANGESET)${BS}${WL}

X-CSetKey: <$CSETKEY>

$BH

EOF

  bk changes -v -r+
@@ -68,6 +70,7 @@ List-ID: <bk.mysql-$VERSION> 
From: $FROM

To: $INTERNALS

Subject: bk commit into $VERSION tree ($CHANGESET)$BS

X-CSetKey: <$CSETKEY>

$BH

Below is the list of changes that have just been committed into a local

$VERSION repository of $USER. When $USER does a push these changes will

VC++Files/client/mysqlclient.dsp

+8 −0
Original line number Diff line number Diff line
@@ -147,6 +147,10 @@ SOURCE="..\strings\ctype-bin.c" 
# End Source File

# Begin Source File



SOURCE="..\strings\ctype-cp932.c"

# End Source File

# Begin Source File



SOURCE="..\strings\ctype-czech.c"

# End Source File

# Begin Source File
@@ -155,6 +159,10 @@ SOURCE="..\strings\ctype-euc_kr.c" 
# End Source File

# Begin Source File



SOURCE="..\strings\ctype-eucjpms.c"

# End Source File

# Begin Source File



SOURCE="..\strings\ctype-extra.c"

# End Source File

# Begin Source File