- Remove usage of $shrext_cmds variable
- Test for libs using all known library file endings
acinclude.m4:
Remove the usage of $shrext_cmds. instead test for all the library file
endings we currently know, that is .a .so .sl and .dylib
config/ac-macros/ha_ndbcluster.m4:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/log.cc:
SCCS merged
sql/sql_base.cc:
SCCS merged
into mysql.com:/home/mysql-5.0-10418
mysql-test/t/outfile.test:
Auto merged
sql/item_strfunc.cc:
Auto merged
mysql-test/r/func_str.result:
expect NULL rather than error if file given to load_file() doesn't exist
mysql-test/r/outfile.result:
expect NULL rather than error if file given to load_file() doesn't exist
mysql-test/t/func_str.test:
show that load_file() will return NULL rather than throw an error
if file doesn't exist
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new-merge_060509
configure.in:
Auto merged
mysql-test/r/rpl_user_variables.result:
Auto merged
mysql-test/t/having.test:
Auto merged
mysql-test/t/rpl_user_variables.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
- Don't kill the active connection to the server, instead read
the connection id, switch connection and kill the first one from there.
mysql-test/r/rpl_temporary.result:
Update test result
mysql-test/t/rpl_temporary.test:
Don't kill our own connection to the server as the result code differs depending
on platform.
client/mysqlimport.c:
Variable name changed mysql_connection -> mysql
include/violite.h:
Type changed st_VioSSLAcceptorFd-> sl_VioSSLFd
vio/viosslfactories.c:
Type changed st_VioSSLAcceptorFd-> sl_VioSSLFd
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
BitKeeper/deleted/.del-client-req.pem~efd482e1d290d4d8:
Auto merged
BitKeeper/deleted/.del-server-req.pem~16301893cacf1be4:
Auto merged
client/mysql.cc:
Auto merged
client/mysqldump.c:
Auto merged
client/mysqlimport.c:
Auto merged
BitKeeper/deleted/.del-Makefile.am~de166d6fcac3b9b6:
Auto merged
BitKeeper/deleted/.del-NOTES~e926d3e6929ac052:
Auto merged
client/mysqltest.c:
Auto merged
include/mysql.h:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/information_schema.result:
Auto merged
mysql-test/std_data/cacert.pem:
Auto merged
mysql-test/std_data/client-cert.pem:
Auto merged
mysql-test/std_data/client-key.pem:
Auto merged
mysql-test/std_data/server-cert.pem:
Auto merged
mysql-test/std_data/server-key.pem:
Auto merged
mysql-test/t/information_schema.test:
Auto merged
sql/item_func.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_acl.cc:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
Auto merged
vio/vio.c:
Auto merged
client/client_priv.h:
Merge 5.0 -> 5.1
include/violite.h:
Merge 5.0 -> 5.1
mysql-test/Makefile.am:
Merge 5.0 -> 5.1
mysql-test/t/disabled.def:
Merge 5.0 -> 5.1
sql/mysqld.cc:
Merge 5.0 -> 5.1
vio/viossl.c:
Merge 5.0 -> 5.1
vio/viosslfactories.c:
Merge 5.0 -> 5.1
a worse execution plan than in 4.1 for some queries.
It happened due the fact that at some conditions the
optimizer always preferred range or full index scan access
methods to lookup access methods even when the latter were much
cheaper.
The problem was not observed in 4.1 for the reported query
because the WHERE condition was not of a form that could
cause the problem.
Equality propagation introduced on 5.0 added an extra
predicate and changed the WHERE condition. The new condition
provoked the optimizer to make a bad choice.
The problem was fixed by the patch for bug 17379.
mysql-test/r/select.result:
Added a test case for bug #18940.
The problem was fixed by the patch for bug 17379.
mysql-test/t/select.test:
Added a test case for bug #18940.
The problem was fixed by the patch for bug 17379.
into mysql.com:/home/psergey/mysql-5.1-merge6
mysql-test/r/rpl_user_variables.result:
Auto merged
mysql-test/t/having.test:
Auto merged
mysql-test/t/rpl_user_variables.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
mysql-test/t/rpl_sp004.test:
updated to work with default NDB engine
mysql-test/r/rpl_sp004.result:
updated to work with default NDB engine
mysql-test/extra/rpl_tests/rpl_flsh_tbls.test:
Updated to skip when ndb is default
mysql-test/t/rpl_multi_engine.test:
Results will not match when ndb is default do to myisam table creates and show create
mysql-test/t/rpl_row_basic_11bugs.test:
Disables for when ndb is default as the show binlog events will cause failure
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new-merge_060509
BitKeeper/deleted/.del-changelog-4.0.xml~8f56ee8a913e848b:
Auto merged
BitKeeper/deleted/.del-changelog-4.1.xml~8aa496ebed09d868:
Auto merged
mysql-test/r/func_misc.result:
Auto merged
sql/item_func.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_acl.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
When a view statement is compiled on CREATE VIEW time, most of the
optimizations should not be done. Finding the right optimization
for a subquery is one of them.
Unfortunately the optimizer is resolving the column references of
the left expression of IN subqueries in the process of deciding
witch optimization to use (if needed). So there should be a
special case in Item_in_subselect::fix_fields() : check the
validity of the left expression of IN subqueries in CREATE VIEW
mode and then proceed as normal.
mysql-test/r/subselect.result:
test case
mysql-test/r/view.result:
chnaged explain due to column being resolved
mysql-test/t/subselect.test:
test case
sql/item_subselect.cc:
overloaded fix_fields to fix the left_expr in prepare_view_mode
sql/item_subselect.h:
fix_fields overloaded so it can prepare left_expr
Fixing bug where UPDATE failed on slave and some cleanup of ndb_unpack_record().
mysql-test/r/rpl_bit_npk.result:
Result change
mysql-test/t/disabled.def:
Disabling tests
mysql-test/t/rpl_bit_npk.test:
Making test storage-engine independent
mysql-test/t/rpl_ndb_innodb2ndb-slave.opt:
Storage engine name change
mysql-test/t/rpl_ndb_myisam2ndb-slave.opt:
Storage engine name change
sql/ha_ndbcluster.cc:
Using move_field_offset() to move field pointer.
Using my_ptrdiff_t instead of uint for pointer difference.
Removing ineffective cast.
Calling member function directly, bypassing the virtual mechanism
for Field_bit.
sql/log_event.cc:
Starting and stopping range scan and index read inside find_and_fetch row
instead of in calling function. There are storage engines that require the
search to be restarted for every changed row.
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new-merge_060509
BitKeeper/deleted/.del-changelog-5.0.xml~f4c50926ccdd7434:
Auto merged
mysql-test/r/date_formats.result:
Auto merged
mysql-test/r/ndb_condition_pushdown.result:
Auto merged
mysql-test/t/date_formats.test:
Auto merged
mysql-test/t/ndb_condition_pushdown.test:
Auto merged
sql/item_timefunc.cc:
Auto merged
storage/ndb/include/ndbapi/NdbOperation.hpp:
Auto merged
storage/ndb/include/util/NdbSqlUtil.hpp:
Auto merged
storage/ndb/src/common/util/NdbSqlUtil.cpp:
Auto merged
into mysql.com:/home/tomash/src/mysql_ab/mysql-5.1-merge
BitKeeper/deleted/.del-changelog-4.0.xml~8f56ee8a913e848b:
Auto merged
BitKeeper/deleted/.del-changelog-4.1.xml~8aa496ebed09d868:
Auto merged
mysql-test/r/func_misc.result:
Auto merged
sql/item_func.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_acl.h:
Auto merged
sql/sql_parse.cc:
Auto merged
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new-merge_060509
configure.in:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/auto_increment.result:
Auto merged
mysql-test/r/gis-rtree.result:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/r/symlink.result:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
mysql-test/t/mysqldump.test:
Manual merge.
sql/sql_show.cc:
Manual merge.
client/mysqlimport.c:
Fixed a problem with merge.
include/violite.h:
Struct name changed, but forgot to change it here.
sql/sql_show.cc:
Added missing variable.
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
mysql-test/r/date_formats.result:
Auto merged
mysql-test/t/date_formats.test:
Auto merged
sql/item_timefunc.cc:
Auto merged
