bzr commit into mysql-6.0 branch (horst:2947)

[Horst Hunger]

#At file:///work/bzr/mysql-6.0-bug/

 2947 Horst Hunger	2008-11-21 [merge]
      Due to merge from parent.
modified:
  sql/mysqld.cc

=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2008-11-19 10:13:17 +0000
+++ b/sql/mysqld.cc	2008-11-21 14:17:28 +0000
@@ -7717,6 +7717,7 @@ SHOW_VAR status_vars[]= {
   {NullS, NullS, SHOW_LONG}
 };
 
+#ifndef EMBEDDED_LIBRARY
 static void print_version(void)
 {
   set_server_version();
@@ -7728,7 +7729,6 @@ static void print_version(void)
 	 server_version,SYSTEM_TYPE,MACHINE_TYPE, MYSQL_COMPILATION_COMMENT);
 }
 
-#ifndef EMBEDDED_LIBRARY
 static void usage(void)
 {
   if (!(default_charset_info= get_charset_by_csname(default_character_set_name,