Commit e9505769 authored by unknown's avatar unknown

Small portability fixes

Docs/manual.texi:
  Portability updates, user addition and changelog for 3.23.24
mysys/thr_rwlock.c:
  Portability fix
scripts/make_binary_distribution.sh:
  Added use of sbindir
scripts/mysql_install_db.sh:
  Fixed usage of defaults files
sql/ha_myisam.cc:
  Cleanup
sql/sql_base.cc:
  Cleanup
parent 2b3ed202
...@@ -6903,7 +6903,7 @@ We recommend the following @code{configure} line with @code{egcs} and ...@@ -6903,7 +6903,7 @@ We recommend the following @code{configure} line with @code{egcs} and
shell> CC="gcc -pipe -mcpu=power2 -Wa,-many" \ shell> CC="gcc -pipe -mcpu=power2 -Wa,-many" \
CXX="gcc -pipe -mcpu=power2 -Wa,-many" \ CXX="gcc -pipe -mcpu=power2 -Wa,-many" \
CXXFLAGS="-felide-constructors -fno-exceptions -fno-rtti" \ CXXFLAGS="-felide-constructors -fno-exceptions -fno-rtti" \
./configure --prefix=/usr/local/mysql --with-debug --with-low-memory ./configure --prefix=/usr/local/mysql --with-low-memory
@end example @end example
The @code{-Wa,-many} is necessary for the compile to be successful. IBM is The @code{-Wa,-many} is necessary for the compile to be successful. IBM is
...@@ -35032,7 +35032,7 @@ Shareware @strong{MySQL} client for windows. It's WYSIWYG tool which allows ...@@ -35032,7 +35032,7 @@ Shareware @strong{MySQL} client for windows. It's WYSIWYG tool which allows
you to create, change and delete databases and tables. you to create, change and delete databases and tables.
You can change field - structure and add, change and delete data in You can change field - structure and add, change and delete data in
these tables directly without ODBC-driver. these tables directly without ODBC-driver.
@uref{http://www.presult.de, MySQL Maker homepage (look under support/downloads)} @uref{http://62.26.183.157/presult/support/su_sweiche_download.html, MySQL Maker homepage}
@item @uref{http://www.mysql.com/Downloads/Contrib/mysqlwinadmn.zip, mysqlwinadmn.zip} @item @uref{http://www.mysql.com/Downloads/Contrib/mysqlwinadmn.zip, mysqlwinadmn.zip}
Windows GUI (binary only) to administrate a database, by David B. Mansel, Windows GUI (binary only) to administrate a database, by David B. Mansel,
...@@ -35819,6 +35819,8 @@ Fixed small memory leak introduced from 3.23.22 when creating a ...@@ -35819,6 +35819,8 @@ Fixed small memory leak introduced from 3.23.22 when creating a
temporary table. temporary table.
@item @item
Fixed problem with BDB tables and reading on unique (not primary) key. Fixed problem with BDB tables and reading on unique (not primary) key.
@item
Restored the win1251 character set (it's now only marked deprecated).
@end itemize @end itemize
@node News-3.23.23, News-3.23.22, News-3.23.24, News-3.23.x @node News-3.23.23, News-3.23.22, News-3.23.24, News-3.23.x
...@@ -65,13 +65,8 @@ int my_rwlock_init( rw_lock_t *rwp, void *arg __attribute__((unused))) ...@@ -65,13 +65,8 @@ int my_rwlock_init( rw_lock_t *rwp, void *arg __attribute__((unused)))
pthread_mutex_init( &rwp->lock, NULL ); pthread_mutex_init( &rwp->lock, NULL );
pthread_condattr_init( &cond_attr ); pthread_condattr_init( &cond_attr );
#ifdef HAVE_PTHREAD_CONDATTR_CREATE /* HPUX 11.0 */
pthread_cond_init( &rwp->readers, cond_attr );
pthread_cond_init( &rwp->writers, cond_attr );
#else
pthread_cond_init( &rwp->readers, &cond_attr ); pthread_cond_init( &rwp->readers, &cond_attr );
pthread_cond_init( &rwp->writers, &cond_attr ); pthread_cond_init( &rwp->writers, &cond_attr );
#endif
pthread_condattr_destroy(&cond_attr); pthread_condattr_destroy(&cond_attr);
rwp->state = 0; rwp->state = 0;
......
...@@ -54,7 +54,7 @@ cp -r -p sql/share/* $BASE/share/mysql; rm -f $BASE/share/mysql/Makefile* $BASE/ ...@@ -54,7 +54,7 @@ cp -r -p sql/share/* $BASE/share/mysql; rm -f $BASE/share/mysql/Makefile* $BASE/
cp -p scripts/* $BASE/bin cp -p scripts/* $BASE/bin
rm -f $BASE/bin/Makefile* $BASE/bin/*.in $BASE/bin/*.sh $BASE/bin/mysql_install_db $BASE/bin/make_binary_distribution $BASE/bin/setsomevars $BASE/support-files/Makefile* $BASE/support-files/*.sh rm -f $BASE/bin/Makefile* $BASE/bin/*.in $BASE/bin/*.sh $BASE/bin/mysql_install_db $BASE/bin/make_binary_distribution $BASE/bin/setsomevars $BASE/support-files/Makefile* $BASE/support-files/*.sh
$BASE/bin/replace \@localstatedir\@ ./data \@bindir\@ ./bin \@scriptdir\@ ./bin \@libexecdir\@ ./bin \@prefix\@ . \@HOSTNAME\@ @HOSTNAME@ < $SOURCE/scripts/mysql_install_db.sh > $BASE/scripts/mysql_install_db $BASE/bin/replace \@localstatedir\@ ./data \@bindir\@ ./bin \@scriptdir\@ ./bin \@libexecdir\@ ./bin \@sbindir\@ ./bin \@prefix\@ . \@HOSTNAME\@ @HOSTNAME@ < $SOURCE/scripts/mysql_install_db.sh > $BASE/scripts/mysql_install_db
$BASE/bin/replace \@prefix\@ /usr/local/mysql \@bindir\@ ./bin \@MYSQLD_USER\@ root \@localstatedir\@ /usr/local/mysql/data < $SOURCE/support-files/mysql.server.sh > $BASE/support-files/mysql.server $BASE/bin/replace \@prefix\@ /usr/local/mysql \@bindir\@ ./bin \@MYSQLD_USER\@ root \@localstatedir\@ /usr/local/mysql/data < $SOURCE/support-files/mysql.server.sh > $BASE/support-files/mysql.server
$BASE/bin/replace /my/gnu/bin/hostname /bin/hostname -- $BASE/bin/safe_mysqld $BASE/bin/replace /my/gnu/bin/hostname /bin/hostname -- $BASE/bin/safe_mysqld
......
...@@ -25,11 +25,11 @@ do ...@@ -25,11 +25,11 @@ do
;; ;;
--force) force=1 --force) force=1
;; ;;
--no-defaults=*) CONFIG_FILES=/nonexistent --no-defaults=*) defaults="$1"; CONFIG_FILES=/nonexistent
;; ;;
--defaults-file=*) CONFIG_FILES="$eqvalue" --defaults-file=*) defaults="$1"; CONFIG_FILES="$eqvalue"
;; ;;
--basedir=*) SETVARS="$SETVARS basedir=\"$eqvalue\"; bindir=\"$eqvalue/bon\"; execdir=\"$eqvalue/libexec\"; sbindir=\"$eqvalue/sbin\"; " --basedir=*) SETVARS="$SETVARS basedir=\"$eqvalue\"; bindir=\"$eqvalue/bin\"; execdir=\"$eqvalue/libexec\"; sbindir=\"$eqvalue/sbin\"; "
;; ;;
--ldata=*|--datadir=*) SETVARS="$SETVARS ldata=\"$eqvalue\";" --ldata=*|--datadir=*) SETVARS="$SETVARS ldata=\"$eqvalue\";"
;; ;;
...@@ -120,10 +120,12 @@ then ...@@ -120,10 +120,12 @@ then
echo "the --force option" echo "the --force option"
exit 1 exit 1
fi fi
echo "WARNING: Your libc libraries are not 100 % compatible with this MySQL version" echo "WARNING: The host '$hostname' could not be looked up with resolveip."
echo "mysqld should work normally with the exception that host name resolving" echo "This probably means that your libc libraries are not 100 % compatible"
echo "will not work. This means that you should use IP addresses instead" echo "with this binary MySQL version. The MySQL deamon, mysqld, should work"
echo "of hostnames when specifying MySQL privileges !" echo "normally with the exception that host name resolving will not work."
echo "This means that you should use IP addresses instead of hostnames"
echo "when specifying MySQL privileges !"
fi fi
fi fi
......
...@@ -111,7 +111,6 @@ const char **ha_myisam::bas_ext() const ...@@ -111,7 +111,6 @@ const char **ha_myisam::bas_ext() const
int ha_myisam::net_read_dump(NET* net) int ha_myisam::net_read_dump(NET* net)
{ {
MYISAM_SHARE* share = file->s;
int data_fd = file->dfile; int data_fd = file->dfile;
int error = 0; int error = 0;
......
...@@ -47,7 +47,6 @@ static int send_file(THD *thd) ...@@ -47,7 +47,6 @@ static int send_file(THD *thd)
{ {
NET* net = &thd->net; NET* net = &thd->net;
int fd = -1,bytes, error = 1; int fd = -1,bytes, error = 1;
uint packet_len;
char fname[FN_REFLEN+1]; char fname[FN_REFLEN+1];
char buf[IO_SIZE*15]; char buf[IO_SIZE*15];
const char *errmsg = 0; const char *errmsg = 0;
...@@ -61,7 +60,7 @@ static int send_file(THD *thd) ...@@ -61,7 +60,7 @@ static int send_file(THD *thd)
// we need net_flush here because the client will not know it needs to send // we need net_flush here because the client will not know it needs to send
// us the file name until it has processed the load event entry // us the file name until it has processed the load event entry
if (net_flush(net) || (packet_len = my_net_read(net)) == packet_error) if (net_flush(net) || my_net_read(net) == packet_error)
{ {
errmsg = "Failed reading file name"; errmsg = "Failed reading file name";
goto err; goto err;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment