into mysql.com:/home/stewart/Documents/MySQL/5.0/main
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
Auto merged
ndb/src/mgmsrv/Services.cpp:
Auto merged
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
mysql-test/r/ctype_sjis.result:
Auto merged
mysql-test/t/ctype_sjis.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
tests/mysql_client_test.c:
Auto merged
into rurik.mysql.com:/home/igor/mysql-5.0-opt
mysql-test/t/func_group.test:
Auto merged
sql/field.cc:
Auto merged
sql/opt_sum.cc:
Auto merged
mysql-test/r/func_group.result:
SCCS merged
resulted in a wrong error message.
The nest_level counter indicates the depth of nesting for a subselect. It is
needed to properly resolve aggregate functions in nested subselects. Obviously
it shouldn't be incremented for UNION parts because they have the same level of
nesting. This counter was incremented by 1 in the mysql_new_select() function
for any new select and wasn't decremented for UNION parts. This resulted in
wrongly reported error messages.
Now the nest_level counter is decremented by 1 for any union part.
mysql-test/t/union.test:
Added test case for the bug#18175: The nest_level counter wasn't decremented for union parts which
resulted in a wrong error message.
mysql-test/r/union.result:
Added test case for the bug#18175: The nest_level counter wasn't decremented for union parts which
resulted in a wrong error message.
sql/sql_yacc.yy:
Fixed bug#18175: The nest_level counter wasn't decremented for union parts which
resulted in a wrong error message.
Now the nest_level counter is decremented by 1 for any union part.
into mysql.com:/usr/home/ram/work/mysql-5.0
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/archive.result:
Auto merged
mysql-test/r/auto_increment.result:
Auto merged
mysql-test/r/ndb_lock.result:
Auto merged
mysql-test/r/rpl_log.result:
Auto merged
mysql-test/t/archive.test:
Auto merged
mysql-test/t/auto_increment.test:
Auto merged
mysql-test/t/ndb_lock.test:
Auto merged
mysql-test/t/rpl_log.test:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
tests/mysql_client_test.c:
Auto merged
configure.in:
ul
sql/ha_archive.cc:
ul
sql/item_func.cc:
ul
mysql-test/r/type_newdecimal.result:
Fix for bug#19667 group by a decimal expression yields wrong result
test case
mysql-test/t/type_newdecimal.test:
Fix for bug#19667 group by a decimal expression yields wrong result
test case
After merge fix
mysql-test/r/func_time.result:
After merge fix
mysql-test/r/func_concat.result:
After merge fix
mysql-test/r/cast.result:
After merge fix
sql/item_cmpfunc.h:
After merge fix
sql/item_cmpfunc.cc:
After merge fix
sql/field.cc:
After merge fix
mysql-test/r/cast.result:
Auto merged
mysql-test/t/func_time.test:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/item_timefunc.h:
Auto merged
sql/opt_sum.cc:
Auto merged
sql/structs.h:
Auto merged
- make sure to disable bulk insert when check for duplicate key is needed
mysql-test/r/ndb_loaddatalocal.result:
New BitKeeper file ``mysql-test/r/ndb_loaddatalocal.result''
mysql-test/t/ndb_loaddatalocal.test:
New BitKeeper file ``mysql-test/t/ndb_loaddatalocal.test''
support-files/mysql.server.sh:
Ensure that some necessary / useful system services have been started already,
when the MySQL server is started.
This fixes bug#18810 and bug#20118
The Field::eq() considered instances of Field_bit that differ only in
bit_ptr/bit_ofs equal. This caused equality conditions optimization
(build_equal_items_for_cond()) to make bad field substitutions that result
in wrong predicates.
Field_bit requires an overloaded eq() function that checks the bit_ptr/bit_ofs
in addition to Field::eq().
mysql-test/r/select.result:
Bug #18895: BIT values cause joins to fail
- test case
mysql-test/t/select.test:
Bug #18895: BIT values cause joins to fail
- test case
sql/field.h:
Bug #18895: BIT values cause joins to fail
- eq() method overloaded for Field_bit
ndb/src/ndbapi/ndberror.c:
distinguish blob method errors: 4265-wrong state 4275-wrong op type/lockmode
ndb/src/ndbapi/NdbBlobImpl.hpp:
distinguish blob method errors: 4265-wrong state 4275-wrong op type/lockmode
fix 4269 -> 4270
ndb/test/ndbapi/testBlobs.cpp:
test lock upgrade, test 4275 errors
ndb/include/ndbapi/NdbScanOperation.hpp:
fix comment
ndb/include/ndbapi/NdbBlob.hpp:
upgrade LM_CommittedRead to LM_Read
check if write allowed (new error 4275)
dont invalidate blob state on error (just general principle)
ndb/src/ndbapi/NdbBlob.cpp:
upgrade LM_CommittedRead to LM_Read
check if write allowed (new error 4275)
dont invalidate blob state on error (just general principle)
