Jon Olav Hauglid 70207671eb Merge from mysql-5.5 to mysql-5.5-security ...

Text conflict in sql/share/errmsg-utf8.txt

2012-03-15 12:29:01 +01:00

..

charsets

Updated/added copyright headers

2011-06-30 17:37:13 +02:00

CMakeLists.txt

Updated/added copyright headers

2011-06-30 17:46:53 +02:00

errmsg-utf8.txt

Merge from mysql-5.5 to mysql-5.5-security

2012-03-15 12:29:01 +01:00