into mysql.com:/usr/local/mysql/merge-5.1
mysql-test/lib/mtr_process.pl:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/sp-error.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/r/trigger-grant.result:
Auto merged
mysql-test/r/trigger.result:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/t/trigger-grant.test:
Auto merged
mysql-test/t/trigger.test:
Auto merged
server-tools/instance-manager/options.h:
Auto merged
sql/field_conv.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_func.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
server-tools/instance-manager/options.cc:
Manual merge
sql/item_func.cc:
Manual merge
sql/mysql_priv.h:
Manual merge
sql/sp_head.cc:
Manual merge
sql/sql_table.cc:
Manual merge
into mysql.com:/home/hf/work/mysql-5.1.mrg
config/ac-macros/ha_ndbcluster.m4:
Auto merged
sql/log.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
A further reduction in CPU usage by ndb_mgmd with failed data nodes.
ndb/src/common/util/socket_io.cpp:
Use a nonblocking socket to peek at the buffer to know how much to read for socket_readln.
This saves us a lot of syscalls. By a lot, I've observed about halving the CPU
usage of ndb_mgmd with 1 failed node on a 6 node cluster.
This bug was introduced when the patch resolving the
performance problem 17164 was applied. As a result
of that modification the not_null_tables attributes
were calculated incorrectly for constant OR conditions.
This triggered invalid conversion of outer joins into
inner joins.
mysql-test/r/join_outer.result:
Added a test case for bug #19816.
mysql-test/t/join_outer.test:
Added a test case for bug #19816.
The convert_constant_item() function converts constant items to ints on
prepare phase to optimize execution speed. In this case it tries to evaluate
subselect which contains a derived table and is contained in a derived table.
All derived tables are filled only after all derived tables are prepared.
So evaluation of subselect with derived table at the prepare phase will
return a wrong result.
A new flag with_subselect is added to the Item class. It indicates that
expression which this item represents is a subselect or contains a subselect.
It is set to 0 by default. It is set to 1 in the Item_subselect constructor
for subselects.
For Item_func and Item_cond derived classes it is set after fixing any argument
in Item_func::fix_fields() and Item_cond::fix_fields accordingly.
The convert_constant_item() function now doesn't convert a constant item
if the with_subselect flag set in it.
mysql-test/t/view.test:
Added test case for bug#19077: A nested materialized derived table is used before being populated.
mysql-test/t/subselect.test:
Added test case for bug#19077: A nested materialized derived table is used before being populated.
mysql-test/r/view.result:
Added test case for bug#19077: A nested materialized derived table is used before being populated.
mysql-test/r/subselect.result:
Added test case for bug#19077: A nested materialized derived table is used before being populated.
sql/item_subselect.cc:
Fixed bug#19077: A nested materialized derived table is used before being populated.
The Item_subselect class constructor sets new with_subselect flag to 1.
sql/item_func.cc:
Fixed bug#19077: A nested materialized derived table is used before being populated.
The Item_func::fix_fields() sets new with_subselect flag from with_subselect flags of its arguments.
sql/item_cmpfunc.cc:
Fixed bug#19077: A nested materialized derived table is used before being populated.
The convert_constant_item() function now doesn't convert a constant item
with the with_subselect flag set.
The Item_cond::fix_fields() sets new with_subselect flag from with_subselect flags of its arguments.
sql/item.cc:
Fixed bug#19077: A nested materialized derived table is used before being populated.
Set new with_subselect flag to default value - 0 in the Item constructor.
sql/item.h:
Fixed bug#19077: A nested materialized derived table is used before being populated.
A new flag with_subselect is added to the Item class. It indicates that
expression which this item represents is a subselect or contains a subselect.
It is set to 0 by default.
into dl145j.mysql.com:/users/gbichot/mysql-5.1-new
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/extra/binlog_tests/binlog.test:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysqld.cc:
Auto merged
That option was used to suppress the XID from the output of SHOW BINLOG EVENTS (to create a repeatable testsuite),
was available only in debug builds, and was explicitely marked as "may be removed in future versions" in mysqld --help.
Idea of the removal approved by the replication team.
mysql-test/extra/binlog_tests/binlog.test:
use replace-regex to remove xid
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
use replace-regex to remove xid
mysql-test/mysql-test-run.pl:
option removed
mysql-test/mysql-test-run.sh:
option removed
sql/log_event.cc:
no more need to hide XID in tests output as we have replace-regex
sql/log_event.h:
no more need to hide XID in tests output as we have replace-regex
sql/mysqld.cc:
no more need to hide XID in tests output as we have replace-regex
into rurik.mysql.com:/home/igor/dev/mysql-5.1-0
mysql-test/r/view.result:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/item_timefunc.cc:
Auto merged
Fixes bug#19040 "yaSSL does not compile on AIX".
extra/yassl/taocrypt/include/runtime.hpp:
Include "config.h" (if it exists) in all yaSSL files. This is needed to ensure the same
configure settings are used for yaSSL as for the other modules linked together.
Example: the settings for "large file" on AIX.
Fixes bug#19040 "yaSSL does not compile on AIX".
configure.in:
Auto merged
BitKeeper/deleted/.del-ctype_ucs_binlog.result~280d136b1a0bcf17:
Auto merged
BitKeeper/deleted/.del-mysql_prepare_privilege_tables_for_5.sql~76ea3c82bdbbead4:
Auto merged
mysql-test/extra/binlog_tests/binlog.test:
Auto merged
mysql-test/extra/rpl_tests/rpl_ddl.test:
Auto merged
mysql-test/extra/rpl_tests/rpl_multi_query.test:
Auto merged
mysql-test/r/archive_gis.result:
Auto merged
mysql-test/r/bdb_gis.result:
Auto merged
mysql-test/r/binlog_stm_binlog.result:
Auto merged
mysql-test/r/binlog_stm_blackhole.result:
Auto merged
mysql-test/r/binlog_stm_ctype_ucs.result:
Auto merged
mysql-test/r/grant2.result:
Auto merged
mysql-test/r/im_life_cycle.result:
Auto merged
mysql-test/r/im_utils.result:
Auto merged
mysql-test/r/insert_update.result:
Auto merged
mysql-test/r/innodb_gis.result:
Auto merged
mysql-test/r/mysqldump-max.result:
Auto merged
mysql-test/r/ndb_bitfield.result:
Auto merged
mysql-test/r/ndb_condition_pushdown.result:
Auto merged
mysql-test/r/ndb_database.result:
Auto merged
mysql-test/r/ndb_gis.result:
Auto merged
mysql-test/r/ndb_update.result:
Auto merged
mysql-test/r/rpl_create_database.result:
Auto merged
mysql-test/r/query_cache_notembedded.result:
Auto merged
mysql-test/r/rpl_drop_db.result:
Auto merged
mysql-test/r/rpl_multi_update3.result:
Auto merged
mysql-test/r/rpl_slave_status.result:
Auto merged
mysql-test/r/rpl_trigger.result:
Auto merged
mysql-test/r/rpl_view.result:
Auto merged
mysql-test/r/sp-code.result:
Auto merged
mysql-test/r/sp-vars.result:
Auto merged
mysql-test/r/sp_trans.result:
Auto merged
mysql-test/r/timezone_grant.result:
Auto merged
mysql-test/r/trigger-compat.result:
Auto merged
mysql-test/r/trigger-grant.result:
Auto merged
mysql-test/r/type_bit_innodb.result:
Auto merged
mysql-test/r/type_newdecimal.result:
Auto merged
mysql-test/r/view_grant.result:
Auto merged
mysql-test/t/binlog_row_binlog-master.opt:
Auto merged
mysql-test/t/binlog_stm_mix_innodb_myisam-master.opt:
Auto merged
mysql-test/t/create_select_tmp.test:
Auto merged
mysql-test/t/grant2.test:
Auto merged
mysql-test/t/handler.test:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
mysql-test/t/rpl_commit_after_flush.test:
Auto merged
mysql-test/t/rpl_insert_ignore.test:
Auto merged
mysql-test/t/rpl_rewrt_db-slave.opt:
Auto merged
mysql-test/t/rpl_rewrt_db.test:
Auto merged
mysys/mf_tempdir.c:
Auto merged
mysys/my_mmap.c:
Auto merged
sql/sql_bitmap.h:
Auto merged
sql/sql_handler.cc:
Auto merged
storage/bdb/dist/s_dir:
Auto merged
storage/myisam/ftbench/Ecompare.pl:
Auto merged
storage/myisam/ftbench/Ecreate.pl:
Auto merged
storage/myisam/ftbench/Ereport.pl:
Auto merged
storage/myisam/ftbench/README:
Auto merged
storage/myisammrg/myrg_range.c:
Auto merged
storage/myisammrg/myrg_rnext_same.c:
Auto merged
strings/decimal.c:
Auto merged
zlib/Makefile.am:
Auto merged
into mysql.com:/home/hf/work/mysql-5.1.mrg
mysql-test/mysql-test-run.pl:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
- Implement new switch --with-ssl to configure used for both bundled yaSSL or OpenSSL
BitKeeper/deleted/.del-yassl.m4~e55e55c1e863abaf:
Delete: config/ac-macros/yassl.m4
BitKeeper/deleted/.del-openssl.m4~41cebd0ba8281769:
Delete: config/ac-macros/openssl.m4
BUILD/SETUP.sh:
Use switch --with-ssl to configure
BUILD/compile-pentium-debug-openssl:
Use switch --with-ssl to configure
BUILD/compile-pentium-debug-yassl:
Use switch --with-ssl to configure
configure.in:
Change to use the MYSQL_CHECK_SSL macro from ssl.m4
config/ac-macros/ssl.m4:
New BitKeeper file ``config/ac-macros/ssl.m4''
ndb/include/ndbapi/Ndb.hpp:
make auto-incr methods return int 0/-1
ndb/src/ndbapi/Ndb.cpp:
make auto-incr methods return int 0/-1
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
make auto-incr methods return int 0/-1
ndb/test/ndbapi/testDict.cpp:
make auto-incr methods return int 0/-1
ndb/tools/restore/consumer_restore.cpp:
make auto-incr methods return int 0/-1
sql/ha_ndbcluster.cc:
make auto-incr methods return int 0/-1
into mysql.com:/home/kgeorge/mysql/5.1/merge
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/view.result:
Auto merged
sql/item_subselect.cc:
Auto merged
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
client/mysql.cc:
Auto merged
mysql-test/r/func_str.result:
Auto merged
mysql-test/r/rpl_temporary.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/t/rpl_temporary.test:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
- small correction of previous patch
storage/ndb/src/ndbapi/DictCache.cpp:
Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
- cache not released properly
storage/ndb/tools/desc.cpp:
Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
- added retry option so that ndb_desc can be used to wait for a table to be created
The select statement that specified a view could be
slightly changed when the view was saved in a frm file.
In particular references to an alias name in the HAVING
clause could be substituted for the expression named by
this alias.
This could result in an error message for a query of
the form SELECT * FROM <view>. Yet no such message
appeared when executing the query specifying the view.
mysql-test/r/having.result:
Adjusted results after fixing bug #19573.
mysql-test/r/view.result:
Added a test case for bug #19573.
mysql-test/t/view.test:
Added a test case for bug #19573.
into zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new
client/mysql.cc:
Auto merged
mysql-test/r/func_str.result:
Auto merged
mysql-test/r/rpl_temporary.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/t/rpl_temporary.test:
Auto merged
sql/item_strfunc.cc:
Auto merged
