Manually merged

mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/innobase/os/os0thread.c:
  Auto merged
storage/myisam/myisam_ftdump.c:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbImpl.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbRecAttr.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged

2 files changed, 7 insertions, 7 deletions

diff --git a/netware/BUILD/compile-linux-tools b/netware/BUILD/compile-linux-tools
index 14422ea5a3f..fab92b8d4df 100755
--- a/netware/BUILD/compile-linux-tools
+++ b/netware/BUILD/compile-linux-tools
@@ -57,7 +57,7 @@ make
 cp extra/comp_err extra/comp_err.linux
 cp libmysql/conf_to_src libmysql/conf_to_src.linux
 #cp libmysql_r/conf_to_src libmysql_r/conf_to_src.linux
-cp sql/gen_lex_hash sql/gen_lex_hash.linux
+cp sql/.libs/gen_lex_hash sql/gen_lex_hash.linux
 cp strings/conf_to_src strings/conf_to_src.linux
 
 # Delete mysql_version.h
diff --git a/netware/mysqld_safe.c b/netware/mysqld_safe.c
index 3a1672fdf61..9db8a441ca3 100644
--- a/netware/mysqld_safe.c
+++ b/netware/mysqld_safe.c
@@ -258,11 +258,11 @@ void finish_defaults()
 void read_defaults(arg_list_t *pal)
 {

   arg_list_t al;
-  char defaults_file[PATH_MAX];

+  char defaults_file[PATH_MAX];
   char mydefaults[PATH_MAX];

   char line[PATH_MAX];

   FILE *fp;

-

+
   // defaults output file
   snprintf(defaults_file, PATH_MAX, "%s/bin/defaults.out", basedir);
   remove(defaults_file);
@@ -270,7 +270,7 @@ void read_defaults(arg_list_t *pal)
   // mysqladmin file
   snprintf(mydefaults, PATH_MAX, "%s/bin/my_print_defaults", basedir);

 
-  // args

+  // args
   init_args(&al);
   add_arg(&al, mydefaults);
   if (default_option[0])
@@ -279,11 +279,11 @@ void read_defaults(arg_list_t *pal)
   add_arg(&al, "server");
   add_arg(&al, "mysqld_safe");
   add_arg(&al, "safe_mysqld");
-

+
   spawn(mydefaults, &al, TRUE, NULL, defaults_file, NULL);
-

+
   free_args(&al);
-

+
   // gather defaults
   if ((fp= fopen(defaults_file, "r")) != NULL)
   {