Commits · 67eff35d781e37b650311e421d9d64212adf26b5 · Kirill Smelkov / mariadb

27 May, 2004 34 commits

Fix bank · 67eff35d

unknown authored May 27, 2004


ndb/test/ndbapi/Makefile.am:
  Removed flexScan (-noscan)
ndb/test/ndbapi/bank/Bank.cpp:
  Fixed no scan api
ndb/test/ndbapi/bank/BankLoad.cpp:
  Fixed no scan api
ndb/test/ndbapi/testBackup.cpp:
  Reenable bank
ndb/test/ndbapi/testGrep.cpp:
  Reenable bank

67eff35d

Merge mysql.com:/home/jonas/src/mysql-4.1-ndb-jonas · 0a3f6a1f

unknown authored May 27, 2004

into mysql.com:/home/jonas/src/wl1671


ndb/include/ndbapi/Ndb.hpp:
  Auto merged
ndb/src/ndbapi/Makefile.am:
  Auto merged
ndb/src/ndbapi/Ndb.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged

0a3f6a1f

Fix AttrType moves · ee578014
unknown authored May 27, 2004
```
ndb/src/ndbapi/Makefile.am:
  Removed sources
```
ee578014
Fix dependency for mgmsrv · 80628b0e
unknown authored May 27, 2004

80628b0e

Merge · 166e750f

unknown authored May 27, 2004


ndb/src/kernel/ndb-main/Makefile.am:
  Auto merged

166e750f

Use ndbclient more · d97a303f

unknown authored May 27, 2004


configure.in:
  Include mgmapi
ndb/config/type_ndbapi.mk.am:
  remove LDADD from type
ndb/config/type_util.mk.am:
  remove LDADD from type
ndb/src/cw/cpcd/Makefile.am:
  LDADD ndbclient
ndb/src/kernel/ndb-main/Makefile.am:
  Fix LDADD
ndb/src/mgmclient/Makefile.am:
  LDADD ndbclient
ndb/src/mgmsrv/Makefile.am:
  LDADD ndbclient
ndb/test/run-test/Makefile.am:
  LDADD ndbclient

d97a303f

Merge mysql.com:/home/jonas/src/mysql-4.1-ndb · 5a01aa7d
unknown authored May 27, 2004
```
into mysql.com:/home/jonas/src/mysql-4.1-ndb-jonas
```
5a01aa7d
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · 486494b3
unknown authored May 27, 2004
```
into mysql.com:/home/jonas/src/mysql-4.1-ndb
```
486494b3

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · 10f04d19

unknown authored May 27, 2004

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


configure.in:
  Auto merged
ndb/src/mgmapi/Makefile.am:
  Auto merged
ndb/src/ndbapi/Makefile.am:
  Auto merged
ndb/src/ndbapi/Ndb.cpp:
  Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged

10f04d19

Fix for source of libndbclient · fb014155
unknown authored May 27, 2004

fb014155
Fix for building libndbclient before entering kernel · 7c330756
unknown authored May 27, 2004

7c330756
oops ndb mistake · ee2af63f
unknown authored May 27, 2004

ee2af63f
fix ndb make · 160be94a
unknown authored May 27, 2004

160be94a

ndb fixes see files · 29f3f533

unknown authored May 27, 2004


acconfig.h:
  added switched for shm sci in ndb
acinclude.m4:
  added switched for shm sci in ndb
configure.in:
  added dependency for ndblibs to mysql server
ndb/src/common/transporter/Makefile.am:
  small fix
ndb/src/common/transporter/Transporter.hpp:
  ndb_global for sci and shm defines

29f3f533

changed to ndbclient · 4688d39a
unknown authored May 27, 2004

4688d39a

Merge mysql.com:/home/jonas/src/mysql-4.1-ndb-jonas · 9e3522e4

unknown authored May 27, 2004

into mysql.com:/home/jonas/src/wl1671


ndb/Epilogue.mk_old:
  Auto merged
ndb/src/common/debugger/signaldata/Makefile_old:
  Auto merged
ndb/src/common/mgmcommon/Makefile_old:
  Auto merged
