Merge remote branch 'origin/master'

This commit is contained in:
Michal Čihař
2010-04-06 20:40:07 +02:00

View File

@@ -62,6 +62,8 @@ $Id$
+ patch #2981165 [edit] Optionally disable the Type column, + patch #2981165 [edit] Optionally disable the Type column,
thanks to Brian Douglass - bhdouglass thanks to Brian Douglass - bhdouglass
3.3.3.0 (not yet released)
3.3.2.0 (not yet released) 3.3.2.0 (not yet released)
- patch #2969449 [core] Name for MERGE engine varies depending on the - patch #2969449 [core] Name for MERGE engine varies depending on the
MySQL version, thanks to Dieter Adriaenssens - ruleant MySQL version, thanks to Dieter Adriaenssens - ruleant