into willster.(none):/home/stewart/Documents/MySQL/5.1/bug20073
client/mysqldump.c:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/sql_show.cc:
Auto merged
the following start, stop and restart operations aren't execute correctly
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
Adding some source codes check node list whether or not stopped for STOP_REQ signal.
If all of these nodes have stopped, then STOP_CONF signal will return.
ndb/src/mgmclient/CommandInterpreter.cpp:
Ensure ndb_mgm can only transmit the valid range node id to management server.
if the node id is greater than MAX_NODES, management server will exit abnormally.
ndb/src/mgmsrv/MgmtSrvr.cpp:
Ensure management server can only transmit the data node id to data node process.
We were not parsing the EXTRA field to get UNDO_BUFFER_SIZE for the
CREATE LOGFILE GROUP statement in the dump.
client/mysqldump.c:
parse the EXTRA field of INFORMATION_SCHEMA.FILES to determine the UNDO_BUFFER_SIZE
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.
ndb/include/util/ndb_opts.h:
Change help info from Ndb.cfg to my.cnf in the header file.
ndb/test/ndbapi/flexScan.cpp:
Change help info from Ndb.cfg to my.cnf.
ndb/tools/ndb_config.cpp:
Change help info from Ndb.cfg to my.cnf
Change things around so that we add a row for each log file group that lists
the free space for that log file group.
client/mysqldump.c:
dump logfile groups correctly (ignore row for the log file group itself)
mysql-test/r/ndb_dd_dump.result:
update results with new row for log file groups
sql/ha_ndbcluster.cc:
for fill_files_table:
- set null bits properly
- add rows for log file groups with free undo space.
sql/sql_show.cc:
make most I_S.FILES columns nullable to better fit with reality.
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 dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.0/bug21530
ndb/src/mgmclient/CommandInterpreter.cpp:
Many methods add the return value that indicates whether the execution of operation succeeds.
This can make ndb_mgm management client set the exit status on errors.
Fix so that scans closed before execute are removed from "scans to send list"
ndb/include/ndbapi/NdbTransaction.hpp:
Fix so that scans closed before execute are removed from "scans to send list"
ndb/src/ndbapi/NdbScanOperation.cpp:
Fix so that scans closed before execute are removed from "scans to send list"
ndb/src/ndbapi/NdbTransaction.cpp:
Fix so that scans closed before execute are removed from "scans to send list"
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
mysql-test/r/ndb_condition_pushdown.result:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
mysql-test/r/ndb_multi.result:
Merge
mysql-test/t/ndb_multi.test:
Merge
almost useless for any kind of shell script automation.
Now add the return value that indicates the execution whether or not success
for many methods.
ndb/src/mgmclient/CommandInterpreter.cpp:
Many methods add the return value that indicates whether the execution of operatioin succeeds.
This can make ndb_mgm management client set the exit status on errors.
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
Fix for alter table when node is down...that could cause pain and misery
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Make sure to check table version before retriving from disk
into mysql.com:/usr/home/ram/work/mysql-5.1-maint
BitKeeper/etc/ignore:
auto-union
mysql-test/mysql-test-run.pl:
Auto merged
sql/Makefile.am:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
send new fragdistkeys to all replicas during node recovery
to make sure that not 3rd or 4th replicas fragDistKey becomes out of sync
ndb/include/kernel/GlobalSignalNumbers.h:
new signal UpdateFragDistKeyOrd
ndb/include/kernel/signaldata/CopyFrag.hpp:
new signal UpdateFragDistKeyOrd
ndb/include/ndb_version.h.in:
online software upgrade for new signal UpdateFragDistKeyOrd
ndb/src/common/debugger/signaldata/SignalNames.cpp:
new signal UpdateFragDistKeyOrd
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Send noew list of all replicas in copyfragreq
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
new signal UpdateFragDistKeyOrd
ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
new signal UpdateFragDistKeyOrd
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
new signal UpdateFragDistKeyOrd
into mockturtle.local:/home/dlenev/src/mysql-5.1-rt-merge
BitKeeper/etc/ignore:
auto-union
client/mysqltest.c:
Auto merged
libmysqld/Makefile.am:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
sql/CMakeLists.txt:
Auto merged
sql/Makefile.am:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
into rolltop.ignatz42.dyndns.org:/mnt/storeage/bug21424/my51-bug21424
client/mysqldump.c:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
Dumps are created for the tables in each specified database then for the views in each specified database. This bug occurs when any database's views depend on the mysql database's table data while being restored.
Added command line option --flush-privileges to the mysqldump utility which causes a FLUSH PRIVILIGES statement to be written to the dump after the mysql database.
client/mysqldump.c:
When the flush-privileges command line option is specified, make sure to FLUSH PRIVILEGES after only the mysql database's tables' data is restored so that grant tables are current.
mysql-test/r/mysqldump.result:
Added Results.
mysql-test/t/mysqldump.test:
Expanded existing test case for bug 21527 to also test for bug 21424.
Exercises new --flush-priviliges command line option.
Test ignores log tables.
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
5.1.12.
sql/event_queue.cc:
Temporary workaround to drop the event outside of the
scope where LOCK_queue is locked. If it's done inside
the scope a possible deadlock can happen, and it happens
quite often, escpecially on Windows.
Removed replication dependency
ndb_dd_alter.test, ndb_dd_alter.result:
Added innodb dependency and regenerated result file
ndb_dd_sql_features.result:
Regenerated result file
mysql-test/r/ndb_dd_alter.result:
Added innodb dependency and regenerated result file
mysql-test/t/ndb_dd_alter.test:
Added innodb dependency and regenerated result file
mysql-test/r/ndb_dd_sql_features.result:
Regenerated result file
mysql-test/t/ndb_multi.test:
Removed replication dependency
also bind client to local host name if specified
ndb/src/common/transporter/Transporter.cpp:
Add binding also of transporter connection (to hostname specified in config file)
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
