-
unknown authored
into lapi.mysql.com:/home/tkatchaounov/mysql/src/5.1#32694 mysql-test/r/type_datetime.result: Auto merged mysql-test/t/type_datetime.test: Manual merge for BUG#32694. sql/item_cmpfunc.cc: Manual merge for BUG#32694.
b74535d7
into lapi.mysql.com:/home/tkatchaounov/mysql/src/5.1#32694 mysql-test/r/type_datetime.result: Auto merged mysql-test/t/type_datetime.test: Manual merge for BUG#32694. sql/item_cmpfunc.cc: Manual merge for BUG#32694.