ndb/src/common/util/Makefile_old:
  Auto merged
ndb/src/kernel/Makefile_old:
  Auto merged
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/ndb-main/Main.cpp:
  Auto merged
ndb/src/kernel/ndb-main/Makefile_old:
  Auto merged
ndb/src/kernel/vm/Makefile_old:
  Auto merged
ndb/src/mgmapi/Makefile_old:
  Auto merged
ndb/src/mgmclient/Makefile_old:
  Auto merged
ndb/src/mgmsrv/Makefile_old:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/ndbapi/ClusterMgr.cpp:
  Auto merged
ndb/src/ndbapi/Makefile_old:
  Auto merged
ndb/src/ndbapi/Ndb.cpp:
  Auto merged
ndb/src/ndbapi/Ndbif.cpp:
  Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.hpp:
  Auto merged
ndb/test/ndbapi/testDict.cpp:
  Auto merged
ndb/test/ndbapi/testSystemRestart.cpp:
  Auto merged
ndb/test/ndbapi/testTimeout.cpp:
  Auto merged
ndb/test/src/Makefile_old:
  Auto merged

9e3522e4

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · a216e205
unknown authored May 27, 2004
```
into poseidon.(none):/home/tomas/mysql-4.1-ndb
```
a216e205
oops · 95013a3b
unknown authored May 27, 2004

95013a3b

Add mgmapi · 6926eeee

unknown authored May 27, 2004


configure.in:
  Added include of mgmapi
ndb/src/common/debugger/signaldata/Makefile.am:
  New files
ndb/src/common/util/Makefile.am:
  Add files
ndb/src/kernel/ndb-main/Makefile.am:
  Use mgmapi
ndb/src/kernel/vm/Makefile.am:
  Use mgmapi
ndb/src/mgmapi/Makefile.am:
  new files
ndb/src/mgmclient/Makefile.am:
  use mgmapi
ndb/src/mgmsrv/Makefile.am:
  use mgmapi

6926eeee

see resp file · b2043ef8

unknown authored May 27, 2004


configure.in:
  added NDB_EXTRA_FLAGS
ndb/src/common/transporter/Makefile.am:
  removed SHM in ndb

b2043ef8

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · a00152e9
unknown authored May 27, 2004
```
into mc05.(none):/space2/tomas/mysql-4.1
```
a00152e9
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · f9e8b64e
unknown authored May 27, 2004
```
into poseidon.(none):/home/tomas/mysql-4.1-ndb
```
f9e8b64e
fix for gcc version 3 bug · cc55f693
unknown authored May 27, 2004

cc55f693

Merge · da2ae189

unknown authored May 27, 2004


ndb/include/ndbapi/Ndb.hpp:
  Auto merged
ndb/include/ndbapi/NdbConnection.hpp:
  Auto merged
ndb/include/ndbapi/NdbIndexOperation.hpp:
  Auto merged
ndb/Epilogue.mk_old:
  Auto merged
ndb/src/common/debugger/signaldata/Makefile_old:
  Auto merged
ndb/src/common/mgmcommon/Makefile_old:
  Auto merged
ndb/src/common/util/Makefile_old:
  Auto merged
ndb/src/kernel/Makefile_old:
  Auto merged
ndb/src/kernel/ndb-main/Main.cpp:
  Auto merged
ndb/src/kernel/ndb-main/Makefile_old:
  Auto merged
ndb/src/kernel/vm/Makefile_old:
  Auto merged
ndb/src/mgmapi/Makefile_old:
  Auto merged
ndb/src/mgmclient/Makefile_old:
  Auto merged
ndb/src/mgmsrv/Makefile_old:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/ndbapi/ClusterMgr.cpp:
  Auto merged
ndb/src/ndbapi/Makefile_old:
  Auto merged
ndb/src/ndbapi/Ndb.cpp:
  Auto merged
ndb/src/ndbapi/NdbApiSignal.cpp:
  Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  Auto merged
ndb/src/ndbapi/NdbIndexOperation.cpp:
  Auto merged
ndb/src/ndbapi/NdbOperation.cpp:
  Auto merged
