VC++Files/comp_err/comp_err.dsp:
Auto merged
VC++Files/sql/mysqld.dsp:
Auto merged
myisam/ft_boolean_search.c:
Auto merged
mysql-test/t/fulltext.test:
Auto merged
myisam/ft_parser.c:
Keep old code
mysql-test/r/fulltext.result:
Remove duplicate test from 4.0
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
--with-geometry and
--with-embedded-privilege-control
configure switches added
acconfig.h:
necessary lines added
myisam/mi_open.c:
#include added
mysql-test/t/gis-rtree.test:
test modified to take HAVE_GEOMETRY in account
mysql-test/t/gis.test:
test modified to take HAVE_GEOMETRY in account
sql/mysql_priv.h:
option's variables added
sql/mysqld.cc:
option's handling added
sql/set_var.cc:
option's descriptions added
produce hex digits in lower case). (fixed version)
Replaced _dig_vec array with two _dig_vec_upper/_dig_vec_lower arrays.
Added extra argument to int2str function which controls case of digits you get.
Replaced lot of invocations of int2str for decimal radix with more optimized int10_to_str()
function.
Removed unused my_itoa/my_ltoa functions.
client/mysql.cc:
Replaced int2str invocations with radix argument equal to 10 with optimized int10_to_str()
call.
client/mysqladmin.c:
Replaced int2str invocations with radix argument equal to 10 with optimized int10_to_str()
call.
dbug/dbug.c:
_dig_vec became _dig_vec_upper.
include/m_string.h:
_dig_vec is obsoleted by _dig_vec_upper/_dig_vec_lower.
my_itoa()/my_ltoa() functions were removed because they were never used in our code.
int2str() now has one more argument which controls case of digits it will produce.
include/my_global.h:
my_itoa()/my_ltoa() functions were removed because they were never used in our code.
isam/isamchk.c:
Replaced int2str invocations with radix argument equal to 10 with optimized int10_to_str()
call.
libmysql/libmysql.def:
_dig_vec is obsoleted by _dig_vec_upper/_dig_vec_lower.
myisam/myisamchk.c:
Replaced int2str invocation with radix argument equal to 10 with optimized int10_to_str()
call.
mysys/mf_tempfile.c:
_dig_vec became _dig_vec_upper.
mysys/my_error.c:
Replaced int2str invocations with radix argument equal to 10 with optimized int10_to_str()
call.
mysys/my_tempnam.c:
_dig_vec became _dig_vec_upper.
sql-common/client.c:
Replaced int2str invocation with radix argument equal to 10 with optimized int10_to_str()
call.
sql/item_strfunc.cc:
_dig_vec became _dig_vec_upper. Also we don't need hex[] array in this file now because we
have _dig_vec_lower instead.
sql/mysqld.cc:
Replaced int2str invocations with radix argument equal to 10 with optimized int10_to_str()
call.
sql/password.c:
_dig_vec became _dig_vec_upper.
sql/sql_bitmap.h:
_dig_vec became _dig_vec_upper.
strings/int2str.c:
Replaced _dig_vec by _dig_vec_upper/_dig_vec_lower pair.
int2str() now has one more argument which controls case of digits it will produce.
my_itoa()/my_ltoa() functions were removed because they were never used in our code.
strings/longlong2str-x86.s:
_dig_vec became _dig_vec_upper.
strings/longlong2str.c:
_dig_vec became _dig_vec_upper.
strings/my_vsnprintf.c:
If my_snprintf() is printing %x argument it should produce lower case hexadecimal digits
to be snprintf() compatible.
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
myisam/mi_create.c:
Auto merged
myisam/mi_open.c:
Auto merged
myisam/rt_test.c:
Auto merged
myisam/sp_test.c:
Auto merged
sql/spatial.cc:
Auto merged
sql/spatial.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
myisam/mi_range.c:
merging
myisam/mi_rnext.c:
merging
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
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
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
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
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)
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'
