into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1
BitKeeper/etc/logging_ok:
auto-union
acconfig.h:
Auto merged
acinclude.m4:
Auto merged
configure.in:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
local flag in ndbapi to set -O2 since problems occur with -O3
pc.hpp, Emulator.hpp, Emulator.cpp, ErrorReporter.cpp:
USE_EMULATED_JAM -> !NO_EMULATED_JAM
ErrorReporter.hpp:
removed NDEBUG and removed THREAD_ASSERT
Dbdict.cpp:
NDB_DEBUG -> VM_TRACE
configure.in:
cleaned up ndb CXX flags and added optional flag possibility
configure.in:
cleaned up ndb CXX flags and added optional flag possibility
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
NDB_DEBUG -> VM_TRACE
ndb/src/kernel/error/ErrorReporter.cpp:
USE_EMULATED_JAM -> !NO_EMULATED_JAM
ndb/src/kernel/error/ErrorReporter.hpp:
removed NDEBUG and removed THREAD_ASSERT
ndb/src/kernel/vm/Emulator.cpp:
USE_EMULATED_JAM -> !NO_EMULATED_JAM
ndb/src/kernel/vm/Emulator.hpp:
USE_EMULATED_JAM -> !NO_EMULATED_JAM
ndb/src/kernel/vm/pc.hpp:
USE_EMULATED_JAM -> !NO_EMULATED_JAM
ndb/src/ndbapi/Makefile.am:
local flag in ndbapi to set -O2 since problems occur with -O3
client/mysqltest.c:
Auto merged
include/mysql.h:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
innobase/include/row0mysql.h:
Auto merged
innobase/lock/lock0lock.c:
Auto merged
innobase/row/row0mysql.c:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/README:
Auto merged
mysql-test/r/select_found.result:
Auto merged
mysql-test/t/select_found.test:
Auto merged
mysys/mf_wcomp.c:
Auto merged
mysys/mf_wfile.c:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_base.cc:
Auto merged
configure.in:
Get changes for netware
include/my_sys.h:
Use local file
innobase/include/os0file.h:
auto merge
innobase/os/os0file.c:
auto merge
sql/mysqld.cc:
auto merge
sql/sql_acl.cc:
indentation change
sql/sql_acl.h:
use local file
sql/sql_class.h:
auto merge
sql/sql_db.cc:
use local file
sql/sql_parse.cc:
use local file
sql/sql_select.cc:
Merge
sql/sql_show.cc:
use local file
Fixed serbian error messages
Fix for windows regarding changed variable name
configure.in:
Update version number
Added serbian error messages
libmysqld/libmysqld.def:
Fix changed variable names
mysql-test/t/func_gconcat.test:
remove some \r
sql/share/serbian/errmsg.txt:
Added missing error messages
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
configure.in:
Auto merged
ndb/src/kernel/blocks/backup/restore/Restore.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
BitKeeper/deleted/.del-Makefile.am~d4e228ebd21fc066:
Delete: ndb/include/Makefile.am
acinclude.m4:
static linking of ndbclient into mysqld
configure.in:
removed ndb/include/Makefile.am + fixed conditional compile of ndb shm, sci
ndb/Makefile.am:
dist-hook for make distdir in ndb
ndb/config/type_ndbapitest.mk.am:
use of libndbclient.so in testprograms
ndb/config/type_ndbapitools.mk.am:
static linking to binary distributed ndb tools
ndb/src/Makefile.am:
enable libndbclient.so
ndb/src/common/transporter/Makefile.am:
added support for optional inclusion of shared mem and sci in ndb transporter
ndb/tools/Makefile.am:
new type for tools which should be statically linked with libndbclient
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
configure.in:
Ensure that innodb gets system specific CFLAGS and CXXFLAGS
innobase/os/os0file.c:
Don't use pread/pwrite on systems where these are not working.
This fixes a bug on HPUX, where InnoDB didn't create the ibdata1 file correctly.
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
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
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
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
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'
into poseidon.(none):/home/tomas/mysql-4.1-ndb-make
configure.in:
Auto merged
ndb/src/Makefile_old:
Auto merged
ndb/test/ndbapi/acid.cpp:
Auto merged
ndb/test/ndbapi/flexAsynch.cpp:
Auto merged
ndb/test/ndbapi/flexHammer.cpp:
Auto merged
ndb/test/ndbapi/flexTT.cpp:
Auto merged
ndb/test/ndbapi/initronja.cpp:
Auto merged
ndb/test/ndbapi/interpreterInTup.cpp:
Auto merged
ndb/test/ndbapi/msa.cpp:
Auto merged
ndb/test/ndbapi/old_dirs/lmc-bench/src/user/userInterface.cpp:
Auto merged
ndb/test/ndbapi/testDataBuffers.cpp:
Auto merged
ndb/test/ndbapi/testNdbApi.cpp:
Auto merged
ndb/test/ndbapi/testRestartGci.cpp:
Auto merged
ndb/test/ndbapi/testScan.cpp:
Auto merged
ndb/tools/desc.cpp:
Auto merged
ndb/test/ndbapi/flexScan.cpp:
Auto merged
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
configure.in:
Auto merged
ndb/src/kernel/ndb-main/Main.cpp:
Auto merged
ndb/src/ndbapi/Ndb.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
sql/Makefile.am:
Auto merged
sql/handler.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
configure.in:
Auto merged
Build-tools/Do-compile:
Auto merged
client/mysql.cc:
Auto merged
client/mysqladmin.c:
Auto merged
client/mysqlcheck.c:
Auto merged
client/mysqldump.c:
Auto merged
client/mysqlimport.c:
Auto merged
client/mysqlshow.c:
Auto merged
client/mysqltest.c:
Auto merged
include/my_global.h:
Auto merged
include/thr_alarm.h:
Auto merged
innobase/include/trx0roll.h:
Auto merged
innobase/include/trx0trx.h:
Auto merged
innobase/que/que0que.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
innobase/trx/trx0purge.c:
Auto merged
innobase/trx/trx0roll.c:
Auto merged
innobase/trx/trx0trx.c:
Auto merged
innobase/usr/usr0sess.c:
Auto merged
isam/isamchk.c:
Auto merged
myisam/myisam_ftdump.c:
Auto merged
myisam/myisamchk.c:
Auto merged
myisam/myisampack.c:
Auto merged
mysys/default.c:
Auto merged
mysys/my_getopt.c:
Auto merged
mysys/my_init.c:
Auto merged
mysys/my_pthread.c:
Auto merged
netware/Makefile.am:
Auto merged
netware/init_db.sql:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
tools/mysqlmanager.c:
Auto merged
VC++Files/dbug/dbug.dsp:
Auto merged
VC++Files/heap/heap.dsp:
Auto merged
VC++Files/isam/isam.dsp:
Auto merged
VC++Files/libmysql/libmysql.dsp:
Auto merged
VC++Files/myisam/myisam.dsp:
Auto merged
VC++Files/myisammrg/myisammrg.dsp:
Auto merged
VC++Files/mysys/mysys.dsp:
Auto merged
VC++Files/libmysqld/libmysqld.dsp:
merge
client/mysqlbinlog.cc:
merge
extra/perror.c:
merge
include/mysql_com.h:
merge
libmysqld/Makefile.am:
merge
netware/BUILD/mwenv:
merge
sql/mysqld.cc:
merge
Build-tools/Do-compile:
Fixed indentation
configure.in:
Added patches from Novell
Added C_EXTRA_FLAGS as an easy way to pass flags to both CFLAGS and CXXFLAGS
extra/perror.c:
Fixed error number reporting to not report 'Unknown error'
include/my_global.h:
Defines to make NETWARE patches cleaner
include/thr_alarm.h:
Fixed wrong macro
netware/mysql_install_db.c:
Indentation fix
acconfig.h:
Adding undef piece for HAVE_ARCHIVE_DB
acinclude.m4:
Code needed for --with-archive-storage-engine flag for compile.
configure.in:
Adding tag for Archive
sql/Makefile.am:
Source updates to compile ha_archive
sql/examples/ha_archive.cc:
Class file for archive storage engine. First version.
sql/handler.cc:
Updates needed for adding archive storage engine.
sql/handler.h:
ENUM for archive storage engine.
sql/mysql_priv.h:
Archive show options
sql/mysqld.cc:
Ifdef foor HAVE_ARCHIVE_DB
sql/examples/ha_archive.h:
Include file for archive storage engine addition.
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
configure.in:
configure to check if HAVE_COMPRESS for ndbcluster table handler
ndb/Makefile:
fix for problems with parallell make
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
changed ifdef _BIG_ENDIAN => WORDS_BIGENDIAN
ndb/src/ndbapi/Ndb.cpp:
changed ifdef _BIG_ENDIAN => WORDS_BIGENDIAN
Change strtoll -> my_strtoll10()
Fixed bug in my_strntoul() and my_strntol() where we got different values on 32 and 64 bit systems (Bug #3472)
configure.in:
Fixed problem on IRIX64 (One can't have AC_MSG_RESULT on same row as AC_DEFINE
extra/my_print_defaults.c:
Fixed wrong definition for 'verbose'
include/my_global.h:
Portability fix (IRIX64)
libmysql/client_settings.h:
Remove compiler warnings
libmysql/libmysql.c:
Remove compiler warnings
mysql-test/r/func_str.result:
Updated results
mysql-test/r/key_cache.result:
Updated results to not depend on key_blocks_unused
mysql-test/t/func_str.test:
More test of long overflow
mysql-test/t/key_cache.test:
Updated results to not depend on key_blocks_unused
sql/item.cc:
Portability fix (don't use strtoll())
sql/item.h:
Portability fix (don't use strtoll())
sql/item_sum.h:
Portability fix (don't use strtoll())
sql/item_timefunc.cc:
Fixed compiler warning
strings/ctype-simple.c:
Fixed bug in my_strntoul() and my_strntol() where we got different values on 32 and 64 bit systems
strings/ctype-ucs2.c:
Fixed bug in my_strntoul() and my_strntol() where we got different values on 32 and 64 bit systems
added configure options PACKAGE and VERSION for ndb
GuessConfig.sh:
added options for PACKAGE and VERSION
Epilogue.mk:
Added target distdir
ndb/Epilogue.mk:
Added target distdir
ndb/config/GuessConfig.sh:
added options for PACKAGE and VERSION
configure.in:
added configure options PACKAGE and VERSION for ndb
mkdir in Makefile, not in configure
chmod a-x
sql/ha_ndbcluster.cc:
Change mode to -rw-rw-r--
sql/ha_ndbcluster.h:
Change mode to -rw-rw-r--
BitKeeper/etc/ignore:
added libmysqld/discover.cc
configure.in:
symlink, not hardlink
mkdir in Makefile, not in configure
include/Makefile.am:
mkdir in Makefile, not in configure
mysql-test/std_data/init_file.dat:
add EOL
make a test faster
BitKeeper/etc/logging_ok:
auto-union
acconfig.h:
Auto merged
acinclude.m4:
Merged in example storage engine with NDB
configure.in:
Resolved conflict between NDB check with EXAMPLE DB.
acconfig.h:
Clear variable that defines if NDB Cluster should be supported
acinclude.m4:
Check for NDB Cluster included in the build
configure.in:
Check if NDB Cluster should be supported
acconfig.h:
Default undef for example storage engine.
acinclude.m4:
Build macro additions for example engine.
configure.in:
Configure changes for it to be listed in --help
sql/Makefile.am:
Added in paths to build example.
sql/examples/ha_example.cc:
Correction in indention and a few minor other corrections. It now lets you create/open/drop example engine.
sql/handler.cc:
Added definition for the example storage engine. Added case for it to be created.
sql/handler.h:
Added example storage engine type.
sql/mysql_priv.h:
Added flag for optional build of example storage engine.
sql/mysqld.cc:
Pieces to build example storage engine.
