Merge vvagin@work.mysql.com:/home/bk/mysql-4.1

into genie.(none):/home/vva/work/mysql-4.1.help/mysql-4.1.help_res


sql/sql_yacc.yy:
  Auto merged

include/mysqld_error.h

@@ -259,4 +259,4 @@
 #define ER_SUBSELECT_NO_1_ROW 1240
 #define ER_UNKNOWN_STMT_HANDLER 1241
 #define ER_CORRUPT_HELP_DB 1242
-#define ER_ERROR_MESSAGES 242
+#define ER_ERROR_MESSAGES 243

libmysqld/Makefile.am

@@ -56,7 +56,7 @@ sqlsources = convert.cc derror.cc field.cc field_conv.cc filesort.cc \
 	sql_string.cc sql_table.cc sql_test.cc sql_udf.cc \
 	sql_update.cc sql_yacc.cc table.cc thr_malloc.cc time.cc \
 	unireg.cc uniques.cc stacktrace.c sql_union.cc hash_filo.cc \
-	spatial.cc gstream.cc
+	spatial.cc gstream.cc sql_help.cc
 
 EXTRA_DIST = lib_vio.c
 

sql/sql_help.cc

@@ -361,8 +361,8 @@ int mysqld_help (THD *thd, const char *mask)
     }
     else if (count==1)
     {
-      if (res= get_all_names_for_category(thd, file_leafs,
-				     category_id,&function_list))
+      if ((res= get_all_names_for_category(thd, file_leafs,
+				     category_id,&function_list)))
 	goto end;
       List_iterator<String> it(function_list);
       String *cur_leaf, example;
@@ -371,8 +371,8 @@ int mysqld_help (THD *thd, const char *mask)
 	example.append(*cur_leaf);
 	example.append("\n",1);
       }
-      if (res= send_answer_1(thd, categories_list.head()->ptr(),
-				       "Y","",example.ptr()))
+      if ((res= send_answer_1(thd, categories_list.head()->ptr(),
+				       "Y","",example.ptr())))
 	goto end;
     }
     else	
@@ -387,8 +387,8 @@ int mysqld_help (THD *thd, const char *mask)
   }
   else if (count==1)
   {
-    if (res= send_answer_1(thd,name->ptr(),"N",
-			   description->ptr(), example->ptr()))
+    if ((res= send_answer_1(thd,name->ptr(),"N",
+			   description->ptr(), example->ptr())))
       goto end;
   }
   else if((res= send_header_2(thd)) ||

sql/sql_yacc.yy

@@ -712,7 +712,7 @@ help:
        LEX *lex= Lex;
        lex->sql_command= SQLCOM_HELP;
        lex->help_arg= $2.str;
-       }
+       };
 
 /* change master */