ndb/include/kernel/signaldata/CreateEvnt.hpp:
remove obsolete attribute storage type ACC vs TUP
ndb/include/kernel/signaldata/CreateIndx.hpp:
remove obsolete attribute storage type ACC vs TUP
ndb/src/ndbapi/ndberror.c:
remove obsolete attribute storage type ACC vs TUP
ndb/test/include/NdbSchemaOp.hpp:
remove obsolete attribute storage type ACC vs TUP
ndb/test/ndbapi/bench/userInterface.cpp:
remove obsolete attribute storage type ACC vs TUP
ndb/test/src/NdbSchemaOp.cpp:
remove obsolete attribute storage type ACC vs TUP
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
ndb/include/ndbapi/NdbTransaction.hpp:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/test/ndbapi/testNodeRestart.cpp:
Auto merged
ndb/test/run-test/daily-devel-tests.txt:
Auto merged
innobase/os/os0file.c:
Auto merged
innobase/srv/srv0start.c:
Auto merged
mysql-test/r/bigint.result:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/r/symlink.result:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
mysql-test/t/symlink.test:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/test/ndbapi/testNodeRestart.cpp:
Auto merged
ndb/test/run-test/daily-devel-tests.txt:
Auto merged
sql/item.h:
Auto merged
strings/ctype-win1250ch.c:
Auto merged
mysql-test/r/grant2.result:
Hand-merged new test
mysql-test/t/grant2.test:
Hand-merged new test
ndb/include/ndbapi/NdbTransaction.hpp:
Used 5.0 version per tomas
sql/sql_acl.cc:
Merge fix for Bug #3309.
temporary added trace printouts for ndb autotest
ndb/ndbapi-examples/ndbapi_async_example/Makefile:
updated example makefiles to add libmystrings
ndb/ndbapi-examples/ndbapi_async_example1/Makefile:
updated example makefiles to add libmystrings
ndb/ndbapi-examples/ndbapi_event_example/Makefile:
updated example makefiles to add libmystrings
ndb/ndbapi-examples/ndbapi_retries_example/Makefile:
updated example makefiles to add libmystrings
ndb/ndbapi-examples/ndbapi_scan_example/Makefile:
updated example makefiles to add libmystrings
ndb/ndbapi-examples/ndbapi_simple_example/Makefile:
updated example makefiles to add libmystrings
ndb/ndbapi-examples/ndbapi_simple_index_example/Makefile:
updated example makefiles to add libmystrings
ndb/src/common/transporter/TransporterRegistry.cpp:
temporary added trace printouts for ndb autotest
Work around the AIX 5.1 security patch ML7 problem in errno when it should be EEXIST
innobase/srv/srv0start.c:
Work around the AIX 5.1 security patch ML7 problem in errno when it should be EEXIST
Work around the AIX 5.1 ML7 patch problem in errno at a higher level, in srv0start.c
os0file.c:
Revert the AIX patch here
innobase/os/os0file.c:
Revert the AIX patch here
innobase/srv/srv0start.c:
Work around the AIX 5.1 ML7 patch problem in errno at a higher level, in srv0start.c
AIX 5.1 after security patch ML7 seems to contain a bug that instead of EEXIST it sets errno to 0 if a file creation fails because the file already exists. Work around that bug by interpreting errno 0 in AIX as EEXIST.
innobase/os/os0file.c:
AIX 5.1 after security patch ML7 seems to contain a bug that instead of EEXIST it sets errno to 0 if a file creation fails because the file already exists. Work around that bug by interpreting errno 0 in AIX as EEXIST.
will not cause "make" to fail.
mysql-test/Makefile.am:
Files of the '*.disabled' pattern may exist, but need not.
So it is important to ignore command failures arising from this pattern not finding
any matches - whereas files of the other types must be present.
and bug#8849 "problem with insert statement with table alias's":
make equality propagation work in stored procedures and prepared
statements.
Equality propagation can change AND/OR structure of ON expressions,
so the fix is to provide each execution of PS/SP with it's own
copy of AND/OR tree. We have been doing that already for WHERE clauses,
now ON clauses are also copied.
mysql-test/r/ps.result:
Bug#8115: test results fixed.
mysql-test/r/sp.result:
Bug#8849: test results fixed.
mysql-test/t/ps.test:
A test case for Bug#8115 "Server Crash with prepared statement".
mysql-test/t/sp.test:
A test case for Bug#8849 "problem with insert statement with table
alias's".
sql/item_cmpfunc.cc:
Comment a parse tree transformation.
sql/item_cmpfunc.h:
Comment how Item_equal works with PS/SP.
sql/mysql_priv.h:
Add declaration for init_stmt_after_parse.
sql/sp_head.cc:
Call init_stmt_after_parse in restore_lex(), which is used to
grab TABLE_LIST and SELECT_LEX list of a parsed substatement of
stored procedure. This is a necessary post-init step which
must be done for any statement which can be executed many times.
sql/sql_prepare.cc:
Implement init_stmt_after_parse() which prepares AND/OR
structure of all ON expressions and WHERE clauses of a statement
for copying.
sql/sql_select.cc:
Implementation of equality propagation inspected with regard to
prepared statements and stored procedures. We now restore
AND/OR structure of every ON expression in addition to AND/OR
structure of WHERE clauses when reexecuting a PS/SP.
sql/table.h:
Add declaration for TABLE::prep_on_expr.
include/my_sys.h:
There are platforms which use '#define errno ...' and then cause a collision with
'extern int errno;', one example is OpenBSD.
Rather than treat them explicitly by the 'HAVE_ERRNO_AS_DEFINE', we can check for these
by using '#ifndef errno'.
move internal mgmapi functions into it.
should also fix AIX build problem.
ndb/include/mgmapi/mgmapi.h:
Move ndb_mgm_convert_to_transporter to mgmapi_internal.h
Should fix AIX build problem
ndb/include/mgmapi/mgmapi_debug.h:
Move ndb_mgm_(get|set)_connection_int_parameter to mgmapi_internal.h
ndb/src/common/transporter/Makefile.am:
Add ndb/src/mgmapi to include for common/transporter (TransporterRegistry requires the use of mgmapi_internal.h)
ndb/src/common/transporter/TransporterRegistry.cpp:
Use mgmapi_internal.h
ndb/src/mgmapi/mgmapi.cpp:
some functions defined in mgmapi_internal.h
ndb/src/ndbapi/ndb_cluster_connection.cpp:
use functions from mgmapi_internal.h
into mysql.com:/home/jonas/src/mysql-5.0-ndb
BitKeeper/etc/logging_ok:
auto-union
ndb/include/kernel/signaldata/CreateIndx.hpp:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item.cc:
Auto merged
sql/log.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
