-
unknown authored
into olga.mysql.com:/home/igor/mysql-5.0-opt sql/item_cmpfunc.cc: Auto merged mysql-test/r/order_by.result: Manual merge mysql-test/t/order_by.test: Manual merge sql/item_cmpfunc.h: Manual merge
5fb89701
into olga.mysql.com:/home/igor/mysql-5.0-opt sql/item_cmpfunc.cc: Auto merged mysql-test/r/order_by.result: Manual merge mysql-test/t/order_by.test: Manual merge sql/item_cmpfunc.h: Manual merge