Last minor things to finish MySQL 4.1.10a:mysql-4.1.10a

- some wordings,
- RPM packaging improvements.


configure.in:
  Set the version string.
scripts/mysql_create_system_tables.sh:
  Security change: Reduce the risk caused by predefined anonymous logins.
sql/mysqld.cc:
  Correct a message text; align variable order with other versions.
sql/sql_udf.cc:
  Fix an erroneous takeover of 4.0 wording.
support-files/mysql.spec.sh:
  Fix date formatting, add missing change descriptions.

5 files changed, 18 insertions, 14 deletions

diff --git a/configure.in b/configure.in
index 665029accb3..314283f6012 100644
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,7 @@ AC_INIT(sql/mysqld.cc)
 AC_CANONICAL_SYSTEM
 # The Docs Makefile.am parses this line!
 # remember to also change ndb version below and update version.c in ndb
-AM_INIT_AUTOMAKE(mysql, 4.1.10)
+AM_INIT_AUTOMAKE(mysql, 4.1.10a)
 AM_CONFIG_HEADER(config.h)
 
 PROTOCOL_VERSION=10
diff --git a/scripts/mysql_create_system_tables.sh b/scripts/mysql_create_system_tables.sh
index f524b322388..83fdc0639ce 100644
--- a/scripts/mysql_create_system_tables.sh
+++ b/scripts/mysql_create_system_tables.sh
@@ -163,9 +163,7 @@ then
            INSERT INTO user (host,user) values ('localhost','');"
     else
       i_u="$i_u
-	   INSERT INTO user VALUES ('%','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);
-	   INSERT INTO user VALUES ('localhost','','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);
-	   INSERT INTO user VALUES ('%','','','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','','','','',0,0,0);"
+	   INSERT INTO user VALUES ('localhost','','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);"
     fi
   fi 
 fi
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 988482d00d2..1164506a0a7 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -284,12 +284,12 @@ my_bool opt_local_infile, opt_external_locking, opt_slave_compressed_protocol;
 my_bool opt_safe_user_create = 0, opt_no_mix_types = 0;
 my_bool opt_show_slave_auth_info, opt_sql_bin_update = 0;
 my_bool opt_log_slave_updates= 0;
+my_bool opt_allow_suspicious_udfs;
 my_bool	opt_console= 0, opt_bdb, opt_innodb, opt_isam, opt_ndbcluster;
 #ifdef HAVE_NDBCLUSTER_DB
 const char *opt_ndbcluster_connectstring= 0;
 my_bool	opt_ndb_shm, opt_ndb_optimized_node_selection;
 #endif
-my_bool opt_allow_suspicious_udfs;
 my_bool opt_readonly, use_temp_pool, relay_log_purge;
 my_bool opt_sync_bdb_logs, opt_sync_frm;
 my_bool opt_secure_auth= 0;
@@ -4143,7 +4143,7 @@ struct my_option my_long_options[] =
   {"ansi", 'a', "Use ANSI SQL syntax instead of MySQL syntax.", 0, 0, 0,
    GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"allow-suspicious-udfs", OPT_ALLOW_SUSPICIOUS_UDFS,
-   "Allows use of UDFs consisting of only one symbol xxx() "
+   "Allows to use UDFs consisting of only one symbol xxx() "
    "without corresponding xxx_init() or xxx_deinit(). That also means "
    "that one can load any function from any library, for example exit() "
    "from libc.so",
diff --git a/sql/sql_udf.cc b/sql/sql_udf.cc
index d20fca86323..05df069d69a 100644
--- a/sql/sql_udf.cc
+++ b/sql/sql_udf.cc
@@ -74,7 +74,7 @@ static HASH udf_hash;
 static rw_lock_t THR_LOCK_udf;
 
 
-static udf_func *add_udf(char *name, Item_result ret,
+static udf_func *add_udf(LEX_STRING *name, Item_result ret,
                          char *dl, Item_udftype typ);
 static void del_udf(udf_func *udf);
 static void *find_udf_dl(const char *dl);
@@ -90,8 +90,8 @@ static char *init_syms(udf_func *tmp, char *nm)
 
   if (tmp->type == UDFTYPE_AGGREGATE)
   {
-    (void)strmov(end, "_reset");
-    if (!((tmp->func_reset= dlsym(tmp->dlhandle, nm))))
+    (void)strmov(end, "_clear");
+    if (!((tmp->func_clear= dlsym(tmp->dlhandle, nm))))
       return nm;
     (void)strmov(end, "_add");
     if (!((tmp->func_add= dlsym(tmp->dlhandle, nm))))
@@ -200,8 +200,9 @@ void udf_init()
       continue;
     }
 
-    if (!(tmp = add_udf(&name,(Item_result) table->field[1]->val_int(),
-			dl_name, udftype)))
+
+    if (!(tmp= add_udf(&name,(Item_result) table->field[1]->val_int(),
+                       dl_name, udftype)))
     {
       sql_print_error("Can't alloc memory for udf function: '%.64s'", name.str);
       continue;
@@ -445,7 +446,6 @@ int mysql_create_function(THD *thd,udf_func *udf)
       goto err;
     }
   }
-
   udf->name.str=strdup_root(&mem,udf->name.str);
   udf->dl=strdup_root(&mem,udf->dl);
   if (!(u_d=add_udf(&udf->name,udf->returns,udf->dl,udf->type)))
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh
index b06ba462b26..07c8e6a46fb 100644
--- a/support-files/mysql.spec.sh
+++ b/support-files/mysql.spec.sh
@@ -276,7 +276,6 @@ sh -c  "PATH=\"${MYSQL_BUILD_PATH:-$PATH}\" \
             --includedir=%{_includedir} \
             --mandir=%{_mandir} \
 	    --enable-thread-safe-client \
-	    --with-comment=\"Official MySQL RPM\" \
 	    --with-readline ;
 	    # Add this for more debugging support
 	    # --with-debug
@@ -333,6 +332,7 @@ BuildMySQL "--enable-shared \
 		--with-csv-storage-engine \
 		--with-example-storage-engine \
 		--with-embedded-server \
+		--with-comment=\"MySQL Community Edition - Max (GPL)\" \
 		--with-server-suffix='-Max'"
 
 # Save everything for debug
@@ -379,6 +379,7 @@ BuildMySQL "--disable-shared \
 		--with-client-ldflags='-all-static' \
 		$USE_OTHER_LIBC_DIR \
 %endif
+		--with-comment=\"MySQL Community Edition - Standard (GPL)\" \
 		--with-server-suffix='%{server_suffix}' \
 		--without-embedded-server \
 		--without-berkeley-db \
@@ -694,7 +695,12 @@ fi
 # itself - note that they must be ordered by date (important when
 # merging BK trees)
 %changelog 
-* Monday Feb 7 2005 Tomas Ulin <tomas@mysql.com>
+* Mon Feb 14 2005 Lenz Grimmer <lenz@mysql.com>
+
+* Fixed the compilation comments and moved them into the separate build sections
+  for Max and Standard
+
+* Mon Feb 7 2005 Tomas Ulin <tomas@mysql.com>
 
 - enabled the "Ndbcluster" storage engine for the max binary
 - added extra make install in ndb subdir after Max build to get ndb binaries