Merge from 5.5.

Alexander Nozdrin · Alexander Nozdrin · commit d3511bd64d44 · 2014-08-28T12:20:22.000+04:00
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc
@@ -2,6 +2,9 @@
  * Copyright (c)  2000
  * SWsoft  company
  *
+ * Modifications copyright (c) 2001, 2014. Oracle and/or its affiliates.
+ * All rights reserved.
+ *
  * This material is provided "as is", with absolutely no warranty expressed
  * or implied. Any use is at your own risk.
  *

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,9 @@`
`2`	`2`	`* Copyright (c) 2000`
`3`	`3`	`* SWsoft company`
`4`	`4`	`*`
	`5`	`+ * Modifications copyright (c) 2001, 2014. Oracle and/or its affiliates.`
	`6`	`+ * All rights reserved.`
	`7`	`+ *`
`5`	`8`	`* This material is provided "as is", with absolutely no warranty expressed`
`6`	`9`	`* or implied. Any use is at your own risk.`
`7`	`10`	`*`