into perch.ndb.mysql.com:/home/jonas/src/51-ndb
storage/ndb/include/kernel/ndb_limits.h:
Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp:
Auto merged
storage/ndb/src/kernel/blocks/lgman.cpp:
Auto merged
storage/ndb/src/kernel/blocks/lgman.hpp:
Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
Auto merged
storage/ndb/src/kernel/SimBlockList.cpp:
merge
configure.in:
Auto merged
client/mysqlimport.c:
Auto merged
include/config-win.h:
Auto merged
mysql-test/r/create.result:
Auto merged
mysql-test/t/create.test:
Auto merged
mysql-test/t/disabled.def:
Auto merged
scripts/mysql_fix_privilege_tables.sql:
Auto merged
sql/field.h:
Auto merged
sql/log_event.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_partition.cc:
Auto merged
sql/sql_table.cc:
Auto merged
mysql-test/t/mysqldump.test:
SCCS merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
blob fix 1: cache no tables at create.
previously main table was cached before blob tables were ready.
autoincr fix to avoid caching as side-effect.
also removes some rename fix where createBlobTables had old/new args.
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
blob fix 1: cache no tables at create.
previously main table was cached before blob tables were ready.
autoincr fix to avoid caching as side-effect.
also removes some rename fix where createBlobTables had old/new args.
storage/ndb/src/ndbapi/ndberror.c:
blob fix 1: cache no tables at create.
previously main table was cached before blob tables were ready.
autoincr fix to avoid caching as side-effect.
also removes some rename fix where createBlobTables had old/new args.
convert Dbtup::Page_request and pgman::Page_request to WOPool
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
remove bad method call
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
Convert disk records to shared global mem users
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
Convert disk records to shared global mem users
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
Convert disk records to shared global mem users
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
Make buddy is initialized first
storage/ndb/src/kernel/blocks/pgman.cpp:
Convert disk records to shared global mem users
storage/ndb/src/kernel/blocks/pgman.hpp:
Convert disk records to shared global mem users
storage/ndb/src/kernel/vm/DLFifoList.hpp:
Made pool templ. ag of DLFifoList + cleanup some
storage/ndb/src/kernel/vm/SLFifoList.hpp:
Add a few likely's + format some code
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
Add records types to blocks includes
into mysql.com:/home/my/mysql-5.1
BitKeeper/deleted/.del-innodb_notembedded.test:
Delete: mysql-test/t/innodb_notembedded.test
BitKeeper/deleted/.del-sp_notembedded.test:
Delete: mysql-test/t/sp_notembedded.test
BitKeeper/deleted/.del-subselect_notembedded.test:
Delete: mysql-test/t/subselect_notembedded.test
BitKeeper/deleted/.del-ctype_cp932_notembedded.result:
Delete: mysql-test/r/ctype_cp932_notembedded.result
BitKeeper/deleted/.del-innodb_notembedded.result:
Delete: mysql-test/r/innodb_notembedded.result
BitKeeper/deleted/.del-sp_notembedded.result:
Delete: mysql-test/r/sp_notembedded.result
BitKeeper/deleted/.del-subselect_notembedded.result:
Delete: mysql-test/r/subselect_notembedded.result
configure.in:
Auto merged
include/mysql.h:
Auto merged
libmysql/libmysql.c:
Auto merged
libmysqld/emb_qcache.cc:
Auto merged
libmysqld/embedded_priv.h:
Auto merged
libmysqld/libmysqld.c:
Auto merged
mysql-test/extra/binlog_tests/blackhole.test:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/mysqltest.result:
Auto merged
mysql-test/r/query_cache.result:
Auto merged
mysql-test/r/query_cache_notembedded.result:
Auto merged
mysql-test/r/sp-error.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/r/view_grant.result:
Auto merged
mysql-test/t/backup.test:
Auto merged
mysql-test/t/compress.test:
Auto merged
mysql-test/t/delayed.test:
Auto merged
mysql-test/t/handler.test:
Auto merged
mysql-test/t/mysql.test:
Auto merged
mysql-test/t/mysql_client_test.test:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
mysql-test/t/query_cache_notembedded.test:
Auto merged
mysql-test/t/read_only.test:
Auto merged
mysql-test/t/skip_grants.test:
Auto merged
mysql-test/t/sp-destruct.test:
Auto merged
mysql-test/t/sp-error.test:
Auto merged
mysql-test/t/sp-threads.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/t/temp_table.test:
Auto merged
mysql-test/t/view_grant.test:
Auto merged
mysql-test/t/wait_timeout.test:
Auto merged
mysys/mf_dirname.c:
Auto merged
sql/field.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item.h:
Auto merged
sql/log_event.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/protocol.cc:
Auto merged
sql/protocol.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_cursor.cc:
Auto merged
sql/sql_db.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/table.h:
Auto merged
sql/tztime.cc:
Auto merged
sql/tztime.h:
Auto merged
storage/ndb/include/ndbapi/NdbDictionary.hpp:
Auto merged
tests/mysql_client_test.c:
Auto merged
libmysqld/lib_sql.cc:
Manual merge
mysql-test/extra/binlog_tests/binlog.test:
Manual merge
mysql-test/extra/binlog_tests/ctype_cp932.test:
No changes
mysql-test/r/binlog_stm_binlog.result:
Manual merge
mysql-test/r/binlog_stm_ctype_cp932.result:
No changes
mysql-test/t/innodb.test:
Manual merge
mysql-test/t/view.test:
Manual merge
mysys/my_bitmap.c:
Manual merge
scripts/mysql_fix_privilege_tables.sql:
Manual merge
sql/item.cc:
Manual merge
sql/sql_cache.h:
Manual merge
sql/sql_class.h:
Manual merge
sql/sql_update.cc:
Manual merge
storage/ndb/src/common/transporter/Transporter.cpp:
use sockaddr_in in declarations to guarantee sin_addr alignment
storage/ndb/src/mgmsrv/Services.cpp:
use sockaddr_in in declarations to guarantee sin_addr alignment
into eel.(none):/home/jonas/src/mysql-5.1-new
storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp:
Auto merged
storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp:
merge
fix static log waiter pool
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Clear shared pool to prevent double free at shutdown
storage/ndb/src/kernel/blocks/lgman.cpp:
Update to use WOPool and SLFifoList
storage/ndb/src/kernel/blocks/lgman.hpp:
Use WOPool for log waiters
storage/ndb/src/kernel/blocks/record_types.hpp:
Update record types
storage/ndb/src/kernel/vm/ArrayPool.hpp:
New method
storage/ndb/src/kernel/vm/Makefile.am:
Add WOPool
storage/ndb/src/kernel/vm/Pool.cpp:
New BitKeeper file ``storage/ndb/src/kernel/vm/Pool.cpp''
storage/ndb/src/kernel/vm/Pool.hpp:
New methods
storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp:
remove unused parameters
storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp:
remove unused parameters
storage/ndb/src/kernel/vm/SLFifoList.hpp:
New BitKeeper file ``storage/ndb/src/kernel/vm/SLFifoList.hpp''
storage/ndb/src/kernel/vm/WOPool.cpp:
New BitKeeper file ``storage/ndb/src/kernel/vm/WOPool.cpp''
storage/ndb/src/kernel/vm/WOPool.hpp:
New BitKeeper file ``storage/ndb/src/kernel/vm/WOPool.hpp''
Fix incorrect assumption that sync(lsn) will be in order
keep track of max sync(lsn)
storage/ndb/src/kernel/blocks/lgman.cpp:
Fix incorrect assumption that sync(lsn) will be in order
keep track of max sync(lsn)
storage/ndb/src/kernel/blocks/lgman.hpp:
Fix incorrect assumption that sync(lsn) will be in order
keep track of max sync(lsn)
some more printouts in unit test of buddy
storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp:
Some more printouts
storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp:
Some more util methods
storage/ndb/include/kernel/ndb_limits.h:
remove hardcoded limit
storage/ndb/include/kernel/signaldata/FsReadWriteReq.hpp:
Add new format "shared" page to easily migrate from/to superpool
storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
Introduce new config parameter for "SharedGlobalMemory",
only user is so far undo log buffer memory
storage/ndb/src/common/debugger/signaldata/FsReadWriteReq.cpp:
Add new format "shared" page to easily migrate from/to superpool
storage/ndb/src/kernel/SimBlockList.cpp:
Fix compiler error
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Add new format "shared" page to easily migrate from/to superpool
storage/ndb/src/kernel/blocks/lgman.cpp:
Add new format "shared" page to easily migrate from/to superpool
storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
Add new format "shared" page to easily migrate from/to superpool
storage/ndb/src/kernel/vm/GlobalData.hpp:
Add new format "shared" page to easily migrate from/to superpool
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
Add new format "shared" page to easily migrate from/to superpool
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
Add new format "shared" page to easily migrate from/to superpool
storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp:
better startup printouts
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Introduce new config parameter for "SharedGlobalMemory",
only user is so far undo log buffer memory
storage/ndb/src/mgmsrv/InitConfigFileParser.cpp:
Fix bug in handling of my.cnf files
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
- add resource limit to buddy allocator
storage/ndb/src/kernel/SimBlockList.cpp:
Add emulator data to args
storage/ndb/src/kernel/blocks/record_types.hpp:
Update record types
storage/ndb/src/kernel/main.cpp:
Add emulator data to args
storage/ndb/src/kernel/vm/Emulator.cpp:
Add emulator data to args
storage/ndb/src/kernel/vm/Emulator.hpp:
Add emulator data to args
storage/ndb/src/kernel/vm/Makefile.am:
Add emulator data to args
storage/ndb/src/kernel/vm/Pool.hpp:
Update
storage/ndb/src/kernel/vm/SimBlockList.hpp:
Add emulator data to args
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
Add emulator data to args
storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp:
use resource_limit in buddy
storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp:
Add emulator data to args
storage/ndb/src/kernel/vm/Pool.cpp:
New BitKeeper file ``storage/ndb/src/kernel/vm/Pool.cpp''
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
sync create tabe to undo log, so that undo for other table is not run after SR
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
Sync create table in undo log
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
Sync create table in undo log
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
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
