crash for, e.g., NDB):
Submitting patch to base64_decode() adding extra parameter.
include/base64.h:
Adding parameter to base64_decode() to return the position just after
the string that was decoded.
mysys/base64.c:
Adding comment to base64_decode().
Adding parameter to base64_decode() to return the position just after
the string that was decoded.
sql/share/errmsg.txt:
Adding error message.
storage/ndb/src/mgmapi/mgmapi.cpp:
Parameters to base64_decode() changed.
unittest/mysys/base64-t.c:
Parameters to base64_decode() changed.
into dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.1/mysql-5.1-bug-19651
storage/ndb/include/util/ndb_opts.h:
Auto merged
storage/ndb/test/ndbapi/flexScan.cpp:
Auto merged
storage/ndb/tools/ndb_condig.cpp:
Auto merged
storage/ndb/tools/restore/consumer.hpp:
merged for push bug#19651
storage/ndb/tools/restore/consumer_restore.cpp:
merged for push bug#19651
storage/ndb/tools/restore/consumer_restore.hpp:
merged for push bug#19651
storage/ndb/tools/restore/restore_main.cpp:
merged for push bug#19651
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
storage/ndb/include/kernel/GlobalSignalNumbers.h:
Auto merged
storage/ndb/include/ndbapi/NdbTransaction.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
into perch.ndb.mysql.com:/home/jonas/src/51-work
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
storage/ndb/include/ndbapi/NdbDictionary.hpp:
compute aggregates only before create table or by user request.
remove distribution key hacks (set by user/set by us..)
storage/ndb/src/ndbapi/NdbDictionary.cpp:
compute aggregates only before create table or by user request.
remove distribution key hacks (set by user/set by us..)
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
compute aggregates only before create table or by user request.
remove distribution key hacks (set by user/set by us..)
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
compute aggregates only before create table or by user request.
remove distribution key hacks (set by user/set by us..)
storage/ndb/test/include/NDBT_Table.hpp:
compute aggregates only before create table or by user request.
remove distribution key hacks (set by user/set by us..)
storage/ndb/test/src/NDBT_Tables.cpp:
compute aggregates only before create table or by user request.
remove distribution key hacks (set by user/set by us..)
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
mysql-test/t/disabled.def:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Auto merged
sql/ha_ndbcluster_binlog.h:
Auto merged
sql/sql_show.cc:
Auto merged
and other commands related to ndb. For all of these, the help screen contains
"Ndb.cfg" string. Now i change the "Ndb.cfg" to "my.cnf" because "Ndb.cfg" is obsolete.
storage/ndb/include/util/ndb_opts.h:
Change help information from including "Ndb.cfg" to "my.cnf" in the header file.
storage/ndb/test/ndbapi/flexScan.cpp:
Change help information from including "Ndb.cfg" to "my.cnf".
storage/ndb/tools/ndb_condig.cpp:
Change help information from including "Ndb.cfg" to "my.cnf".
into dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1/mysql-5.1-bug20575
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
into qa3-104.qa.cn.tlan:/mnt/sda7/justin.he/mysql/mysql-5.1/mysql-5.1-ndb-bj
storage/ndb/src/ndbapi/NdbOperation.cpp:
Auto merged
storage/ndb/src/ndbapi/ndberror.c:
change error message to more appropriate
into dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.1/mysql-5.1-bug-20395
storage/ndb/include/kernel/signaldata/CmRegSignalData.hpp:
Auto merged
storage/ndb/include/ndb_version.h.in:
Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Auto merged
storage/ndb/src/kernel/error/ndbd_exit_codes.c:
Auto merged
storage/ndb/include/mgmapi/ndbd_exit_codes.h:
merge for bug#20395.
into dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.1/bug21799
sql/ha_ndbcluster.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_view.cc:
Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
storage/ndb/src/ndbapi/ndberror.c:
Auto merged
"plug.in not included in dist source"
storage/archive/Makefile.am:
plug.in needs to be included in dist
storage/blackhole/Makefile.am:
plug.in needs to be included in dist
storage/csv/Makefile.am:
plug.in needs to be included in dist
storage/example/Makefile.am:
plug.in needs to be included in dist
storage/federated/Makefile.am:
plug.in needs to be included in dist
storage/heap/Makefile.am:
plug.in needs to be included in dist
storage/innobase/Makefile.am:
plug.in needs to be included in dist
storage/myisam/Makefile.am:
plug.in needs to be included in dist
storage/myisammrg/Makefile.am:
plug.in needs to be included in dist
storage/ndb/Makefile.am:
plug.in needs to be included in dist
into dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1/mysql-5.1-bug21530
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
Adding exit error code for some methods
into perch.ndb.mysql.com:/home/jonas/src/51-work
storage/ndb/include/ndb_version.h.in:
Auto merged
storage/ndb/src/common/util/SocketClient.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
Auto merged
storage/ndb/include/kernel/GlobalSignalNumbers.h:
Auto merged
storage/ndb/include/mgmapi/mgmapi.h:
Auto merged
storage/ndb/include/mgmcommon/ConfigRetriever.hpp:
Auto merged
storage/ndb/include/util/SocketClient.hpp:
Auto merged
storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp:
Auto merged
storage/ndb/src/common/transporter/Transporter.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
storage/ndb/src/kernel/vm/Configuration.cpp:
Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
Auto merged
storage/ndb/include/kernel/signaldata/CopyFrag.hpp:
merge
storage/ndb/src/common/debugger/signaldata/SignalNames.cpp:
merge
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
merge
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
merge
storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
merge
into dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.1/bug19787
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
correct error message when illegal configuration changed
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
mysql-test/r/ndb_dd_basic.result:
Auto merged
mysql-test/r/ndb_dd_disk2memory.result:
Auto merged
BitKeeper/deleted/.del-ndb_dd_advance.result:
Auto merged
BitKeeper/deleted/.del-ndb_dd_advance2.result:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
allocate separate copy tuple for delete after insert or update in same tx, instead of sharing pointer to same copy tuple. this is an easy fix independent of commit/abort order of operations
mysql-test/r/ndb_dd_basic.result:
test INS-DEL via assert in disk data code
mysql-test/t/ndb_dd_basic.test:
test INS-DEL via assert in disk data code
into shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint
sql/ha_innodb.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_show.cc:
Auto merged
storage/csv/ha_tina.cc:
Auto merged
mysql-test/mysql-test-run.pl:
Merge
into ymer.(none):/usr/local/mysql/mysql-5.1-ndb-pbsu
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
Temporary tables are not written to disk by DDL operations. This makes
DDL much faster (useful for tests), but tables are lost after system
restart.
New commit, since this feature will not be available in 5.1.
storage/ndb/include/kernel/signaldata/CreateIndx.hpp:
Add new error messages for temporary tables.
storage/ndb/include/kernel/signaldata/CreateTable.hpp:
Add new error messages for temporary tables.
storage/ndb/include/kernel/signaldata/DiAddTab.hpp:
Add parameter for making table temporary.
storage/ndb/include/kernel/signaldata/DictTabInfo.hpp:
Add parameter for making table temporary.
storage/ndb/include/kernel/signaldata/ListTables.hpp:
Add parameter for making table temporary.
storage/ndb/include/ndb_constants.h:
Add parameter for making table temporary.
storage/ndb/include/ndbapi/NdbDictionary.hpp:
Add parameter for making table temporary.
storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
Add parameter for making table temporary.
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Implement temporary tables.
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
Implement temporary tables.
storage/ndb/src/kernel/blocks/dbdict/SchemaFile.hpp:
Implement temporary tables.
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Implement temporary tables.
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Implement temporary tables.
storage/ndb/src/ndbapi/NdbDictionary.cpp:
Implement temporary tables.
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Implement temporary tables.
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
Implement temporary tables.
storage/ndb/src/ndbapi/ndberror.c:
Add new error messages for temporary tables.
storage/ndb/tools/listTables.cpp:
Add display of table and index temporary status.
into dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.1/bug21128
storage/ndb/include/mgmapi/mgmapi.h:
Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
Auto merged
storage/ndb/src/mgmsrv/Services.hpp:
Auto merged
storage/ndb/test/ndbapi/test_event_merge.cpp:
minor
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
1. fix list size info to account for blobs and merges so that cleanups and reports trigger as intended
2. remove big poorly-local loop from free_list which affected also non-blob tables (1. was needed for this)
storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp:
1. fix list size info to account for blobs and merges so that cleanups and reports trigger as intended
2. remove big poorly-local loop from free_list which affected also non-blob tables (1. was needed for this)
fix ndb-violations of strict aliasing found by gcc4.1
(crashes in ndb_dd_*)
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Fix strict-aliasing
storage/ndb/src/kernel/vm/KeyTable2Ref.hpp:
Fix strict-aliasing
storage/ndb/src/kernel/vm/Pool.hpp:
Fix strict-aliasing
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Auto merged
storage/ndb/include/ndbapi/NdbTransaction.hpp:
Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp:
Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
Auto merged
mysql-test/mysql-test-run.pl:
Merge
storage/ndb/include/ndbapi/ndb_cluster_connection.hpp:
Merge
into dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.1/mysql-5.1-bug-21345
BitKeeper/deleted/.del-bug20328.result~4fee68989442c2a3:
Auto merged
BitKeeper/deleted/.del-bug20328.test~c76d766fe3e1eb5:
Auto merged
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
storage/myisam/mi_unique.c:
Auto merged
storage/ndb/include/util/File.hpp:
Auto merged
storage/ndb/src/common/logger/FileLogHandler.cpp:
Auto merged
storage/ndb/src/common/util/File.cpp:
Auto merged
strings/ctype-win1250ch.c:
Auto merged
storage/ndb/src/ndbapi/Ndb.cpp:
Ndb.closeTransaction() modifies the value of Ndb.theError.code,
but the error code shouldn't be changed here.
Mysqld will use the returning error code to log the correct information.
into dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1-bug19873
include/config-netware.h:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/t/func_time.test:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_view.cc:
Auto merged
storage/innobase/btr/btr0btr.c:
Auto merged
storage/innobase/buf/buf0buf.c:
Auto merged
storage/innobase/dict/dict0dict.c:
Auto merged
storage/innobase/fil/fil0fil.c:
Auto merged
storage/innobase/fsp/fsp0fsp.c:
Auto merged
storage/innobase/include/buf0buf.ic:
Auto merged
storage/innobase/log/log0log.c:
Auto merged
storage/innobase/log/log0recv.c:
Auto merged
storage/innobase/os/os0file.c:
Auto merged
storage/innobase/row/row0sel.c:
Auto merged
storage/innobase/srv/srv0start.c:
Auto merged
storage/innobase/ut/ut0dbg.c:
Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
storage/ndb/src/ndbapi/ndberror.c:
Auto merged
tests/mysql_client_test.c:
Auto merged
