Alexander Nozdrin 09942fe8e8 Manual merge from mysql-trunk-merge. ...

Conflicts:
  - include/my_no_pthread.h
  - mysql-test/r/sp-ucs2.result
  - sql/log.cc
  - sql/sql_acl.cc
  - sql/sql_yacc.yy

2009-12-16 21:02:21 +03:00

3.4 KiB

Raw Blame History

View Raw