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
allow deletion of tablespaces whose names contain "'"
innobase/dict/dict0load.c:
dict_check_tablespaces_or_store_max_id():
Dynamically allocate memory for file name
innobase/fil/fil0fil.c:
Dynamically allocate memory for file names
innobase/os/os0file.c:
os_file_dirname(): allocate slightly less memory
os_file_create_subdirs_if_needed(): compare more efficiently
innobase/row/row0mysql.c:
Allow tablespaces with "'" in their names to be deleted
Display identifiers with ut_print_name() or dict_index_name_print()
Still known bugs :-(
ndb/include/kernel/signaldata/ScanTab.hpp:
Add close flag
ndb/include/ndbapi/NdbConnection.hpp:
Moved mehtod outside
ndb/include/ndbapi/NdbScanOperation.hpp:
Removed err code from
ndb/src/common/debugger/signaldata/ScanTab.cpp:
Updated printer
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
New error inserts for SCAN
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Update handling of frag timeouts
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Update handling of frag timeouts
ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp:
Don't send empty TRANSID_AI's
ndb/src/ndbapi/NdbConnectionScan.cpp:
Update error handling of scan
ndb/src/ndbapi/NdbScanOperation.cpp:
Update error handling of scan
ndb/src/ndbapi/Ndbif.cpp:
Update error handling of scan
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
no AM_MAINTAINER_MODE macro in configure.in
BitKeeper/deleted/.del-compile-pentium-maintainer~3747d5c8d7ec49df:
Delete: BUILD/compile-pentium-maintainer
result": new Item_param member for use in val_str()
sql/item.cc:
Fix for Bug#3796:
- return str_value_ptr from val_str to prevent modifications of parameter
value.
sql/item.h:
Fix for bug#3796:
- Item::val_str() method semantics documented
- new member of Item_param
tests/client_test.c:
Test case for bug #3796 added. A few compile-time warnings removed.
removed influence of some tests on other tests
mysql-test/r/multi_update.result:
removed influence on other tests
mysql-test/r/subselect.result:
if exists should not be used inside test
mysql-test/t/multi_update.test:
removed influence on other tests
mysql-test/t/subselect.test:
if exists should not be used inside test
mysql-test/t/system_mysql_db_fix.test:
removed influence on other tests
Build-tools/Do-compile:
Added option --config-extra-env
include/my_global.h:
Cleaned up comment to follow same indentation style as the rest of the code
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
New error insert for ndbrequire
ndb/src/kernel/ndb-main/Main.cpp:
WEXITSTATUS only contains valid value if WIFEXITED
Improved a comment about HAVE_BROKEN_PREAD: pread() only works on HP-UX 11.0 if one installs kernel patch PHKL_20349 or greater
include/my_global.h:
Improved a comment about HAVE_BROKEN_PREAD: pread() only works on HP-UX 11.0 if one installs kernel patch PHKL_20349 or greater
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.
include/config-netware.h:
Always enable HAVE_COMPRESS on netware
We can't detect compress in configure on netware because we must use AC_TRY_RUN to detect zlib on other platforms
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
