into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
storage/ndb/src/common/debugger/EventLogger.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
Auto merged
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
BitKeeper/deleted/.del-mysql.sln~76a9ff1e793b3547:
Auto merged
BitKeeper/deleted/.del-vio.vcproj~b7c21b4e2d6a9b85:
Auto merged
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/51
sql/sql_class.cc:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
Auto merged
storage/ndb/test/src/UtilTransactions.cpp:
Auto merged
into trift2.:/MySQL/M50/test-help-5.0
mysql-test/t/help.test:
Auto merged
mysql-test/r/help.result:
Manual merge:
5.0 has warnings "Field 'url' doesn't have a default value" which 4.1 doesn't have.
aggregated in outer context returned wrong results.
This happened only if the subquery did not contain any references
to outer fields.
As there were no references to outer fields the subquery erroneously
was taken for non-correlated one.
Now any set function aggregated in outer context makes the subquery
correlated.
mysql-test/r/subselect.result:
Added a test case for bug #27257.
mysql-test/t/subselect.test:
Added a test case for bug #27257.
Shift the ID values up into a range where they will not collide with those
which we use for real data, when we fill the system tables.
Will be merged up to 5.0 where it is needed for 5.0.38.
mysql-test/r/help.result:
Fix the result file according to the changed ID values in "help.test".
mysql-test/t/help.test:
Now that (at least in 5.0) the system tables are filled with real data,
inserting rows vith ID values 1 .. 5 will fail in release build tests (it did in 5.0.38)
like it should already have done in customer installations.
Shift the ID values up into a high area where they will not conflict,
also make the distinct for the different kinds of values (= unique throughout the test).
No change to the logic.
Shift the ID values up into a range where they will not collide with those
which we use for real data, when we fill the system tables.
Will be merged up to 5.0 where it is needed for 5.0.38.
mysql-test/t/help.test:
Now that (at least in 5.0) the system tables are filled with real data,
inserting rows vith ID values 1 .. 5 will fail in release build tests (it did in 5.0.38)
like it should already have done in customer installations.
Shift the ID values up into a high area where they will not conflict,
also make the distinct for the different kinds of values (= unique throughout the test).
No change to the logic.
- Problem: data separators were copied to a fixed-size buffer
on the stack; memcpy was used, without bounds checking; a
server crash could result if long FIELDS ENCLOSED BY, etc.,
was given
- Fix: write the separators directly, instead of copying to
a buffer first (in select_export::send_data())
sql/sql_class.cc:
In select_export::send_data(), write data separators
directly, instead of copying into a fixed-size memory
buffer before writing. This avoids a buffer overflow
when very large separators are specified.
into magare.gmz:/home/kgeorge/mysql/autopush/B24484-5.0
mysql-test/r/subselect3.result:
Auto merged
sql/item.h:
Auto merged
sql/item_sum.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_select.cc:
Auto merged
To correctly decide which predicates can be evaluated with a given table
the optimizer must know the exact set of tables that a predicate depends
on. If that mask is too wide (refer to non-existing tables) the optimizer
can erroneously skip a predicate.
One such case of wrong table usage mask were the aggregate functions.
The have a all-1 mask (meaning depend on all tables, including non-existent
ones).
Fixed by making a real used_tables mask for the aggregates. The mask is
constructed in the following way :
1. OR the table dependency masks of all the arguments of the aggregate.
2. If all the arguments of the function are from the local name resolution
context and it is evaluated in the same name resolution
context where it is referenced all the tables from that name resolution
context are OR-ed to the dependency mask. This is to denote that an
aggregate function depends on the number of rows it processes.
3. Handle correctly the case of an aggregate function optimization (such that
the aggregate function can be pre-calculated and made a constant).
Made sure that an aggregate function is never a constant (unless subject of a
specific optimization and pre-calculation).
One other flaw was revealed and fixed in the process : references were
not calling the recalculation method for used_tables of their targets.
mysql-test/r/subselect3.result:
Bug #24484: test case
mysql-test/t/subselect3.test:
Bug #24484: test case
sql/item.h:
Bug #24484: Item_ref must update the used tables.
sql/item_sum.cc:
Bug #24484: correct calculation of used_tables for aggregates.
sql/item_sum.h:
Bug #24484: correct calculation of used_tables for aggregates.
sql/opt_range.cc:
Bug #24484: fixed ref resolution in loose index scan
sql/sql_base.cc:
Bug #24484: moved counting of leaf tables inside
setup_tables_and_check_access.
sql/sql_class.h:
Bug #24484: changed table count to more narrow type.
sql/sql_insert.cc:
Bug #24484: moved counting of leaf tables inside
setup_tables_and_check_access. Substract the first
table (and its subtables) of an INSERT statement
from leaf_count.
sql/sql_select.cc:
Bug #24484: correct check for aggregates
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
BitKeeper/etc/ignore:
auto-union
BitKeeper/deleted/.del-comp_err.vcproj~45c167ae5ddd5a96:
Auto merged
BitKeeper/deleted/.del-gen_lex_hash.vcproj~544be6b6:
Auto merged
BitKeeper/deleted/.del-heap.vcproj~4382203ba03f4038:
Auto merged
BitKeeper/deleted/.del-myTest.vcproj~dba5adc4fad3c06:
Auto merged
BitKeeper/deleted/.del-my_print_defaults.vcproj~c8aa2bd86e13c3f9:
Auto merged
BitKeeper/deleted/.del-myisam_ftdump.vcproj~409c19b0274b7f8e:
Auto merged
BitKeeper/deleted/.del-myisamchk.vcproj~982ebe5673e58fb6:
Auto merged
BitKeeper/deleted/.del-myisamlog.vcproj~daa6596ea386e5a7:
Auto merged
BitKeeper/deleted/.del-myisampack.vcproj~3f7d4ec0cb56a9a0:
Auto merged
BitKeeper/deleted/.del-mysql.vcproj~f7bfe13a8836eea0:
Auto merged
BitKeeper/deleted/.del-mysql_client_test.vcproj~22188dcd372bc9de:
Auto merged
BitKeeper/deleted/.del-mysql_upgrade.vcproj~54815b7265120589:
Auto merged
BitKeeper/deleted/.del-mysqladmin.vcproj~178fa55cba442d50:
Auto merged
BitKeeper/deleted/.del-mysqlbinlog.vcproj~b2a5b1868f5d6596:
Auto merged
BitKeeper/deleted/.del-mysqlcheck.vcproj~7022581c8b8a7ea2:
Auto merged
BitKeeper/deleted/.del-mysqlclient.vcproj~e78a73e31368a44a:
Auto merged
BitKeeper/deleted/.del-mysqlimport.vcproj~5a30228ef641c081:
Auto merged
BitKeeper/deleted/.del-mysqlshow.vcproj~797d4fa322faa148:
Auto merged
BitKeeper/deleted/.del-mysqltest.vcproj~21878840704179ef:
Auto merged
BitKeeper/deleted/.del-perror.vcproj~86ad9dc660a048ad:
Auto merged
BitKeeper/deleted/.del-regex.vcproj~9dea9caafa801b26:
Auto merged
BitKeeper/deleted/.del-replace.vcproj~9620b1ced86e527a:
Auto merged
BitKeeper/deleted/.del-strings.vcproj~6d1126ae59e4bf82:
Auto merged
BitKeeper/deleted/.del-test1.vcproj~c474b4614c67e2d2:
Auto merged
BitKeeper/deleted/.del-test_libmysqld.vcproj~fb301d42d5c4e6f4:
Auto merged
BitKeeper/deleted/.del-thr_test.vcproj~fc0e15c1e6880160:
Auto merged
BitKeeper/deleted/.del-vio.vcproj~b7c21b4e2d6a9b85:
Auto merged
BitKeeper/deleted/.del-zlib.vcproj~9b1a681d56dae190:
Auto merged
extra/yassl/taocrypt/taocrypt.vcproj:
Auto merged
extra/yassl/yassl.vcproj:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/delayed.result:
Auto merged
mysql-test/r/loaddata.result:
Auto merged
mysql-test/r/merge.result:
Auto merged
mysql-test/t/delayed.test:
Auto merged
mysql-test/t/init_connect.test:
Auto merged
mysql-test/t/loaddata.test:
Auto merged
mysql-test/t/merge.test:
Auto merged
netware/Makefile.am:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.vcproj:
Auto merged
mysql-test/install_test_db.sh:
SCCS merged
+ some fixes to do the enable
mysql-test/r/rpl_ndb_sync.result:
enabled test case
mysql-test/t/disabled.def:
enabled test case
sql/ha_ndbcluster.cc:
enabled test case
sql/ha_ndbcluster_tables.h:
add defines for old sys table
storage/ndb/tools/restore/Restore.cpp:
add check for old sys table
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
merge
storage/ndb/test/run-test/daily-basic-tests.txt:
merge
into perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
merge
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
Auto merged
ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
Auto merged
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
ndb/test/ndbapi/testNodeRestart.cpp:
Auto merged
ndb/test/run-test/daily-basic-tests.txt:
Auto merged
ndb/test/src/UtilTransactions.cpp:
Auto merged
Handle race condtition between MASTER_GCPCONF and execGCP_NODEFINISH
ndb/src/kernel/blocks/ERROR_codes.txt:
new error codes
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Handle race condtition between MASTER_GCPCONF and execGCP_NODEFINISH
ndb/test/ndbapi/testNodeRestart.cpp:
testcase
ndb/test/run-test/daily-basic-tests.txt:
testcase
