| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Blocked evaluation of constant objects of the classes
Item_func_is_null and Item_is_not_null_test at the
prepare phase in the cases when the objects used subqueries.
mysql-test/r/ps.result:
Extended test case for bug #25027.
mysql-test/t/ps.test:
Extended test case for bug #25027.
sql/sql_lex.cc:
Returned back the assertion in st_select_lex_unit::set_limit,
removed by the previous commit for this bug.
|
|
|
|
|
|
|
|
|
|
|
|
| |
Removed an assertion that was not valid for the cases where the query
in a prepared statement contained a single-row non-correlated
subquery that was used as an argument of the IS NULL predicate.
mysql-test/r/ps.result:
Added a test case for bug #25027.
mysql-test/t/ps.test:
Added a test case for bug #25027.
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
into olga.mysql.com:/home/igor/mysql-5.0-opt
sql/item_subselect.cc:
Auto merged
mysql-test/r/subselect.result:
Manual merge
mysql-test/t/subselect.test:
Manual merge
sql/item_subselect.h:
Manual merge
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
tables
and no WHERE condition were applied for any subquery without tables.
mysql-test/r/subselect.result:
Added a test case for bug #24670.
mysql-test/t/subselect.test:
Added a test case for bug #24670.
sql/item_subselect.cc:
Fixed bug #24670: optimizations that are legal only for subqueries without tables
and no WHERE condition were applied for any subquery without tables.
Removed an assertion that caused an abort for subqueries without tables and no
WHERE condition.
Blocked substitution of a single-row subquery without tables for the constant
row from its select list when the subquery contained a WHERE condition.
This optimization is valid only for subquries without tables with no conditions.
Any subquery without tables with WHERE clause returns NULL if the WHERE condition
is FALSE. Erroneously it was always considered as non-nullable that could trigger
another optimization concerning IS NULL predicates which is applicable only for
non-nullable expressions and ultimately led to a wrong result returned by the outer
query.
Added a proper implementation of the virtual method may_be_null for class
subselect_single_select_engine.
sql/item_subselect.h:
Fixed bug #24670: optimizations that are legal only for subqueries without tables
and no WHERE condition were applied for any subquery without tables.
Made method may_by_null for class subselect_engine vvirtual.
|
|\ \
| |/
| |
| |
| |
| |
| |
| | |
into mysql.com:/home/gluh/MySQL/Merge/5.0-opt
sql/sql_class.h:
Auto merged
|
| |\
| | |
| | |
| | |
| | |
| | |
| | | |
into mysql.com:/home/gluh/MySQL/Merge/4.1-opt
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint
|
| |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint
sql/sql_class.h:
Auto merged
|
|\ \ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
into mysql.com:/home/gluh/MySQL/Merge/5.0-opt
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
mysql-test/r/gis.result:
result fixed
mysql-test/t/gis.test:
path to datafile fixed
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
mysql-test/r/gis.result:
result fixed
sql/field.cc:
Field_*::reset() now returns int
sql/sql_load.cc:
merging fix
|
| |\ \ \ \ \ \
| | | |_|_|_|/
| | |/| | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
into mysql.com:/home/hf/work/22372/my50-22372
mysql-test/r/gis.result:
merging
mysql-test/t/gis.test:
merging
sql/field.cc:
merging
sql/field.h:
merging
sql/sql_load.cc:
merging
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
datafile added to be used in gis.test
mysql-test/std_data/bad_gis_data.dat:
New BitKeeper file ``mysql-test/std_data/bad_gis_data.dat''
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
The problem is that the GEOMETRY NOT NULL can't automatically set
any value as a default one. We always tried to complete LOAD DATA
command even if there's not enough data in file. That doesn't work
for GEOMETRY NOT NULL. Now Field_*::reset() returns an error sign
and it's checked in mysql_load()
mysql-test/r/gis.result:
test result
mysql-test/t/gis.test:
testcase
sql/field.cc:
reset() now returns error sign
sql/field.h:
Field_*::reset() now returns error sign if the field can't be reset
sql/sql_load.cc:
check if field can't be reset and return error if it's so
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Remove DBUG_ENTER in my_end
client/mysqltest.c:
Call 'mysql_server_end' as last function in 'free_used_memory'
Don't use DBUG_VOID_RETURN after mysql_server_end in free_used_memory
Only call mysql_server_end if mysql_server_init has been called
|
| | | | | | | |
|
| | | | | | | |
|
|\ \ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
|
| |\ \ \ \ \ \ \
| | | |_|_|_|_|/
| | |/| | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
mysql-test/mysql-test-run.pl:
Auto merged
|
| | | | | | | | |
|
| | |\ \ \ \ \ \
| | | |_|_|/ / /
| | |/| | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
mysql-test/mysql-test-run.pl:
Auto merged
|
| | | | |/ / /
| | | |/| | |
| | | | | | |
| | | | | | |
| | | | | | | |
mysql-test/mysql-test-run.pl:
delete $default_vardir if the 4.1 vardir trick is to be used to re-enable more than one test run in sequence
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
client/mysqltest.c:
Exclude
|
| |\ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
|
| | |\ \ \ \ \ \
| | | | |_|/ / /
| | | |/| | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
|
| | |\ \ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
|
| | | |\ \ \ \ \ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
This prevent any subsequent node restarts, but it's better than crashing an alive node
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Fix for bug#24752
This prevent any subsequent node restarts, but it's better than crashing an alive node
|
| | | |\ \ \ \ \ \ \
| | | | |/ / / / / /
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/kernel/vm/SimulatedBlock.cpp:
Auto merged
ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
ndb/src/ndbapi/ndberror.c:
Auto merged
ndb/test/run-test/daily-basic-tests.txt:
Auto merged
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Skip rollback if only committedRead in transaction
ndb/src/ndbapi/NdbTransaction.cpp:
Skip rollback if only committedRead in transaction
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
add testcase for bug#24717
+ fix typo
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Add new error insert 9002
which is 9000, but will auto enable when started
ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp:
Add new error insert 9002
which is 9000, but will auto enable when started
ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
Fix typo
ndb/test/ndbapi/testNodeRestart.cpp:
add testcase for bug#24717
ndb/test/run-test/daily-basic-tests.txt:
add testcase for bug#24717
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
5.0 version
Add some extra state to try to prevent sending committedread to node too early
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
remove extra virtual-indirection
ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
remove extra virtual-indirection
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
remove extra virtual-indirection
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
Add retry mechanism to send TCKEYREF
(as extra safety)
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Add retry mechanism to send TCKEYREF
(as extra safety)
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Add extra state to prevent sending committed reads to node to early
(before connection establishment)
ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
Add extra state to prevent sending committed reads to node to early
(before connection establishment)
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Add extra state to prevent sending committed reads to node to early
(before connection establishment)
ndb/src/kernel/vm/SimulatedBlock.cpp:
remove extra virtual-indirection
ndb/src/kernel/vm/SimulatedBlock.hpp:
remove extra virtual-indirection
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
remove debug printouts
ndb/src/common/util/NdbSqlUtil.cpp:
remove debug printouts
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Fix scan filter on bit types
(note should probably be enabled in condition pushdown aswell)
ndb/src/common/util/NdbSqlUtil.cpp:
Add support for comparing bit types
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
Add new error code
ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp:
Add new error code
ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
Add correct handling of unsupported type
ndb/src/ndbapi/ndberror.c:
Add new error code
|
| | | | |\ \ \ \ \ \
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
into perch.ndb.mysql.com:/home/jonas/src/50-work
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Auto merged
|
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
m ove mlock to much earlier in startphases
not to affect heartbeats
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
move mlock to much earlier in startphases
not to affect heartbeats
|
| | | | |\ \ \ \ \ \ \
| | | | | |/ / / / / /
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
into perch.ndb.mysql.com:/home/jonas/src/50-work
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Auto merged
|
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
actually do run mlockall
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
actually do run mlockall
|
| | | | |\ \ \ \ \ \ \
| | | | | |/ / / / / /
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
into perch.ndb.mysql.com:/home/jonas/src/50-work
ndb/src/kernel/blocks/ERROR_codes.txt:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/test/ndbapi/testScan.cpp:
merge
ndb/test/run-test/daily-basic-tests.txt:
merge
|
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
update error code list
(for bug#24447)
ndb/src/kernel/blocks/ERROR_codes.txt:
ndb -
update error code list
|
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
api disconnect just after SCAN_TABREQ
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
1) add error insert for faking DISCONNECT of API just after SCAN_TABREQ
2) handle error :-)
ndb/test/ndbapi/testScan.cpp:
Add etstcase for bug 24447
ndb/test/run-test/daily-basic-tests.txt:
Add etstcase for bug 24447
|
| | | |\ \ \ \ \ \ \ \
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
into ts3-168.ts.cn.tlan:/home/ngb/mysql/mysql-5.0/mysql-5.0-ndb
ndb/src/mgmsrv/Services.cpp:
Auto merged
|
| | | | |\ \ \ \ \ \ \ \
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | | |
into dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.0/bug19352
|
| | | | | |\ \ \ \ \ \ \ \
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
into dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.0/bug19352
ndb/src/kernel/vm/SimulatedBlock.cpp:
Change the function name different in 5.0 and 4.1.
|
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
platform.
ndb/src/kernel/vm/SimulatedBlock.cpp:
Return exact error message when parameters overflow in 32-bit platform.
|
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / /
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
into dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.0/bug21052
|
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
ndb/include/ndbapi/ndberror.h:
Change unsigned int to int
ndb/src/mgmsrv/Services.cpp:
Modify the overflow error existed in last patch. Change ther length of m_text to 512.
ndb/src/ndbapi/ndberror.c:
Change the parameter of ndb_error_string from unsinged int to int.
|
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
chance.
ndb/src/common/util/File.cpp:
Avoid memory leak when EINTR error returns, Even though a close error happens,
a ERROR message in out-file is given, and this shouldn't affect the normally running.
|
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
sql/ha_ndbcluster.cc:
Auto merged
|