mariadb/sql/share
Alexander Nozdrin 5f0c09dd72 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
..
charsets merged 5.0-bugteam to 5.1-bugteam 2008-05-28 17:18:24 +03:00
errmsg-cnv.sh WL#751 Error message construction, backport 2009-10-15 17:23:43 +05:00
errmsg-utf8.txt Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. 2009-12-16 16:47:07 +03:00
errmsg.txt Manual merge from mysql-trunk-merge. 2009-12-16 21:02:21 +03:00
Makefile.am WL#751 Error message construction, backport 2009-10-15 17:23:43 +05:00