mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-03-08 04:03:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
12490 commits 2857 branches 349 tags 1.6 GiB
Commit graph

12490 commits

Author SHA1 Message Date
unknown
67eff35d78 Fix bank 
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
 2004-05-27 21:54:35 +02:00
unknown
0a3f6a1fe2 Merge mysql.com:/home/jonas/src/mysql-4.1-ndb-jonas 
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
 2004-05-27 21:22:12 +02:00
unknown
ee57801469 Fix AttrType moves 
ndb/src/ndbapi/Makefile.am:
  Removed sources
 2004-05-27 21:21:48 +02:00
unknown
80628b0ebe Fix dependency for mgmsrv 2004-05-27 21:18:45 +02:00
unknown
166e750f25 Merge 
ndb/src/kernel/ndb-main/Makefile.am:
  Auto merged
 2004-05-27 21:05:14 +02:00
unknown
d97a303fb1 Use ndbclient more 
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
 2004-05-27 21:03:05 +02:00
unknown
5a01aa7d68 Merge mysql.com:/home/jonas/src/mysql-4.1-ndb 
into mysql.com:/home/jonas/src/mysql-4.1-ndb-jonas
 2004-05-27 20:16:18 +02:00
unknown
486494b3ec Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into mysql.com:/home/jonas/src/mysql-4.1-ndb
 2004-05-27 19:59:38 +02:00
unknown
10f04d1974 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
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
 2004-05-27 19:58:19 +02:00
unknown
fb014155b8 Fix for source of libndbclient 2004-05-27 18:41:57 +02:00
unknown
7c33075672 Fix for building libndbclient before entering kernel 2004-05-27 18:41:56 +02:00
unknown
ee2af63f95 oops ndb mistake 2004-05-27 16:41:55 +00:00
unknown
160be94a5d fix ndb make 2004-05-27 16:38:40 +00:00
unknown
29f3f5335d ndb fixes see files 
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
 2004-05-27 16:28:41 +00:00
unknown
4688d39aad changed to ndbclient 2004-05-27 15:47:31 +00:00
unknown
9e3522e438 Merge mysql.com:/home/jonas/src/mysql-4.1-ndb-jonas 
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
 2004-05-27 15:35:01 +02:00
unknown
a216e205a5 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into poseidon.(none):/home/tomas/mysql-4.1-ndb
 2004-05-27 13:34:17 +00:00
unknown
95013a3ba3 oops 2004-05-27 13:33:19 +00:00
unknown
6926eeeec0 Add mgmapi 
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
 2004-05-27 15:20:38 +02:00
unknown
b2043ef8da see resp file 
configure.in:
  added NDB_EXTRA_FLAGS
ndb/src/common/transporter/Makefile.am:
  removed SHM in ndb
 2004-05-27 12:14:19 +00:00
unknown
a00152e952 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into mc05.(none):/space2/tomas/mysql-4.1
 2004-05-27 13:19:55 +02:00
unknown
f9e8b64e1f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into poseidon.(none):/home/tomas/mysql-4.1-ndb
 2004-05-27 11:19:54 +00:00
unknown
cc55f6934b fix for gcc version 3 bug 2004-05-27 11:16:14 +00:00
unknown
da2ae18998 Merge 
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
 2004-05-27 11:36:10 +02:00
unknown
0aee1b0ad6 Merge mysql.com:/home/jonas/src/mysql-4.1-ndb 
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
 2004-05-27 11:36:09 +02:00
unknown
9b2682e65e Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
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
 2004-05-27 11:36:09 +02:00
unknown
489aa9be1c Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into mysql.com:/home/jonas/src/mysql-4.1-ndb
 2004-05-27 11:36:08 +02:00
unknown
94fc67f54f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test


BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
 2004-05-27 11:36:08 +02:00
unknown
daaa3def14 configure.in: 
automake verion problem


configure.in:
  automake verion problem
 2004-05-27 09:36:07 +00:00
unknown
6cb6ddf39a Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
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
 2004-05-27 10:26:56 +02:00
