Alexey Kopytov 5d407d0c1a Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. ...

Conflicts:

Text conflict in mysql-test/r/partition_innodb.result
Text conflict in sql/field.h
Text conflict in sql/item.h
Text conflict in sql/item_cmpfunc.h
Text conflict in sql/item_sum.h
Text conflict in sql/log_event_old.cc
Text conflict in sql/protocol.cc
Text conflict in sql/sql_select.cc
Text conflict in sql/sql_yacc.yy

2010-03-20 23:23:42 +03:00

5.0 KiB

Raw Blame History

View Raw