ndb/src/kernel/vm/SimulatedBlock.cpp:
Introduced automatic clearing of block global variables
ndb/src/kernel/vm/SimulatedBlock.hpp:
Introduced automatic clearing of block global variables
do not use '' as user in tests, because it picks the Unix login (which gives unexpected results if it is 'root')
(such behaviour is a feature of mysql_real_connect(), see the manual).
mysql-test/t/grant_cache.test:
do not use '' as user in tests, because it picks the Unix login (which gives unexpected results if it is 'root').
sql/slave.cc:
a comment
testDict -n FragmentType
ndb/test/ndbapi/testDict.cpp:
Drop table before trying to create with special fragmentation
ndb/test/ndbapi/testScan.cpp:
testScan -n ScanRandomTable
ndb/test/src/NDBT_Tables.cpp:
testScan -n ScanRandomTable
ctype-simple.c:
Check that unicode map was loaded
cp852.xml:
Missing cp852_bin was added.
sql/share/charsets/cp852.xml:
Missing cp852_bin was added.
strings/ctype-simple.c:
Check that unicode map was loaded
mysys/mf_keycache.c:
bug fixed: when inited=0, can_be_used should be 0 too. (BUG#4901)
end spaces removed (no merge problems as this file doesn't change much)
innobase/buf/buf0flu.c:
buf_flush_write_block_low(): Warn about UNIV_LOG_DEBUG only once
innobase/log/log0recv.c:
log_block_checksum_is_ok_or_old_format(): Disable the check
if UNIV_LOG_DEBUG is defined
BUG#4535
BUG#4686
sql/item_sum.cc:
Changed code of fix_fields
Fixed wrong order of parameters in create_tmp_table
Changed value set_sum_field in create_tmp_table
Bug#4417: SHOW CREATE TABLE and SHOW COLUMNS now return consistent results when "SET NAMES BINARY", i.e. everything is sent in UTF8: column names, enum values, default values.
sql/sql_show.cc:
Bug#4417: SHOW CREATE TABLE and SHOW COLUMNS now return consistent results when "SET NAMES BINARY", i.e. everything is sent in UTF8: column names, enum values, default values.
mysql-test/t/ctype_recoding.test:
Bug#4417: SHOW CREATE TABLE and SHOW COLUMNS now return consistent results when "SET NAMES BINARY", i.e. everything is sent in UTF8: column names, enum values, default values.
mysql-test/r/ctype_recoding.result:
Bug#4417: SHOW CREATE TABLE and SHOW COLUMNS now return consistent results when "SET NAMES BINARY", i.e. everything is sent in UTF8: column names, enum values, default values.
ndb/include/kernel/signaldata/StartInfo.hpp:
Fix signal len
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Put init in constructor
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Send corrent start_inforef
Init NodeRecord::allowNodeStart
ndb/src/kernel/vm/SimulatedBlock.cpp:
Remove all mem-inits so that debug/release don't differ
into mysql.com:/home/jonas/src/mysql-4.1-ndb
ndb/src/common/transporter/Transporter.cpp:
Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
into mysql.com:/home/jonas/src/mysql-4.1-ndb
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/src/mgmapi/mgmapi.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
ndb/src/mgmsrv/Services.cpp:
Auto merged
