into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
sql/ha_ndbcluster.cc:
Auto merged
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
Auto merged
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/ha_ndbcluster_binlog.h:
Auto merged
storage/ndb/include/ndbapi/NdbDictionary.hpp:
Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbDictionary.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Merge
storage/ndb/src/ndbapi/NdbBlob.cpp:
DBUG
storage/ndb/include/ndbapi/Ndb.hpp:
method to set db/schema from table name + format check in internalize_table_name
storage/ndb/include/ndbapi/NdbDictionary.hpp:
method to set db/schema from table name + format check in internalize_table_name
storage/ndb/src/ndbapi/Ndb.cpp:
method to set db/schema from table name + format check in internalize_table_name
sql/ha_ndbcluster_binlog.cc:
set injector_ndb db/schema before calling NDB (may be more cases..). only place to get it is table internal name
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
Fixed that myisam_ftdump fails (error 138 that is HA_ERR_UNSUPPORTED)
to open table with fulltext index with custom parser.
storage/myisam/myisam_ftdump.c:
Allow myisam_ftdump to open table with fulltext index
with custom parser. This is implemented by passing
HA_OPEN_FROM_SQL_LAYER flag to mi_open().
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-ndb_improved_on-line_discover
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Merge
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
into mysql.com:/home/stewart/Documents/MySQL/5.1/new
storage/ndb/include/util/File.hpp:
Auto merged
storage/ndb/src/common/portlib/NdbConfig.c:
Auto merged
storage/ndb/src/common/util/File.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/sql_plugin.cc:
Auto merged
sql/sql_select.cc:
Auto merged
tests/mysql_client_test.c:
Auto merged
client/mysqlslap.c:
SCCS merged
configure.in:
SCCS merged
libmysql/libmysql.c:
SCCS merged
mysys/my_init.c:
SCCS merged
1. dbug state is now local to a thread
2. new macros: DBUG_EXPLAIN, DBUG_EXPLAIN_INITIAL,
DBUG_SET, DBUG_SET_INITIAL, DBUG_EVALUATE, DBUG_EVALUATE_IF
3. macros are do{}while(0) wrapped
4. incremental modifications to the dbug state (e.g. "+d,info:-t")
5. dbug code cleanup, style fixes
6. _db_on_ and DEBUGGER_ON/OFF removed
7. rest of MySQL code fixed because of 3 (missing ;) and 6
8. dbug manual updated
9. server variable @@debug (global and local) to control dbug from SQL!
a. -#T to print timestamps in the log
BitKeeper/deleted/.del-readme.prof~2f3bae1550a0038d:
Delete: dbug/readme.prof
client/mysqlslap.c:
typo fixed
configure.in:
test for sleep() too
dbug/dbug.c:
thread local dbug settings
DBUG_EXPLAIN,DBUG_EXPLAIN_INITIAL,DBUG_SET,DBUG_SET_INITIAL
style changes to be more in line with MySQL code
cleanup (many mallocs removed)
incremental modification of dbug state (e.g. DBUG_PUSH("+t:-d,info"))
DBUG_SET, _db_explain_
-#T
dbug/monty.doc:
obsolete and duplicate docs removed
dbug/user.r:
new features documented
include/my_dbug.h:
correct do{}while wrapping
thread local dbug settings
DBUG_EXPLAIN,DBUG_EXPLAIN_INITIAL,DBUG_SET,DBUG_SET_INITIAL
DBUG_EVALUATE,DBUG_EVALUATE_IF
libmysql/libmysql.c:
remove _db_on_ and DEBUGGER_ON/OFF
mysys/my_init.c:
missed DBUG_RETURN
mysys/my_thr_init.c:
bugfix - transaction id's are unsigned
mysys/testhash.c:
remove _db_on_ and DEBUGGER_ON/OFF
sql/ha_myisammrg.cc:
missed ;
sql/ha_ndbcluster.cc:
remove _db_on_ and DEBUGGER_ON/OFF
missed ;
sql/ha_ndbcluster_binlog.cc:
remove _db_on_ and DEBUGGER_ON/OFF
missed ;
sql/item_cmpfunc.cc:
missed ;
sql/lock.cc:
missed DBUG_RETURN
sql/log_event.cc:
missed ;
sql/mysqld.cc:
remove _db_on_ and DEBUGGER_ON/OFF
missed ;
DBUG_SET_INITIAL
sql/opt_range.cc:
remove _db_on_ and DEBUGGER_ON/OFF
sql/set_var.cc:
class sys_var_thd_dbug and "debug" server variable
sql/set_var.h:
class sys_var_thd_dbug and "debug" server variable
sql/slave.cc:
missed ;
sql/sql_cache.cc:
missed ;
sql/sql_plugin.cc:
missed ;
sql/sql_select.cc:
remove _db_on_ and DEBUGGER_ON/OFF
storage/heap/hp_test2.c:
remove _db_on_ and DEBUGGER_ON/OFF
storage/myisam/ft_eval.c:
remove _db_on_ and DEBUGGER_ON/OFF
storage/myisam/ft_test1.c:
remove _db_on_ and DEBUGGER_ON/OFF
storage/myisam/mi_open.c:
remove _db_on_ and DEBUGGER_ON/OFF
missed ;
storage/myisam/mi_test1.c:
remove _db_on_ and DEBUGGER_ON/OFF
storage/myisam/mi_test2.c:
remove _db_on_ and DEBUGGER_ON/OFF
storage/myisam/mi_test3.c:
remove _db_on_ and DEBUGGER_ON/OFF
storage/ndb/src/ndbapi/DictCache.cpp:
missed ;
storage/ndb/src/ndbapi/NdbTransaction.cpp:
missed ;
tests/mysql_client_test.c:
remove _db_on_ and DEBUGGER_ON/OFF
plugin.h has been moved into include/mysql/plugin.h
include/mysql/plugin.h:
Rename: include/plugin.h -> include/mysql/plugin.h
include/Makefile.am:
plugin.h has been moved into include/mysql/plugin.h
include/myisam.h:
plugin.h has been moved into include/mysql/plugin.h
plugin/fulltext/plugin_example.c:
plugin.h has been moved into include/mysql/plugin.h
sql/sql_plugin.h:
plugin.h has been moved into include/mysql/plugin.h
storage/csv/ha_tina.cc:
plugin.h has been moved into include/mysql/plugin.h
storage/example/ha_example.cc:
plugin.h has been moved into include/mysql/plugin.h
storage/myisam/ftdefs.h:
plugin.h has been moved into include/mysql/plugin.h
into perch.ndb.mysql.com:/home/jonas/src/51-ndb
storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/lgman.cpp:
Auto merged
storage/ndb/src/kernel/blocks/pgman.cpp:
Auto merged
storage/ndb/src/kernel/blocks/pgman.hpp:
Auto merged
storage/ndb/src/kernel/blocks/tsman.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
merge
sql/ha_ndbcluster.cc:
Auto merged
storage/ndb/include/mgmapi/mgmapi.h:
Auto merged
storage/ndb/include/ndbapi/ndb_cluster_connection.hpp:
Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp:
Auto merged
storage/ndb/tools/restore/consumer_restore.cpp:
Auto merged
Remove old typedef's ArrayFifoList, ArrayList
BitKeeper/deleted/.del-ArrayFifoList.hpp~7036ae04dd7e7bd2:
Delete: storage/ndb/src/kernel/vm/ArrayFifoList.hpp
BitKeeper/deleted/.del-ArrayList.hpp~44695d09b1a02179:
Delete: storage/ndb/src/kernel/vm/ArrayList.hpp
storage/ndb/src/kernel/SimBlockList.cpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/backup/BackupInit.cpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/dbutil/DbUtil.cpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/dbutil/DbUtil.hpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/lgman.cpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/lgman.hpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.hpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/ndbfs/VoidFs.cpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/pgman.cpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/pgman.hpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/restore.cpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/restore.hpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/suma/Suma.hpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/suma/SumaInit.cpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/trix/Trix.cpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/trix/Trix.hpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/tsman.cpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/tsman.hpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/vm/DLHashTable.hpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/vm/DLHashTable2.hpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/vm/SimBlockList.hpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
Change block constructor for more flexibility
storage/ndb/src/kernel/blocks/record_types.hpp:
New BitKeeper file ``storage/ndb/src/kernel/blocks/record_types.hpp''
storage/ndb/src/kernel/vm/Pool.hpp:
New BitKeeper file ``storage/ndb/src/kernel/vm/Pool.hpp''
storage/ndb/src/kernel/vm/RecordPool.hpp:
New BitKeeper file ``storage/ndb/src/kernel/vm/RecordPool.hpp''
include/config-netware.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
netware/BUILD/compile-AUTOTOOLS:
Auto merged
netware/Makefile.am:
Auto merged
netware/my_manage.h:
Auto merged
netware/mysql_test_run.c:
Auto merged
netware/BUILD/compile-linux-tools:
Auto merged
netware/BUILD/compile-netware-END:
Auto merged
netware/BUILD/mwenv:
Auto merged
netware/BUILD/nwbootstrap:
Auto merged
server-tools/instance-manager/Makefile.am:
Auto merged
sql/log.cc:
Auto merged
sql/log.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.cc:
Auto merged
storage/innobase/include/univ.i:
Auto merged
storage/innobase/os/os0thread.c:
Auto merged
storage/myisam/mi_locking.c:
Auto merged
storage/ndb/src/kernel/blocks/Makefile.am:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/Makefile.am:
Auto merged
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
Auto merged
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/ndb_basic.result:
Auto merged
mysql-test/t/ndb_basic.test:
Auto merged
sql/sql_prepare.cc:
Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
sql/ha_ndbcluster.cc:
SCCS merged
sql/ha_ndbcluster.h:
SCCS merged
Originally, done by Jani and pushed to the general 5.1 tree
as ChangeSet 2006/02/02 16:22:31+02:00 jani@ua141d10.elisa.omakaista.fi
now just copied to the 5.1.6 build clone.
configure.in:
To configure InnoDB for cross compilation.
include/config-netware.h:
NetWare specific change to fix the compilation errors caused by event.h
NetWare specific change required for WINE PATH and for new versions LibC(Jun 05)
and zlib(1.2.3)
netware/BUILD/compile-AUTOTOOLS:
Netware specific change reflecting the change in source code
directory structure.
netware/BUILD/compile-linux-tools:
Netware specific change to fix the location where gen_lex_hash
gets created. Fixed also directory structure reflecting changes.
netware/BUILD/compile-netware-END:
Netware specific change for creating mysqld_error.h
netware/BUILD/mwenv:
Netware specific change required for WINE PATH and for
new versions LibC(Jun 05) and zlib(1.2.3).
netware/BUILD/nwbootstrap:
NetWare Specific change to produce absoulte path for XDC file.
netware/Makefile.am:
Netware specific changes to fix to match new
directory structure.
netware/my_manage.h:
Netware specific change required for WINE PATH and for new versions
LibC(Jun 05) and zlib(1.2.3).
((I fail to understand the above comment for this change -
seems just to be a number alignment and a "#define NULL". Joerg))
netware/mysql_test_run.c:
Netware specific change, added --autoclose option for mysql_test_run.nlm.
sql/mysqld.cc:
Stacksize change for Netware.
Netware specific change to fix the compilation errors caused by event.h
sql/set_var.cc:
Minor indending related fix.
sql/sql_class.cc:
Added #ifdef HAVE_EXPLICIT_TEMPLATE_INSTANTIATION macro.
storage/innobase/os/os0thread.c:
Netware specific change to increase the thread stack size.
storage/myisam/mi_locking.c:
Enclosed MMAP related code under HAVE_MMAP preprocessor directive.
storage/innobase/include/univ.i:
Part of innodb-5.0-149/162 snapshots:
Avoid breaking --with-debug builds on QNX and other systems
whose compiler pretends to be GCC 2.
Outside __WIN__ define UNIV_INLINE as static inline.
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
into perch.ndb.mysql.com:/home/jonas/src/51-new
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
into perch.ndb.mysql.com:/home/jonas/src/51-new
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
into mysql.com:/home/alexi/innodb/mysql-5.1-merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/t/innodb.test:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
