added start backup parameter to enable setting wait state
and set different timeouts depending on waitstate
moved listen of backup event out of backup and into separete thread
thread created at connect() and destroyed at disconnect()
added start backup command options "nowait" "wait completed" "wait started"
fixed log level settings
ndb/include/mgmapi/mgmapi.h:
added start backup parameter to enable setting wait state
ndb/src/common/debugger/EventLogger.cpp:
changed to unsigned printout
ndb/src/mgmapi/mgmapi.cpp:
added start backup parameter to enable setting wait state,
and set different timeouts depending on waitstate
ndb/src/mgmclient/CommandInterpreter.cpp:
moved listen of backup event out of backup and into separete thread
thread created at connect() and destroyed at disconnect()
added start backup command options "nowait" "wait completed" "wait started"
ndb/src/mgmsrv/MgmtSrvr.cpp:
added more options to start backup to set wait state
+ set timeout depending on wait state
+ some debug printouts
ndb/src/mgmsrv/MgmtSrvr.hpp:
added more options to start backup to set wait state
ndb/src/mgmsrv/Services.cpp:
removed old backup code
added use of stard backup otions
fixed log level settings
ndb/test/src/NdbBackup.cpp:
adopted to new wait state option in start backup
ndb/include/kernel/AttributeDescriptor.hpp:
wl-1732 support all charsets
ndb/include/kernel/ndb_limits.h:
wl-1732 support all charsets
ndb/include/kernel/signaldata/TuxBound.hpp:
wl-1732 support all charsets
ndb/include/util/NdbSqlUtil.hpp:
wl-1732 support all charsets
ndb/src/common/util/NdbSqlUtil.cpp:
wl-1732 support all charsets
ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
wl-1732 support all charsets
ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
wl-1732 support all charsets
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
wl-1732 support all charsets
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
wl-1732 support all charsets
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
wl-1732 support all charsets
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
wl-1732 support all charsets
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
wl-1732 support all charsets
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
wl-1732 support all charsets
ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp:
wl-1732 support all charsets
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
wl-1732 support all charsets
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
wl-1732 support all charsets
ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
wl-1732 support all charsets
ndb/src/kernel/blocks/dbtux/DbtuxCmp.cpp:
wl-1732 support all charsets
ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp:
wl-1732 support all charsets
ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp:
wl-1732 support all charsets
ndb/src/kernel/blocks/dbtux/DbtuxMaint.cpp:
wl-1732 support all charsets
ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp:
wl-1732 support all charsets
ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
wl-1732 support all charsets
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
wl-1732 support all charsets
ndb/src/ndbapi/NdbOperationDefine.cpp:
wl-1732 support all charsets
ndb/src/ndbapi/NdbOperationSearch.cpp:
wl-1732 support all charsets
ndb/src/ndbapi/NdbScanOperation.cpp:
wl-1732 support all charsets
ndb/src/ndbapi/ndberror.c:
wl-1732 support all charsets
ndb/test/ndbapi/Makefile.am:
wl-1732 support all charsets
ndb/test/ndbapi/testOIBasic.cpp:
wl-1732 support all charsets
ndb/tools/desc.cpp:
wl-1732 support all charsets
ndb/include/kernel/ndb_limits.h:
#define for max null bits
ndb/include/kernel/signaldata/TupFrag.hpp:
Error code for too many nullbits
ndb/include/util/Bitmask.hpp:
Cosmetic fix
ndb/src/common/util/Bitmask.cpp:
handle (pos % 32) == 0
more unit tests
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
Check bitmask overflow
ndb/src/ndbapi/ndberror.c:
New error code
ndb/test/ndbapi/testBitfield.cpp:
Update test program
ndb/test/run-test/daily-basic-tests.txt:
Add testBitfield to autotest
ndb/src/common/util/Bitmask.cpp:
Bug fixes + better unit test
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
fix
ndb/test/ndbapi/testBitfield.cpp:
impl. create_random_table and transactions
ndb/test/src/HugoCalculator.cpp:
Only use "var" size when var-size
ndb/test/include/HugoCalculator.hpp:
Fix calcValue for bits
ndb/test/src/HugoCalculator.cpp:
Fix calcValue for bits
ndb/test/src/HugoOperations.cpp:
Fix calcValue for bits
ndb/test/tools/Makefile.am:
Fix calcValue for bits
ndb/include/kernel/AttributeHeader.hpp:
Add pseudo column for row size
ndb/include/ndbapi/NdbDictionary.hpp:
Add pseudo column for row size
ndb/include/util/Bitmask.hpp:
Remove assert which was not needed
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
Missing break
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
1) New pseudo column ROW_SIZE
2) Fix bug in Bit columns
ndb/src/ndbapi/NdbDictionary.cpp:
Fix prinout of bit column
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Bug fix Bit column
ndb/src/ndbapi/NdbRecAttr.cpp:
Fix prinout of bit column
ndb/test/src/HugoCalculator.cpp:
Bit enable Hugo
ndb/test/src/HugoOperations.cpp:
Bit enable Hugo
ndb/test/src/NDBT_Tables.cpp:
Bit enable Hugo
ndb/src/ndbapi/DictCache.cpp:
fix aligment when 32-bit pointers and 64-bit ha_rows
ndb/src/ndbapi/DictCache.hpp:
fix aligment when 32-bit pointers and 64-bit ha_rows
All our programs which use mysql_real_connect() and mysql_connect() are updated accordingly, though I have deliberately
made mysqlimport not reconnect anymore (already true for mysqldump >= 4.1.8).
All Connector devs have been warned about the change I'm doing here - which was agreed with Monty,
and fixes BUG#2555.
VC++Files/libmysqltest/mytest.c:
explicit mention of reconnect (no behaviour change)
VC++Files/mysqlmanager/mysqlmanagerview.cpp:
explicit mention of reconnect (no behaviour change)
VC++Files/test1/mysql_thr.c:
explicit mention of reconnect (no behaviour change)
VC++Files/winmysqladmin/main.cpp:
explicit mention of reconnect (no behaviour change)
client/mysql.cc:
explicit mention of reconnect if embedded (no behaviour change)
client/mysqladmin.cc:
explicit mention of reconnect (no behaviour change)
client/mysqlbinlog.cc:
explicit mention of reconnect (no behaviour change)
client/mysqlcheck.c:
explicit mention of reconnect (no behaviour change)
client/mysqlimport.c:
explicit mention of NO reconnect (behaviour change). As most time is passed in LOAD DATA INFILE,
and as it does not make sense to reconnect after a partly failed LOAD... And as mysqlimport sometimes
does LOCK TABLES where we mustn't reconnect...
client/mysqlshow.c:
explicit mention of reconnect (no behaviour change)
client/mysqltest.c:
explicit mention of reconnect (no behaviour change).
Normally we should not reconnect (it's not good to have silent reconnection in the middle of a test),
but 5.0 is too touchy to change it now. I'm marking it TODO.
libmysql/libmysql.c:
explicit mention of reconnect (no behaviour change)
libmysqld/examples/builder-sample/emb_samples.cpp:
explicit mention of reconnect (no behaviour change)
ndb/test/ndbapi/flex_bench_mysql.cpp:
explicit mention of reconnect (no behaviour change)
ndb/tools/restore/consumer_restorem.cpp:
explicit mention of reconnect (no behaviour change)
sql-common/client.c:
Changing the default of libmysqlclient : it's now NO reconnection.
sql/repl_failsafe.cc:
explicit mention of reconnect (no behaviour change)
sql/slave.cc:
explicit mention of reconnect (no behaviour change)
tests/client_test.c:
explicit mention of reconnect (no behaviour change)
tests/connect_test.c:
explicit mention of reconnect (no behaviour change)
tests/deadlock_test.c:
explicit mention of reconnect (no behaviour change)
tests/insert_test.c:
explicit mention of reconnect (no behaviour change)
tests/list_test.c:
explicit mention of reconnect (no behaviour change)
tests/select_test.c:
explicit mention of reconnect (no behaviour change)
tests/showdb_test.c:
explicit mention of reconnect (no behaviour change)
tests/ssl_test.c:
explicit mention of reconnect (no behaviour change)
tests/thread_test.c:
explicit mention of reconnect (no behaviour change)
tools/mysqlmanager.c:
explicit mention of reconnect (no behaviour change)
into mysql.com:/home/jonas/src/mysql-5.0
ndb/src/kernel/blocks/backup/Backup.cpp:
Auto merged
ndb/src/kernel/blocks/backup/Backup.hpp:
Auto merged
ndb/src/kernel/blocks/backup/BackupInit.cpp:
Auto merged
ndb/tools/restore/restore_main.cpp:
Auto merged
into mysql.com:/home/jonas/src/mysql-4.1
ndb/src/kernel/blocks/backup/Backup.cpp:
Auto merged
ndb/src/kernel/blocks/backup/Backup.hpp:
Auto merged
ndb/src/kernel/blocks/backup/BackupInit.cpp:
Auto merged
ndb/tools/restore/restore_main.cpp:
Auto merged
created by 4.1.7 as bugfix changed binary format
ndb/tools/restore/Restore.cpp:
Fixed so that version 4.1.8 of restore can read
files created by 4.1.7
ndb/tools/restore/Restore.hpp:
Fixed so that version 4.1.8 of restore can read
files created by 4.1.7
ndb/tools/restore/main.cpp:
Fixed so that version 4.1.8 of restore can read
files created by 4.1.7
don't store keys in normalized form
instead save everythings as normal attributes
ndb/src/kernel/blocks/backup/Backup.cpp:
Remove special handling of keys, that was build to support
tables where keys was only stored in ACC
ndb/src/kernel/blocks/backup/Backup.hpp:
Remove special handling of keys, that was build to support
tables where keys was only stored in ACC
ndb/src/kernel/blocks/backup/BackupInit.cpp:
Remove special handling of keys, that was build to support
tables where keys was only stored in ACC
ndb/tools/restore/Restore.cpp:
Remove special handling of keys, that was build to support
tables where keys was only stored in ACC
ndb/tools/restore/Restore.hpp:
Remove special handling of keys, that was build to support
tables where keys was only stored in ACC
ndb/src/ndbapi/TransporterFacade.cpp:
Remove dead #if 0'd out condition with misleading comment
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
ndb/include/Makefile.am:
remove result set
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Fix so that noOfFiredTriggers aren't overwritten during scans
sql/ha_ndbcluster.cc:
1) Fix bugs in completed read_multi_range
2) Change buffer handling so range scan are always put last in buffer
This to support restart of scan
sql/ha_ndbcluster.h:
1) Fix bugs in completed read_multi_range
2) Change buffer handling so range scan are always put last in buffer
This to support restart of scan
ndb/include/util/Bitmask.hpp:
Add general set/getField
ndb/src/common/util/Bitmask.cpp:
Test program for bitmask
ndb/src/common/util/Makefile.am:
Test program for bitmask
into mysql.com:/home/jonas/src/wl2126
ndb/include/ndbapi/NdbDictionary.hpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
Auto merged
Starting ndb_mgmd on a host which isn't in the configuration file as the ndb_mgmd
(e.g. the ip address is different) would have ndb_mgmd segfault.
There was a check in the code, but it was (potentially) trying to dereference null
ndb/src/mgmsrv/MgmtSrvr.cpp:
Don't try and print client_addr->sin_addr if client_addr is null
configure.in:
Auto merged
BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
Auto merged
BitKeeper/deleted/.del-ha_isam.cc~4dce65904db2675e:
Auto merged
BitKeeper/deleted/.del-ha_isammrg.cc~dc682e4755d77a2e:
Auto merged
client/mysqldump.c:
Auto merged
client/mysqltest.c:
Auto merged
heap/hp_create.c:
Auto merged
heap/hp_delete.c:
Auto merged
heap/hp_hash.c:
Auto merged
heap/hp_write.c:
Auto merged
include/decimal.h:
Auto merged
include/m_ctype.h:
Auto merged
libmysql/libmysql.c:
Auto merged
libmysqld/Makefile.am:
Auto merged
myisam/mi_check.c:
Auto merged
myisam/mi_create.c:
Auto merged
myisam/mi_write.c:
Auto merged
mysql-test/r/ctype_tis620.result:
Auto merged
mysql-test/r/ctype_ucs.result:
Auto merged
mysql-test/r/myisam.result:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/r/order_by.result:
Auto merged
mysql-test/r/ps.result:
Auto merged
mysql-test/r/ps_1general.result:
Auto merged
mysql-test/r/ps_2myisam.result:
Auto merged
mysql-test/r/ps_3innodb.result:
Auto merged
mysql-test/r/ps_4heap.result:
Auto merged
mysql-test/r/ps_5merge.result:
Auto merged
mysql-test/r/ps_6bdb.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/r/strict.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/type_blob.result:
Auto merged
mysql-test/t/ctype_ucs.test:
Auto merged
mysql-test/t/endspace.test:
Auto merged
mysql-test/t/myisam.test:
Auto merged
mysql-test/t/ps_1general.test:
Auto merged
mysql-test/t/strict.test:
Auto merged
mysql-test/t/type_blob.test:
Auto merged
ndb/src/common/util/NdbSqlUtil.cpp:
Auto merged
scripts/mysql_fix_privilege_tables.sh:
Auto merged
sql/field.h:
Auto merged
sql/field_conv.cc:
Auto merged
sql/ha_heap.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/opt_sum.cc:
Auto merged
sql/protocol.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_help.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/structs.h:
Auto merged
sql/table.cc:
Auto merged
strings/ctype-czech.c:
Auto merged
strings/ctype-uca.c:
Auto merged
strings/ctype-utf8.c:
Auto merged
strings/ctype-win1250ch.c:
Auto merged
strings/decimal.c:
Auto merged
tests/client_test.c:
Auto merged
mysql-test/r/bdb.result:
Merge with VARCHAR code
mysql-test/r/heap.result:
Merge with VARCHAR code
mysql-test/r/innodb.result:
Merge with VARCHAR code
mysql-test/r/select.result.es:
Merge with VARCHAR code
mysql-test/t/bdb.test:
Merge with VARCHAR code
mysql-test/t/heap.test:
Merge with VARCHAR code
mysql-test/t/innodb.test:
Merge with VARCHAR code
sql/field.cc:
Merge with VARCHAR code
sql/item.cc:
Merge with VARCHAR code
sql/sql_acl.cc:
Merge with VARCHAR code
sql/sql_parse.cc:
Merge with VARCHAR code
sql/sql_table.cc:
Merge with VARCHAR code
sql/sql_update.cc:
Merge with VARCHAR code
sql/table.h:
Merge with VARCHAR code
strings/ctype-mb.c:
Don't pad my_like_range with max_str for simple LIKE expression
strings/ctype-tis620.c:
Merge with VARCHAR code
strings/ctype-ucs2.c:
Added new argument to my_strnncollsp_ucs2()
Simply code
into mysql.com:/home/jonas/src/wl1744
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
ndb/include/Makefile.am:
Auto merged
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
Auto merged
ndb/src/common/util/version.c:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
Auto merged
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/src/mgmsrv/main.cpp:
Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
ndb/include/util/Bitmask.hpp:
New methods for working with bit fields of
arbitrary size
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
Use BitmaskImpl at all time (in BitField operations)
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
BUILD/SETUP.sh:
Auto merged
Build-tools/Do-compile:
Auto merged
client/mysqladmin.cc:
Auto merged
configure.in:
Auto merged
innobase/include/lock0lock.h:
Auto merged
innobase/os/os0file.c:
Auto merged
libmysqld/Makefile.am:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/ctype_ucs.result:
Auto merged
mysql-test/r/heap.result:
Auto merged
mysql-test/r/insert_select.result:
Auto merged
mysql-test/r/lowercase_table3.result:
Auto merged
mysql-test/r/rpl_start_stop_slave.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/t/ctype_ucs.test:
Auto merged
mysql-test/t/rpl_until.test:
Auto merged
mysql-test/t/subselect.test:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/ha_myisam.h:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/lock.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/slave.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_rename.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/log_event.cc:
Merge with 4.1
Trivial cleanup
into mysql.com:/home/jonas/src/wl2126
ndb/include/ndbapi/NdbScanOperation.hpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
ndb/test/ndbapi/testScanPerf.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged