include/mysql.h:
Adding an option for data truncations feature.
libmysql/libmysql.c:
No 'smart' behaviour now for data truncations: they are always
reported, unless switched off with
mysql_options(mysql, MYSQL_REPORT_DATA_TRUNCATION, (my_bool*) &(option=1));
sql-common/client.c:
Add support for report-data-truncation variable in my.cnf
tests/client_test.c:
A test for MYSQL_REPORT_DATA_TRUNCATION option.
Move inline function page_is_cmp() before its use in page0page.ic; maybe this fixes a linking error reported by Lenz
innobase/include/page0page.ic:
Move inline function page_is_cmp() before its use in page0page.ic; maybe this fixes a linking error reported by Lenz
into polly.local:/home/kaa/src/mysql-5.0
configure.in:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
into gw.mysql.r18.ru:/usr/home/ram/work/5.0.bit.new
sql/field.h:
Auto merged
sql/handler.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/table.cc:
Auto merged
longer available for most storage engines.
Therefore column c18 BIT is switched TINYINT .
mysql-test/include/ps_conv.inc:
updated comment
mysql-test/include/ps_create.inc:
replaced the data type bit with tinyint
mysql-test/r/ps_1general.result:
updated results
mysql-test/r/ps_2myisam.result:
updated results
mysql-test/r/ps_3innodb.result:
updated results
mysql-test/r/ps_4heap.result:
updated results
mysql-test/r/ps_5merge.result:
updated results
mysql-test/r/ps_6bdb.result:
updated results
mysql-test/r/ps_7ndb.result:
updated results
mysql-test/t/ps_4heap.test:
replaced the data type bit with tinyint
mysql-test/t/ps_5merge.test:
replaced the data type bit with tinyint
distribution when running "make dist"
innobase/include/Makefile.am:
- added file trx0xa.h which was missing from the source distribution when
running "make dist"
removed TRACE from management client
ndb/src/mgmclient/CommandInterpreter.cpp:
removed TRACE from management client
ndb/src/mgmsrv/CommandInterpreter.cpp:
added TRACE to managemnt server
ndb/src/mgmsrv/CommandInterpreter.hpp:
added TRACE to managemnt server
ndb/src/mgmsrv/CommandInterpreter.cpp:
Auto merged
ndb/src/ndbapi/Ndb.cpp:
Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
Auto merged
ndb/src/ndbapi/NdbImpl.hpp:
Auto merged
removed methods that are duplicated in management client
ndb/src/mgmsrv/CommandInterpreter.cpp:
removed methods that are duplicated in management client
ndb/src/mgmsrv/CommandInterpreter.hpp:
removed methods that are duplicated in management client
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
ndb/include/Makefile.am:
Auto merged
ndb/include/kernel/LogLevel.hpp:
Auto merged
ndb/include/mgmapi/mgmapi.h:
Auto merged
ndb/include/ndbapi/NdbConnection.hpp:
Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
Auto merged
ndb/src/common/debugger/EventLogger.cpp:
Auto merged
ndb/src/common/logger/FileLogHandler.cpp:
Auto merged
ndb/src/common/logger/Logger.cpp:
Auto merged
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
Auto merged
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/kernel/main.cpp:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
Auto merged
ndb/src/kernel/vm/Configuration.cpp:
Auto merged
ndb/src/mgmapi/mgmapi.cpp:
Auto merged
ndb/src/mgmsrv/InitConfigFileParser.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
Auto merged
ndb/src/mgmsrv/Services.cpp:
Auto merged
ndb/src/mgmsrv/Services.hpp:
Auto merged
ndb/src/mgmsrv/main.cpp:
Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
Auto merged
ndb/src/ndbapi/ndberror.c:
Auto merged
ndb/tools/Makefile.am:
Auto merged
ndb/tools/restore/consumer_restore.cpp:
1) Fix bug when blobs and multiple databases bug#7379
2) Fix bug #7346
ndb/tools/restore/consumer_restore.hpp:
Moved tuple handle into callback object
instead of having separate array
Declared m_transactions volatile
storage engine.
mysql-test/mysql-test-run.sh:
We should skip starting of slave server only if test is BOTH
not replication related and not federated storage engine related.
mysql-test/r/ps_1general.result:
Fixed test result after federated storage engine was added.
For numeric constants we only need to add, since the parser doesn't produce
negative numbers.
For strings we only add (we actually could substract 1 if given string is a constant
and it has '-number' form but we're not doing that because
* we set max_length bigger then necessary in other cases as well.
* the current solution is simpler and safer (bigger max_length is better then cutting out)
mysql-test/r/func_concat.result:
Test for BUG#6825
mysql-test/r/metadata.result:
Ajusted results according to fix of bug BUG#6825:length(-1) = 2 , not 1
mysql-test/t/func_concat.test:
Test for BUG#6825
removed theCurrentConnectCounter
optimized the_release_ind by using pos[0] to indicate that there is something there
smaller storage of theDBNodes array by using Uint8
set the_relase_ind array to Uint32 to avoid possible parallell thread usage errors
mysql-test/r/federated.result:
new test results
mysql-test/t/federated.test:
added order by, group by
sql/ha_federated.cc:
- added 'scheme' to URL
- added proper escaping
- made sure &my_charset_bin is being used throughout handler
- made sure create_table catches improper URL in comment upon table creation
sql/ha_federated.h:
added scheme to share
which Heikki fixed in 4.1.8 and 4.0.23. I verified that without Heikki's patch the test fails (7 gets inserted).
Test added to 4.1 because in testsuite of 4.0 it's impossible to start slave with InnoDB.
mysql-test/mysql-test-run.sh:
Backport an improvement from 4.1: If the tool is run with '--force', give a list of all test cases that failed at the end.
This is essential for automated analysis of the build logs file.
because old behaviour was somewhat nonsensical (kind of bug). Changes are that if repl threads are
down or disconnected the column will be NULL, and if master is idle the column will not grow indefinitely anymore.
sql/slave.cc:
mi->slave_running and rli->slave_running now uints (was needed only for mi but because of start_slave_thread() usage,
had to change both).
So mi->slave_running can now take 3 values: not running, running & not connected, running and connected.
The last value serves for calculation of Seconds_Behind_Master in SHOW SLAVE STATUS.
Changing this column's behaviour: if SQL or I/O thread is not running, or if I/O thread is not connected
(for example if it is reconnecting), it's NULL (to mean "unknown"). And if master is idle, the column will
not grow indefinitely like it used to (that was meaningless); this is fixed by forcing a value of 0
when the slave SQL thread has hit EOF of relay log (which has only a limited number of caveats explained
in comments in code).
sql/slave.h:
slave_running used to be bool but we need to distinguish, for the I/O slave thread, between
"running & connected" and "running & not connected" ("running" means the thread exists).
sql/sql_repl.cc:
we don't need anymore to set rli->last_master_timestamp to 0 (we used that to make Seconds_Behind_Master
be NULL) in RESET SLAVE and CHANGE MASTER, as these commands imply that slave threads are not running
and so Seconds_Behind_Master is already NULL because of that.
