Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
4e6bee1a
Commit
4e6bee1a
authored
Sep 07, 2000
by
jcole@ham.spaceapes.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge jcole@work.mysql.com:/home/bk/mysql
into ham.spaceapes.com:/usr/home/jcole/bk/mysql
parents
6ebc69cb
ffe66f9d
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
15 additions
and
18 deletions
+15
-18
Docs/manual.texi
Docs/manual.texi
+4
-2
mysys/thr_rwlock.c
mysys/thr_rwlock.c
+0
-5
scripts/make_binary_distribution.sh
scripts/make_binary_distribution.sh
+1
-1
scripts/mysql_install_db.sh
scripts/mysql_install_db.sh
+9
-7
sql/ha_myisam.cc
sql/ha_myisam.cc
+0
-1
sql/sql_base.cc
sql/sql_base.cc
+1
-2
No files found.
Docs/manual.texi
View file @
4e6bee1a
...
...
@@ -6903,7 +6903,7 @@ We recommend the following @code{configure} line with @code{egcs} and
shell> CC="gcc -pipe -mcpu=power2 -Wa,-many" \
CXX="gcc -pipe -mcpu=power2 -Wa,-many" \
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
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
you to create, change and delete databases and tables.
You can change field - structure and add, change and delete data in
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}
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
temporary table.
@item
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
@node News-3.23.23, News-3.23.22, News-3.23.24, News-3.23.x
mysys/thr_rwlock.c
View file @
4e6bee1a
...
...
@@ -65,13 +65,8 @@ int my_rwlock_init( rw_lock_t *rwp, void *arg __attribute__((unused)))
pthread_mutex_init
(
&
rwp
->
lock
,
NULL
);
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
->
writers
,
&
cond_attr
);
#endif
pthread_condattr_destroy
(
&
cond_attr
);
rwp
->
state
=
0
;
...
...
scripts/make_binary_distribution.sh
View file @
4e6bee1a
...
...
@@ -54,7 +54,7 @@ cp -r -p sql/share/* $BASE/share/mysql; rm -f $BASE/share/mysql/Makefile* $BASE/
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
$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 /my/gnu/bin/hostname /bin/hostname
--
$BASE
/bin/safe_mysqld
...
...
scripts/mysql_install_db.sh
View file @
4e6bee1a
...
...
@@ -25,11 +25,11 @@ do
;;
--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
/b
o
n
\"
; execdir=
\"
$eqvalue
/libexec
\"
; sbindir=
\"
$eqvalue
/sbin
\"
; "
--basedir
=
*
)
SETVARS
=
"
$SETVARS
basedir=
\"
$eqvalue
\"
; bindir=
\"
$eqvalue
/b
i
n
\"
; execdir=
\"
$eqvalue
/libexec
\"
; sbindir=
\"
$eqvalue
/sbin
\"
; "
;;
--ldata
=
*
|
--datadir
=
*
)
SETVARS
=
"
$SETVARS
ldata=
\"
$eqvalue
\"
;"
;;
...
...
@@ -120,10 +120,12 @@ then
echo
"the --force option"
exit
1
fi
echo
"WARNING: Your libc libraries are not 100 % compatible with this MySQL version"
echo
"mysqld should work normally with the exception that host name resolving"
echo
"will not work. This means that you should use IP addresses instead"
echo
"of hostnames when specifying MySQL privileges !"
echo
"WARNING: The host '
$hostname
' could not be looked up with resolveip."
echo
"This probably means that your libc libraries are not 100 % compatible"
echo
"with this binary MySQL version. The MySQL deamon, mysqld, should work"
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
...
...
sql/ha_myisam.cc
View file @
4e6bee1a
...
...
@@ -111,7 +111,6 @@ const char **ha_myisam::bas_ext() const
int
ha_myisam
::
net_read_dump
(
NET
*
net
)
{
MYISAM_SHARE
*
share
=
file
->
s
;
int
data_fd
=
file
->
dfile
;
int
error
=
0
;
...
...
sql/sql_base.cc
View file @
4e6bee1a
...
...
@@ -47,7 +47,6 @@ static int send_file(THD *thd)
{
NET
*
net
=
&
thd
->
net
;
int
fd
=
-
1
,
bytes
,
error
=
1
;
uint
packet_len
;
char
fname
[
FN_REFLEN
+
1
];
char
buf
[
IO_SIZE
*
15
];
const
char
*
errmsg
=
0
;
...
...
@@ -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
// 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"
;
goto
err
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment