Merge trift2.:/MySQL/M50/clone-5.0
into trift2.:/MySQL/M50/push-5.0 mysql-test/r/func_time.result: Null-merge, the change in the 5.0 general tree supersedes the 5.0.25 patch. mysql-test/r/query_cache.result: Auto merged mysql-test/r/type_date.result: Auto merged mysql-test/r/view.result: Null-merge, the change in the 5.0 general tree supersedes the 5.0.25 patch. mysql-test/t/func_time.test: Null-merge, the change in the 5.0 general tree supersedes the 5.0.25 patch. mysql-test/t/type_date.test: Auto merged mysql-test/t/view.test: Null-merge, the change in the 5.0 general tree supersedes the 5.0.25 patch. sql/item_cmpfunc.cc: Null-merge, the change in the 5.0 general tree supersedes the 5.0.25 patch.
Showing
Please register or sign in to comment