ndb/src/ndbapi/NdbOperationDefine.cpp:
  Auto merged
ndb/src/ndbapi/NdbOperationExec.cpp:
  Auto merged
ndb/src/ndbapi/NdbOperationInt.cpp:
  Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.hpp:
  Auto merged
ndb/test/ndbapi/Makefile_old:
  Auto merged
ndb/test/ndbapi/ScanFunctions.hpp:
  Auto merged
ndb/test/ndbapi/ScanInterpretTest.hpp:
  Auto merged
ndb/test/ndbapi/testDataBuffers.cpp:
  Auto merged
ndb/test/ndbapi/old_dirs/testBackup/Makefile:
  Auto merged
ndb/test/ndbapi/old_dirs/testGrep/Makefile:
  Auto merged
ndb/test/ndbapi/old_dirs/testGrep/verify/Makefile:
  Auto merged
ndb/test/ndbapi/testDict.cpp:
  Auto merged
ndb/test/ndbapi/testGrep.cpp:
  Auto merged
ndb/test/ndbapi/testIndex.cpp:
  Auto merged
ndb/test/ndbapi/testOIBasic.cpp:
  Auto merged
ndb/test/ndbapi/testSystemRestart.cpp:
  Auto merged
ndb/test/ndbapi/testTimeout.cpp:
  Auto merged
ndb/test/src/Makefile_old:
  Auto merged
ndb/test/src/UtilTransactions.cpp:
  Auto merged
ndb/test/tools/create_index.cpp:
  Auto merged
ndb/tools/select_all.cpp:
  Auto merged

da2ae189

Merge mysql.com:/home/jonas/src/mysql-4.1-ndb · 0aee1b0a

unknown authored May 27, 2004

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


ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
ndb/Epilogue.mk_old:
  Auto merged
ndb/src/common/debugger/signaldata/Makefile_old:
  Auto merged
ndb/src/common/mgmcommon/Makefile_old:
  Auto merged
ndb/src/common/util/Makefile_old:
  Auto merged
ndb/src/kernel/Makefile_old:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/ndb-main/Main.cpp:
  Auto merged
ndb/src/kernel/ndb-main/Makefile_old:
  Auto merged
ndb/src/kernel/vm/Makefile_old:
  Auto merged
ndb/src/mgmapi/Makefile_old:
  Auto merged
ndb/src/mgmclient/Makefile_old:
  Auto merged
ndb/src/mgmsrv/Makefile_old:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/ndbapi/ClusterMgr.cpp:
  Auto merged
ndb/src/ndbapi/Makefile_old:
  Auto merged
ndb/src/ndbapi/Ndb.cpp:
  Auto merged
ndb/src/ndbapi/Ndbif.cpp:
  Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.hpp:
  Auto merged
ndb/test/ndbapi/testDict.cpp:
  Auto merged
ndb/test/ndbapi/testSystemRestart.cpp:
  Auto merged
ndb/test/ndbapi/testTimeout.cpp:
  Auto merged
ndb/test/src/Makefile_old:
  Auto merged

0aee1b0a

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · 9b2682e6

unknown authored May 27, 2004

into mc05.(none):/space2/tomas/mysql-4.1


ndb/include/ndbapi/Ndb.hpp:
  Auto merged
ndb/src/kernel/blocks/backup/restore/Restore.hpp:
  Auto merged
ndb/src/kernel/blocks/backup/restore/main.cpp:
  Auto merged
ndb/src/ndbapi/Ndb.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged
ndb/test/ndbapi/testGrepVerify.cpp:
  Auto merged
ndb/tools/listTables.cpp:
  Auto merged

9b2682e6

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · 489aa9be
unknown authored May 27, 2004
```
into mysql.com:/home/jonas/src/mysql-4.1-ndb
```
489aa9be

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 94fc67f5

unknown authored May 27, 2004

into mc05.(none):/space2/tomas/mysql-4.1-ndb-test


BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged

94fc67f5

configure.in: · daaa3def

unknown authored May 27, 2004

  automake verion problem


configure.in:
  automake verion problem

