- 16 Jun, 2006 9 commits
-
-
unknown authored
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/func_time.result: Auto merged mysql-test/r/ndb_lock.result: Auto merged mysql-test/r/rpl_log.result: Auto merged mysql-test/r/select.result: Auto merged mysql-test/t/archive.test: Auto merged mysql-test/t/auto_increment.test: Auto merged mysql-test/t/func_time.test: Auto merged mysql-test/t/ndb_lock.test: Auto merged mysql-test/t/rpl_log.test: Auto merged mysql-test/t/select.test: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/item_timefunc.cc: Auto merged sql/item_timefunc.h: Auto merged sql/sql_lex.cc: Auto merged tests/mysql_client_test.c: Auto merged
-
unknown authored
After merge fix mysql-test/r/select.result: After merge fix
-
unknown authored
sql/item_timefunc.cc: Auto merged sql/item_timefunc.h: Auto merged
-
unknown authored
into moonbone.local:/work/tmp_merge-5.0-opt-mysql mysql-test/r/cast.result: Auto merged mysql-test/r/func_str.result: Auto merged mysql-test/t/func_str.test: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_cmpfunc.h: Auto merged sql/item_strfunc.cc: Auto merged
-
unknown authored
configure.in: Auto merged sql/item_timefunc.cc: Auto merged sql/item_timefunc.h: Auto merged sql/sql_base.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_parse.cc: Auto merged
-
unknown authored
Fix for bug#16716 for --ps-protocol mode. item_cmpfunc.cc: Fix for a memory allocation/freeing problem in agg_cmp_type() after fix for bug#16377. Few language corrections. sql/item_cmpfunc.cc: Fix for a memory allocation/freeing problem in agg_cmp_type(). Few language corrections. sql/item_strfunc.cc: Fix for bug#16716 for --ps-protocol mode.
-
unknown authored
-
unknown authored
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
-
unknown authored
into rurik.mysql.com:/home/igor/mysql-5.0-opt sql/field.cc: Auto merged sql/opt_sum.cc: Auto merged
-
- 15 Jun, 2006 8 commits
-
-
unknown authored
into moonbone.local:/work/18175-bug-5.0-opt
-
unknown authored
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.
-
unknown authored
into moonbone.local:/work/16377-4.1-after
-
unknown authored
Post fix for bug#16377 mysql-test/r/cast.result: Post fix for bug#16377 sql/item_cmpfunc.h: Post fix for bug#16377
-
unknown authored
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
-
unknown authored
into moonbone.local:/work/19789-bug-5.0-opt-mysql
-
unknown authored
into moonbone.local:/home/evgen/bk-trees/mysql-4.1-opt sql/item_strfunc.cc: Auto merged
-
unknown authored
into mysql.com:/usr/home/ram/work/4.1.b15558
-
- 14 Jun, 2006 23 commits
-
-
unknown authored
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
-
unknown authored
into devsrv-b.mysql.com:/users/msvensson/mysql-5.0
-
unknown authored
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
-
unknown authored
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
-
unknown authored
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
-
unknown authored
- Import patch from yaSSL extra/yassl/src/handshake.cpp: Import patch yassl.diff extra/yassl/src/socket_wrapper.cpp: Import patch yassl.diff
-
unknown authored
into moonbone.local:/home/evgen/bk-trees/mysql-4.1-opt
-
unknown authored
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main sql/ha_ndbcluster.cc: Auto merged
-
unknown authored
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 sql/ha_ndbcluster.cc: manual merge
-
unknown authored
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main sql/ha_ndbcluster.cc: Auto merged
-
unknown authored
- correction of backport error
-
unknown authored
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main sql/ha_ndbcluster.cc: Auto merged
-
unknown authored
- 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''
-
unknown authored
-
unknown authored
-
unknown authored
-
unknown authored
support-files/mysql.server.sh: Auto merged
-
unknown authored
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
-
unknown authored
into mysql.com:/home/kgeorge/mysql/5.0/B18895
-
unknown authored
into mysql.com:/home/kgeorge/mysql/5.0/B18895
-
unknown authored
into moonbone.local:/home/evgen/bk-trees/mysql-5.0-opt
-
unknown authored
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
-
unknown authored
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main sql/ha_ndbcluster.cc: Auto merged
-