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
- Remove extra EXTRA_DIST from several Makefile.ams
- Add dummy primary key to test table in loaddata_autocom.inc
client/Makefile.am:
Post-merge fix
mysql-test/include/loaddata_autocom.inc:
Add dummy primary key to test table, because NDB doesn't like BLOB w/ no PK
mysql-test/r/loaddata_autocom_innodb.result:
Adapt test results to modified loaddata_autocom.inc
mysql-test/r/loaddata_autocom_ndb.result:
Adapt test results to modified loaddata_autocom.inc
server-tools/instance-manager/Makefile.am:
Post-merge fix
sql/log.h:
Post-merge fix
storage/innobase/Makefile.am:
Post-merge fix
mysql-test/r/ndb_config.result:
test case for Bug #17582
mysql-test/t/ndb_config.test:
test case for Bug #17582
ndb/tools/ndb_config.cpp:
gethostname() returns a pointer to a static buffer so we
need to create a copy of the results before calling it on
the 2nd host name, else we're effectively comparing a
hostname to itself which is of course always true
(Bug #17582)
into rolltop.ignatz42.dyndns.org:/mnt/storeage/winbkfix/my51-winbkfix
BitKeeper/etc/ignore:
auto-union
BitKeeper/triggers/post-commit:
Manual merge. Opted for the method that uses temp files for improved troubleshooting.
BitKeeper/etc/ignore:
Exclude files created during the Windows build process.
BitKeeper/triggers/post-commit:
post-commit trigger writes emails to file in the BitKeeper/tmp directory before sending in case of failure.
Now uses bk sendmail instead of hardcoded /usr/sbin/sendmail to send message.
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0
mysql-test/r/ndb_multi.result:
Auto merged
mysql-test/t/ndb_multi.test:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
The column's NOT NULL flag doesn't affect what we should print. Remove the
wrong logic that does check it.
Also, verify that this and the previous two tests print the same data as
other output formats.
client/mysql.cc:
Don't check the column's NOT NULL flag when determining whether to print
"NULL" or not.
mysql-test/r/mysql.result:
Add results and confirm that the other output forms give the same results
for other similar tests.
mysql-test/t/mysql.test:
Add regression tests for this bug and two similar bugs.
into lamia.home:/home/timka/mysql/src/5.1-dbg
mysql-test/r/insert_select.result:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
into polly.local:/tmp/20924/bug20294/my51-bug20294
mysql-test/r/case.result:
Auto merged
mysql-test/r/func_if.result:
Auto merged
mysql-test/r/func_test.result:
Auto merged
mysql-test/t/case.test:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/log_event.cc:
Auto merged
sql/sql_class.h:
Auto merged
mysql-test/r/user_var.result:
Manual merge
mysql-test/t/user_var.test:
Manual merge
sql/item_func.cc:
Manual merge
sql/item_func.h:
Manual merge
allow bind address for ndbd
ndb/include/mgmapi/mgmapi.h:
Add support for setting local address in NdbMgmHandle
ndb/include/mgmcommon/ConfigRetriever.hpp:
Add support for specifying local bindaddress to ConfigRetreiver
ndb/include/util/SocketClient.hpp:
Add support for setting local address in NdbMgmHandle
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
Add support for setting local address in NdbMgmHandle
ndb/src/common/util/SocketClient.cpp:
Add support for setting local address in NdbMgmHandle
ndb/src/kernel/vm/Configuration.cpp:
Add support for specifying local bindaddress to ndbd
ndb/src/mgmapi/mgmapi.cpp:
Add support for setting local address in NdbMgmHandle
into maint2.mysql.com:/data/localhome/tsmith/bk/mrg/51
libmysqld/libmysqld.def:
Auto merged
mysql-test/t/handler.test:
Auto merged
sql/log.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_select.cc:
Auto merged
The cause of the bug was an incomplete fix for bug 18080.
The problem was that setup_tables() unconditionally reset the
name resolution context to its 'tables' argument, which pointed
to the first table of an SQL statement.
The bug fix limits resetting of the name resolution context in
setup_tables() only in the cases when the context was not set
by earlier parser/optimizer phases.
mysql-test/r/insert_select.result:
Test for BUG#21774.
mysql-test/t/insert_select.test:
Test for BUG#21774.
sql/sql_base.cc:
Do not reset the name resolution contect unconditionally.
Instead set the context to 'tables' only if it was not
set before calling setup_tables().
sql/sql_insert.cc:
Added asserts to make sure that in the case of INSERT ... VALUES ...
statements it is not necessary to reset the name resolution context
to the first table, because there is only one table in the list of
tables anyway. The actual code is not removed in order not to
confuse it with the actual bug fix.
sql/sql_parse.cc:
Removed unnecessary reset of the name resolution context.
The context is anyway unconditionally reset in mysql_insert()
and mysql_prepare_insert().
into polly.local:/tmp/20924/bug20294/my51-bug20294
mysql-test/r/case.result:
Auto merged
mysql-test/r/func_if.result:
Auto merged
mysql-test/r/func_test.result:
Auto merged
mysql-test/t/case.test:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/log_event.cc:
Auto merged
sql/sql_class.h:
Auto merged
mysql-test/r/user_var.result:
Manual merge
mysql-test/t/user_var.test:
Manual merge
sql/item_func.cc:
Manual merge
sql/item_func.h:
Manual merge