daaa3def

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · 6cb6ddf3

unknown authored May 27, 2004

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


ndb/include/ndbapi/NdbConnection.hpp:
  Auto merged
ndb/include/ndbapi/NdbOperation.hpp:
  Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged

6cb6ddf3

Makefile.am: · 9933c7e7

unknown authored May 27, 2004

  changed install dir


ndb/test/run-test/Makefile.am:
  changed install dir

9933c7e7

ndb in mysql-test fix · 9e833b2a
unknown authored May 27, 2004

9e833b2a
removed version 2 backwards compatability from ndb restore · a22a7fda
unknown authored May 27, 2004

a22a7fda

several ndb automake changes, see respective file · c41b0e48

unknown authored May 27, 2004


ndb/tools/waiter.cpp:
  Rename: ndb/test/tools/waiter.cpp -> ndb/tools/waiter.cpp
configure.in:
  added install dirs for ndb
ndb/Makefile.am:
  ndb headers for install
ndb/config/common.mk.am:
  DEFS_LOC in ndb make
ndb/config/type_ndbapi.mk.am:
  added LDADD=libNDB_API.la default for type_ndbapi
ndb/src/cw/cpcd/Makefile.am:
  changes install dir
ndb/src/kernel/blocks/backup/restore/Makefile.am:
  changes install dir
ndb/src/kernel/ndb-main/Makefile.am:
  changes install dir
ndb/src/mgmapi/Makefile.am:
  changes install dir
ndb/src/mgmclient/Makefile.am:
  changes install dir
ndb/src/mgmsrv/Makefile.am:
  changes install dir
ndb/src/ndbapi/Makefile.am:
  changes install dir
ndb/test/ndbapi/Makefile.am:
  changes install dir
ndb/test/ndbapi/bank/Makefile.am:
  changes install dir
ndb/test/tools/Makefile.am:
  changes install dir
mysql-test/ndb/install_ndbcluster.sh:
  new
mysql-test/ndb/stop_ndbcluster.sh:
  new
ndb/tools/Makefile.am:
  changes install dir

c41b0e48

26 May, 2004 6 commits

Added new netware file · aa6ff1cf
unknown authored May 27, 2004

aa6ff1cf

Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1 · d000ea9c

unknown authored May 27, 2004


Makefile.am:
  Auto merged
client/mysqldump.c:
  Auto merged
configure.in:
  Auto merged
netware/Makefile.am:
  Auto merged

d000ea9c

After merge fixes · abd68407

unknown authored May 27, 2004


Docs/manual_toc.html:
  Rename: BitKeeper/deleted/.del-manual_toc.html~f483f2d33d9acb41 -> Docs/manual_toc.html
libmysqld/lib_sql.cc:
  Fixed type of new variables
libmysqld/libmysqld.c:
  Removed duplicate function (allready in libmysql.c)

abd68407

netware files should always be in 'make dist' · 1d03d162

unknown authored May 27, 2004

use opt_net_buffer_length instead of net_buffer_length


Makefile.am:
  netware files should always be in 'make dist'
client/mysqldump.c:
  use opt_net_buffer_length instead of net_buffer_length
configure.in:
  netware files should always be in 'make dist'
netware/Makefile.am:
  netware files should always be in 'make dist'

1d03d162

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 1d7d7609
unknown authored May 27, 2004
```
into mysql.com:/home/my/mysql-4.1
```
1d7d7609

merge with 4.0 to get windows fixes · 7c5cd412

unknown authored May 27, 2004


VC++Files/client/mysqlclient.dsp:
  Auto merged
VC++Files/innobase/innobase.dsp:
  Auto merged
include/mysql.h:
  Auto merged
include/mysql_com.h:
  Auto merged
innobase/include/log0log.h:
  Auto merged
innobase/include/log0log.ic:
  Auto merged
innobase/include/mtr0mtr.h:
  Auto merged
innobase/log/log0log.c:
  Auto merged
innobase/log/log0recv.c:
  Auto merged
innobase/que/que0que.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysql_r/Makefile.am:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
tools/mysqlmanager.c:
  Auto merged

7c5cd412