Below is the list of changes that have just been committed into a local
4.1 repository of joerg. When joerg does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet
1.2186 05/04/01 18:38:19 joerg@stripped +5 -0
Last minor things to finish MySQL 4.1.10a:
- some wordings,
- RPM packaging improvements.
support-files/mysql.spec.sh
1.87 05/04/01 18:38:16 joerg@stripped +8 -2
Fix date formatting, add missing change descriptions.
sql/sql_udf.cc
1.40 05/04/01 18:38:16 joerg@stripped +6 -6
Fix an erroneous takeover of 4.0 wording.
sql/mysqld.cc
1.551 05/04/01 18:38:15 joerg@stripped +2 -2
Correct a message text; align variable order with other versions.
scripts/mysql_create_system_tables.sh
1.18 05/04/01 18:38:15 joerg@stripped +1 -3
Security change: Reduce the risk caused by predefined anonymous logins.
configure.in
1.351 05/04/01 18:38:15 joerg@stripped +1 -1
Set the version string.
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: joerg
# Host: trift2.
# Root: /M41/clone-4.1.10a
--- 1.350/configure.in Sat Feb 5 07:16:06 2005
+++ 1.351/configure.in Fri Apr 1 18:38:15 2005
@@ -5,7 +5,7 @@
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
--- 1.550/sql/mysqld.cc Thu Mar 31 21:47:15 2005
+++ 1.551/sql/mysqld.cc Fri Apr 1 18:38:15 2005
@@ -284,12 +284,12 @@
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 @@
{"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",
--- 1.39/sql/sql_udf.cc Thu Mar 31 21:57:43 2005
+++ 1.40/sql/sql_udf.cc Fri Apr 1 18:38:16 2005
@@ -74,7 +74,7 @@
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 @@
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 @@
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 @@
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)))
--- 1.86/support-files/mysql.spec.sh Mon Feb 7 16:23:58 2005
+++ 1.87/support-files/mysql.spec.sh Fri Apr 1 18:38:16 2005
@@ -276,7 +276,6 @@
--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 @@
--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 @@
--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 @@
# itself - note that they must be ordered by date (important when
# merging BK trees)
%changelog
-* Monday Feb 7 2005 Tomas Ulin <tomas@stripped>
+* Mon Feb 14 2005 Lenz Grimmer <lenz@stripped>
+
+* Fixed the compilation comments and moved them into the separate build sections
+ for Max and Standard
+
+* Mon Feb 7 2005 Tomas Ulin <tomas@stripped>
- enabled the "Ndbcluster" storage engine for the max binary
- added extra make install in ndb subdir after Max build to get ndb binaries
--- 1.17/scripts/mysql_create_system_tables.sh Fri Sep 3 22:12:22 2004
+++ 1.18/scripts/mysql_create_system_tables.sh Fri Apr 1 18:38:15 2005
@@ -163,9 +163,7 @@
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
| Thread |
|---|
| • bk commit into 4.1 tree (joerg:1.2186) | Joerg Bruehe | 1 Apr |
