Merge branch 'mysql-5.5' into mysql-5.6

harinvadodaria · harinvadodaria · commit ab759923756a · 2015-11-07T22:14:16.000+05:30
diff --git a/mysql-test/r/mysql_plugin.result b/mysql-test/r/mysql_plugin.result
@@ -105,7 +105,7 @@ ERROR: Missing --plugin_dir option.
 # Show the help.
 #
 mysql_plugin  Ver V.V.VV Distrib XX.XX.XX
-Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 
 Enable or disable plugins.
 

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ ERROR: Missing --plugin_dir option.`
`105`	`105`	`# Show the help.`
`106`	`106`	`#`
`107`	`107`	`mysql_plugin Ver V.V.VV Distrib XX.XX.XX`
`108`		`-Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.`
	`108`	`+Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.`
`109`	`109`
`110`	`110`	`Enable or disable plugins.`
`111`	`111`