unknown
9933c7e7aa Makefile.am: 
changed install dir


ndb/test/run-test/Makefile.am:
  changed install dir
 2004-05-27 08:26:55 +00:00
unknown
9e833b2a7a ndb in mysql-test fix 2004-05-27 08:05:10 +00:00
unknown
a22a7fda0d removed version 2 backwards compatability from ndb restore 2004-05-27 09:45:42 +02:00
unknown
c41b0e48c9 several ndb automake changes, see respective file 
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
 2004-05-27 07:04:45 +00:00
unknown
aa6ff1cf68 Added new netware file 2004-05-27 02:53:00 +03:00
unknown
d000ea9c4d Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1 
Makefile.am:
  Auto merged
client/mysqldump.c:
  Auto merged
configure.in:
  Auto merged
netware/Makefile.am:
  Auto merged
 2004-05-27 02:51:28 +03:00
unknown
abd68407bf After merge fixes 
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)
 2004-05-27 02:50:42 +03:00
unknown
1d03d1629d netware files should always be in 'make dist' 
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'
 2004-05-27 02:47:04 +03:00
unknown
1d7d760958 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-05-27 00:31:12 +03:00
unknown
7c5cd4125d merge with 4.0 to get windows fixes 
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
 2004-05-27 00:30:28 +03:00
unknown
436386671f logging_ok: 
Logging to logging@openlogging.org accepted
compile-pentium-max:
  changed --with-ndbcluster to --without-ndbcluster because it fails on 4.1 builds


BUILD/compile-pentium-max:
  changed --with-ndbcluster to --without-ndbcluster because it fails on 4.1 builds
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
 2004-05-26 21:39:15 +02:00
unknown
cc24ac7079 VC++ portability fix 
VC++Files/client/mysqlclient.dsp:
  Added missing /D MYSQL_CLIENT
VC++Files/innobase/innobase.dsp:
  Remove not existing file
sql/mysqld.cc:
  Fixed comment
 2004-05-26 21:45:58 +03:00
unknown
5fe72df8fd Fixed test to not crash when ndb is not in use 2004-05-26 20:56:39 +03:00
unknown
34e7ad059a configure.in: 
makefix


configure.in:
  makefix
 2004-05-26 17:56:18 +00:00
unknown
709b1b8978 makefix 2004-05-26 17:51:58 +00:00
unknown
7c40ea2db3 Makefile.am: 
new file
 2004-05-26 17:21:38 +00:00
unknown
e6b4c164ee InnoDB fixup: remove debug assertion that causes compile error 
when UNIV_DEBUG is defined (introduced in ChangeSet@1.1850)


innobase/que/que0que.c:
  Remove ut_ad() reference to removed parameter next_thr
 2004-05-26 19:41:14 +03:00
unknown
00c41b2850 Fix to make Windows compilation smoother 
VC++Files/innobase/innobase.dsp:
  non-existent file removed
client/mysql.cc:
  local opt_max_allowed_packet and opt_net_buffer_length introduced
client/mysqldump.c:
  local opt_max_allowed_packet and opt_net_buffer_length introduced
include/mysql.h:
  mysql_get_parameters() interface added
  #define max_allowed_packet added
include/mysql_com.h:
  these should not be exported
libmysql/libmysql.c:
  mysql_get_parameters implementations
libmysql/libmysql.def:
  interface changed
libmysql_r/Makefile.am:
  MYSQL_CLIENT define added
libmysqld/lib_sql.cc:
  line moved to be above the '#include "mysql.cc"'
libmysqld/libmysqld.c:
  mysql_get_parameters implementation (embedded)
libmysqld/libmysqld.def:
  interface changed
sql/log_event.cc:
  should be like that in this case
tools/mysqlmanager.c:
  compiler warns on this line
 2004-05-26 21:40:27 +05:00
unknown
365ef56987 removed usage of replication 
ndb/src/mgmclient/CommandInterpreter.hpp:
  removed usage of global replication
 2004-05-26 16:34:55 +00:00
unknown
c2f6dff9f4 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-05-26 19:13:12 +03:00