- 05 Jun, 2007 1 commit
-
-
unknown authored
-
- 04 Jun, 2007 16 commits
-
-
unknown authored
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge sql/sql_update.cc: Auto merged
-
unknown authored
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge mysql-test/t/func_misc.test: Auto merged sql/field.cc: Auto merged sql/item_create.cc: Auto merged sql/log_event.cc: Auto merged sql/log_event.h: Auto merged sql/mysqld.cc: Auto merged sql/sp_head.cc: Auto merged sql/sp_head.h: Auto merged sql/sql_base.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_insert.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_update.cc: Auto merged sql/sql_view.cc: Auto merged strings/ctype-ujis.c: Auto merged
-
unknown authored
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge sql/sql_update.cc: Auto merged
-
unknown authored
mysql-test/r/rpl_invoked_features.result: updated result mysql-test/t/rpl_invoked_features.test: updated test
-
unknown authored
into olga.mysql.com:/home/igor/mysql-5.1-opt mysql-test/mysql-test-run.pl: Auto merged sql/udf_example.c: Auto merged
-
unknown authored
-
unknown authored
mysql-test/t/rpl_invoked_features.test: Disable warnings for some queries
-
unknown authored
into dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/tmp/merge_5.0
-
unknown authored
manual merge with 5.0: automatic merge went incorrectly; fixing tests in rbr mode. mysql-test/r/innodb.result: results changed because of some more queries are added mysql-test/r/multi_update.result: results changed mysql-test/r/rpl_row_basic_11bugs.result: results changed mysql-test/t/innodb.test: error code is diff in 5.0 mysql-test/t/multi_update.test: making explicit comments and forcing execution in mixed (stmt) mode. mysql-test/t/rpl_row_basic_11bugs.test: checking how binlogging works when a query on non-ta table completed partly. sql/sql_update.cc: manual merge after authomatic one failed (semantic drift)
-
unknown authored
mysql-test/t/rpl_invoked_features-master.opt: Option file for master mysql-test/t/rpl_invoked_features-slave.opt: Option file for slave
-
unknown authored
BitKeeper/deleted/.del-rpl_invoked_features.result: Delete: mysql-test/t/rpl_invoked_features.result mysql-test/r/rpl_invoked_features.result: Result file for test case
-
unknown authored
mysql-test/t/rpl_invoked_features.result: result file mysql-test/t/rpl_invoked_features.test: WL#3694 test case
-
unknown authored
into olga.mysql.com:/home/igor/mysql-5.1-opt-merge include/thr_lock.h: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/sp.result: Auto merged mysql-test/r/trigger.result: Auto merged mysql-test/t/sp.test: Auto merged mysql-test/t/strict.test: Auto merged mysql-test/t/subselect3.test: Auto merged mysql-test/t/trigger.test: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/sp_head.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_select.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_update.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/udf_example.c: Auto merged mysql-test/r/subselect.result: Manual merge. mysql-test/t/subselect.test: Manual merge. sql/sql_view.cc: Manual merge.
-
unknown authored
-
unknown authored
into dl145s.mysql.com:/dev/shm/mhansson/my50-bug27741 mysql-test/mysql-test-run.pl: Auto merged
-
unknown authored
into olga.mysql.com:/home/igor/mysql-5.1-opt-merge mysql-test/r/alter_table.result: Auto merged mysql-test/r/create.result: Auto merged mysql-test/r/innodb_mysql.result: Auto merged mysql-test/r/sp.result: Auto merged mysql-test/r/user_var.result: Auto merged mysql-test/t/alter_table.test: Auto merged mysql-test/t/sp.test: Auto merged mysql-test/t/strict.test: Auto merged mysql-test/t/subselect3.test: Auto merged sql/field.h: Auto merged sql/handler.h: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged sql/mysqld.cc: Auto merged sql/sp_head.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_select.cc: Auto merged sql/sql_update.cc: Auto merged mysql-test/r/ps_2myisam.result: Manual merge. mysql-test/r/ps_3innodb.result: Manual merge. mysql-test/r/ps_4heap.result: Manual merge. mysql-test/r/ps_5merge.result: Manual merge. mysql-test/r/ps_7ndb.result: Manual merge. sql/sql_table.cc: Manual merge. sql/sql_view.cc: Manual merge.
-
- 03 Jun, 2007 12 commits
-
-
unknown authored
into dl145s.mysql.com:/dev/shm/mhansson/my51-bug27741-mpush
-
unknown authored
Post merge fix for the bug#28494. sql/item_func.h: Post merge fix for the bug#28494. sql/item_func.cc: Post merge fix for the bug#28494.
-
unknown authored
into olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug28728
-
unknown authored
into moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql mysql-test/r/user_var.result: Auto merged mysql-test/t/user_var.test: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged
-
unknown authored
into moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql
-
unknown authored
Corrected test case result for the bug#28494. item_func.h, item_func.cc: Corrected function names after fix for the bug#28494. mysql-test/r/user_var.result: Corrected test case result for the bug#28494. sql/item_func.h: Corrected function names after fix for the bug#28494. sql/item_func.cc: Corrected function names after fix for the bug#28494.
-
unknown authored
into moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql
-
unknown authored
Extended test case for the bug#28494. mysql-test/t/user_var.test: Extended test case for the bug#28494. mysql-test/r/user_var.result: Extended test case for the bug#28494.
-
unknown authored
into olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug28728
-
unknown authored
into macbook.gmz:/Users/kgeorge/mysql/work/B26162-5.0-opt mysql-test/r/trigger.result: Auto merged mysql-test/t/trigger.test: Auto merged sql/sql_base.cc: Auto merged sql/sql_yacc.yy: Auto merged
-
unknown authored
The value of "low-priority-updates" option and the LOW PRIORITY prefix was taken into account at parse time. This caused triggers (among others) to ignore this flag (if supplied for the DML statement). Moved reading of the LOW_PRIORITY flag at run time. Fixed an incosistency when handling SET GLOBAL LOW_PRIORITY_UPDATES : now it is in effect for delayed INSERTs. Tested by checking the effect of LOW_PRIORITY flag via a trigger. include/thr_lock.h: Bug #26162: moved reading of the LOW PRIORITY flag at run time mysql-test/r/trigger.result: Bug #26162: test case mysql-test/t/trigger.test: Bug #26162: test case sql/set_var.cc: Bug #26162: fixed the handling of the "low-priority-updates" option sql/sql_base.cc: Bug #26162: moved reading of the LOW PRIORITY flag at run time sql/sql_yacc.yy: Bug #26162: moved reading of the LOW PRIORITY flag at run time
-
unknown authored
into moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql sql/item_func.cc: Manually merged
-
- 02 Jun, 2007 11 commits
-
-
unknown authored
into olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug28728
-
unknown authored
into moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql
-
unknown authored
Post fix for bug#28494. The Item_func_set_user_var::check method now silently doesn't use result_field if it isn't defined. sql/item_func.cc: Post fix for bug#28494. The Item_func_set_user_var::check method now silently doesn't use result_field if it isn't defined.
-
unknown authored
into moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql sql/item_func.cc: Auto merged sql/item_func.h: Auto merged mysql-test/r/user_var.result: Manual merge mysql-test/t/user_var.test: Manual merge
-
unknown authored
into olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug28728
-
unknown authored
into moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql
-
unknown authored
This is an additional fix. Item::val_xxx methods are supposed to use original data source and Item::val_xxx_result methods to use the item's result field. But for the Item_func_set_user_var class val_xxx_result methods were mapped to val_xxx methods. This leads, in particular, to producing bad sort keys and thus wrong order of the result set of queries with group by/order by clauses. The set of val_xxx_result methods is added to the Item_func_set_user_var class. It's the same as the val_xxx set of method but uses the result_field to return a value. mysql-test/t/user_var.test: Corrected test case for hte bug#28494. mysql-test/r/user_var.result: Corrected test case for hte bug#28494. sql/item_func.cc: Bug#28494: Grouping by Item_func_set_user_var produces incorrect result. The set of val_xxx_result methods is added to the Item_func_set_user_var class. It's the same as the val_xxx set of method but uses the result_field to return a value. sql/item_func.h: Bug#28494: Grouping by Item_func_set_user_var produces incorrect result. The set of val_xxx_result methods is added to the Item_func_set_user_var class.
-
unknown authored
Setting MIXED format instead of UNSPECIFIED format when server is started without log-bin. sql/mysqld.cc: Setting MIXED format instead of UNSPECIFIED format when server is started without log-bin.
-
unknown authored
using a derived table over a grouping subselect. This crash happens only when materialization of the derived tables requires creation of auxiliary temporary table, for example when a grouping operation is carried out with usage of a temporary table. The crash happened because EXPLAIN EXTENDED when printing the query expression made an attempt to use the objects created in the mem_root of the temporary table which has been already freed by the moment when printing is called. This bug appeared after the method Item_field::print() had been introduced. mysql-test/r/subselect.result: Added a test case for bug #28728. mysql-test/t/subselect.test: Added a test case for bug #28728. sql/sql_select.cc: Fixed bug #28728: a crash when executing EXPLAIN EXTENDED for a query using a derived table over a grouping subselect. The crash happened because EXPLAIN EXTENDED when printing the query expression made an attempt to use the objects created in the mem_root of the temporary table which has been already freed by the moment when printing is accomplished. The fix in JOIN::exec() ensures using existing objects when printing subselects for a derived tables by EXPLAIN EXTENDED.
-
unknown authored
-
unknown authored
into dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/tmp/merge_5.0 mysql-test/t/innodb.test: Auto merged mysql-test/r/innodb.result: manual merge use local 5.1 mysql-test/r/multi_update.result: manual merge mysql-test/t/multi_update.test: manual merge sql/sql_update.cc: manual merge
-