Below is the list of changes that have just been committed into a local
5.1 repository of mysqldev. When mysqldev 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.2036 06/02/02 11:07:21 jani@stripped +3 -0
Local fixes for 5.1.5a-alpha build for Netware.
sql/sql_class.cc
1.236 06/02/02 11:07:15 jani@stripped +2 -0
Local fixes for 5.1.5a-alpha build for Netware.
scripts/make_binary_distribution.sh
1.107 06/02/02 11:07:15 jani@stripped +2 -2
Local fixes for 5.1.5a-alpha build for Netware.
client/Makefile.am
1.56 06/02/02 11:07:15 jani@stripped +9 -3
Local fixes for 5.1.5a-alpha build for Netware.
# 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: jani
# Host: suse9-x86.mysql.com
# Root: /home/mysqldev/mydev/mysql-5.1.5-alpha-build
--- 1.55/client/Makefile.am 2005-12-29 03:40:57 +01:00
+++ 1.56/client/Makefile.am 2006-02-02 11:07:15 +01:00
@@ -29,10 +29,19 @@
LIBS = @CLIENT_LIBS@
LDADD= @CLIENT_EXTRA_LDFLAGS@ \
$(top_builddir)/libmysql/libmysqlclient.la
+if HAVE_NETWARE
+bin_PROGRAMS = mysql mysqladmin mysqlcheck mysqlshow \
+ mysqldump mysqlimport mysqltest mysqlbinlog \
+ mysqltestmanagerc mysqltestmanager-pwgen
+else
bin_PROGRAMS = mysql mysqladmin mysqlcheck mysqlshow \
mysqldump mysqlimport mysqltest mysqlbinlog \
mysqltestmanagerc mysqltestmanager-pwgen \
mysqlslap
+mysqlslap_SOURCES= mysqlslap.c $(top_srcdir)/mysys/my_lock.c \
+ $(top_srcdir)/mysys/my_alarm.c \
+ $(yassl_dummy_link_fix)
+endif
noinst_HEADERS = sql_string.h completion_hash.h my_readline.h \
client_priv.h
mysql_SOURCES = mysql.cc readline.cc sql_string.cc completion_hash.cc
@@ -52,9 +61,6 @@
mysqltestmanagerc_SOURCES= mysqlmanagerc.c $(yassl_dummy_link_fix)
mysqlcheck_SOURCES= mysqlcheck.c $(yassl_dummy_link_fix)
mysqlshow_SOURCES= mysqlshow.c $(yassl_dummy_link_fix)
-mysqlslap_SOURCES= mysqlslap.c $(top_srcdir)/mysys/my_lock.c \
- $(top_srcdir)/mysys/my_alarm.c \
- $(yassl_dummy_link_fix)
mysqldump_SOURCES= mysqldump.c $(yassl_dummy_link_fix)
mysqlimport_SOURCES= mysqlimport.c $(yassl_dummy_link_fix)
sql_src=log_event.h mysql_priv.h log_event.cc my_decimal.h my_decimal.cc
--- 1.106/scripts/make_binary_distribution.sh 2006-01-03 14:36:25 +01:00
+++ 1.107/scripts/make_binary_distribution.sh 2006-02-02 11:07:15 +01:00
@@ -129,8 +129,8 @@
BIN_FILES="extra/comp_err$BS extra/replace$BS extra/perror$BS \
extra/resolveip$BS extra/my_print_defaults$BS \
extra/resolve_stack_dump$BS extra/mysql_waitpid$BS \
- myisam/myisamchk$BS myisam/myisampack$BS myisam/myisamlog$BS \
- myisam/myisam_ftdump$BS \
+ storage/myisam/myisamchk$BS storage/myisam/myisampack$BS \
+ storage/myisam/myisamlog$BS storage/myisam/myisam_ftdump$BS \
sql/mysqld$BS sql/mysql_tzinfo_to_sql$BS \
server-tools/instance-manager/mysqlmanager$BS \
client/mysql$BS client/mysqlshow$BS client/mysqladmin$BS \
--- 1.235/sql/sql_class.cc 2006-01-30 09:47:29 +01:00
+++ 1.236/sql/sql_class.cc 2006-02-02 11:07:15 +01:00
@@ -2144,6 +2144,7 @@
inserted/updated/deleted.
*/
+#ifndef MYSQL_CLIENT
#ifdef HAVE_ROW_BASED_REPLICATION
/*
@@ -2252,6 +2253,7 @@
THD::binlog_prepare_pending_rows_event(TABLE*, uint32, MY_BITMAP const*,
my_size_t colcnt, my_size_t, bool,
Update_rows_log_event *);
+#endif
static char const*
field_type_name(enum_field_types type)
| Thread |
|---|
| • bk commit into 5.1 tree (jani:1.2036) | jani | 2 Feb |
