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
e127a952
Commit
e127a952
authored
Aug 23, 2001
by
monty@hundin.mysql.fi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Portability fixes
parent
b4705431
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
47 additions
and
24 deletions
+47
-24
Docs/manual.texi
Docs/manual.texi
+14
-1
heap/heapdef.h
heap/heapdef.h
+2
-2
include/global.h
include/global.h
+9
-4
myisam/myisamlog.c
myisam/myisamlog.c
+1
-2
sql/mini_client.cc
sql/mini_client.cc
+15
-4
sql/sql_repl.cc
sql/sql_repl.cc
+3
-0
sql/violite.c
sql/violite.c
+3
-11
No files found.
Docs/manual.texi
View file @
e127a952
...
@@ -1129,6 +1129,9 @@ values).
...
@@ -1129,6 +1129,9 @@ values).
@node MySQL-Books, General-SQL, MySQL Information Sources, MySQL Information Sources
@node MySQL-Books, General-SQL, MySQL Information Sources, MySQL Information Sources
@subsection Books About MySQL
@subsection Books About MySQL
For the latest book information, with user comments, please visit
@uref{http://www.mysql.com/portal/books/html/index.html}.
While this manual is still the right place for up to date technical
While this manual is still the right place for up to date technical
information, its primary goal is to contain everything there is to know
information, its primary goal is to contain everything there is to know
about MySQL. It is sometimes nice to have a bound book to read
about MySQL. It is sometimes nice to have a bound book to read
...
@@ -36066,7 +36069,7 @@ installing a binary version of MySQL. @xref{Installing binary}.
...
@@ -36066,7 +36069,7 @@ installing a binary version of MySQL. @xref{Installing binary}.
@xref{mysqld-max, , @code{mysqld-max}}.
@xref{mysqld-max, , @code{mysqld-max}}.
To compile MySQL with InnoDB support, download MySQL-3.23.37 or newer
To compile MySQL with InnoDB support, download MySQL-3.23.37 or newer
and configure
@code{MySQL}
with the @code{--with-innodb} option.
and configure
MySQL
with the @code{--with-innodb} option.
@xref{Installing source}.
@xref{Installing source}.
@example
@example
...
@@ -36074,6 +36077,16 @@ cd /path/to/source/of/mysql-3.23.37
...
@@ -36074,6 +36077,16 @@ cd /path/to/source/of/mysql-3.23.37
./configure --with-innodb
./configure --with-innodb
@end example
@end example
To get InnoDB to work you have to specify where the data for InnoDB
tables should be stored by specifying the @code{innodb_data_file_path}
option on the command line or in an MySQL option file. @xref{InnoDB
start}. If you have configured MySQL for InnoDB but you have not
specified the above option, @code{mysqld} will print at start:
@example
Can't initialize InnoDB as 'innodb_data_file_path' is not set
@end example
InnoDB provides MySQL with a transaction-safe table handler with
InnoDB provides MySQL with a transaction-safe table handler with
commit, rollback, and crash recovery capabilities. InnoDB does
commit, rollback, and crash recovery capabilities. InnoDB does
locking on row level, and also provides an Oracle-style consistent
locking on row level, and also provides an Oracle-style consistent
heap/heapdef.h
View file @
e127a952
...
@@ -34,9 +34,9 @@ if (!(info->update & HA_STATE_AKTIV))\
...
@@ -34,9 +34,9 @@ if (!(info->update & HA_STATE_AKTIV))\
/* Find pos for record and update it in info->current_ptr */
/* Find pos for record and update it in info->current_ptr */
#define _hp_find_record(info,pos) (info)->current_ptr= _hp_find_block(&(info)->s->block,pos)
#define _hp_find_record(info,pos) (info)->current_ptr= _hp_find_block(&(info)->s->block,pos)
typedef
struct
st_hash_info
typedef
struct
st_h
p_h
ash_info
{
{
struct
st_hash_info
*
next_key
;
struct
st_h
p_h
ash_info
*
next_key
;
byte
*
ptr_to_rec
;
byte
*
ptr_to_rec
;
}
HASH_INFO
;
}
HASH_INFO
;
...
...
include/global.h
View file @
e127a952
...
@@ -645,12 +645,17 @@ typedef off_t os_off_t;
...
@@ -645,12 +645,17 @@ typedef off_t os_off_t;
#if defined(__WIN__)
#if defined(__WIN__)
#define socket_errno WSAGetLastError()
#define socket_errno WSAGetLastError()
#define SOCKET_EINTR WSAEINTR
#define SOCKET_EAGAIN WSAEINPROGRESS
#elif defined(OS2)
#elif defined(OS2)
#define socket_errno sock_errno()
#define socket_errno sock_errno()
#define closesocket(A) soclose(A)
#define closesocket(A) soclose(A)
#else
#else
/* Unix */
#define socket_errno errno
#define socket_errno errno
#define closesocket(A) close(A)
#define closesocket(A) close(A)
#define SOCKET_EINTR EINTR
#define SOCKET_EAGAIN EAGAIN
#define SOCKET_EWOULDBLOCK EWOULDBLOCK
#endif
#endif
typedef
uint8
int7
;
/* Most effective integer 0 <= x <= 127 */
typedef
uint8
int7
;
/* Most effective integer 0 <= x <= 127 */
...
...
myisam/myisamlog.c
View file @
e127a952
...
@@ -488,8 +488,7 @@ static int examine_log(my_string file_name, char **table_names)
...
@@ -488,8 +488,7 @@ static int examine_log(my_string file_name, char **table_names)
command_name
[
command
],
(
int
)
extra_command
,
result
);
command_name
[
command
],
(
int
)
extra_command
,
result
);
if
(
update
&&
curr_file_info
&&
!
curr_file_info
->
closed
)
if
(
update
&&
curr_file_info
&&
!
curr_file_info
->
closed
)
{
{
if
(
mi_extra
(
curr_file_info
->
isam
,
if
(
mi_extra
(
curr_file_info
->
isam
,
extra_command
)
!=
(
int
)
result
)
(
int
)
extra_command
)
!=
(
int
)
result
)
{
{
fflush
(
stdout
);
fflush
(
stdout
);
VOID
(
fprintf
(
stderr
,
VOID
(
fprintf
(
stderr
,
...
...
sql/mini_client.cc
View file @
e127a952
...
@@ -23,10 +23,23 @@
...
@@ -23,10 +23,23 @@
*/
*/
#define DONT_USE_RAID
#define DONT_USE_RAID
#if defined(__WIN__)
|| defined(WIN32)
#if defined(__WIN__)
#include <winsock.h>
#include <winsock.h>
#include <odbcinst.h>
#include <odbcinst.h>
/* Disable alarms */
typedef
my_bool
ALARM
;
#define thr_alarm_init(A) (*(A))=0
#define thr_alarm_in_use(A) (*(A))
#define thr_end_alarm(A)
#define thr_alarm(A,B,C) local_thr_alarm((A),(B),(C))
inline
int
local_thr_alarm
(
my_bool
*
A
,
int
B
__attribute__
((
unused
)),
ALARM
*
C
__attribute__
((
unused
)))
{
*
A
=
1
;
return
0
;
}
#define thr_got_alarm(A) 0
#endif
#endif
#include <global.h>
#include <global.h>
#include <my_sys.h>
#include <my_sys.h>
#include <mysys_err.h>
#include <mysys_err.h>
...
@@ -62,7 +75,7 @@ extern "C" { // Because of SCO 3.2V4.2
...
@@ -62,7 +75,7 @@ extern "C" { // Because of SCO 3.2V4.2
#ifdef HAVE_SYS_UN_H
#ifdef HAVE_SYS_UN_H
# include <sys/un.h>
# include <sys/un.h>
#endif
#endif
#if defined(THREAD)
&& !defined(__WIN__)
#if defined(THREAD)
#include <my_pthread.h>
/* because of signal() */
#include <my_pthread.h>
/* because of signal() */
#include <thr_alarm.h>
#include <thr_alarm.h>
#endif
#endif
...
@@ -486,9 +499,7 @@ mc_mysql_connect(MYSQL *mysql,const char *host, const char *user,
...
@@ -486,9 +499,7 @@ mc_mysql_connect(MYSQL *mysql,const char *host, const char *user,
uint
pkt_length
;
uint
pkt_length
;
NET
*
net
=
&
mysql
->
net
;
NET
*
net
=
&
mysql
->
net
;
thr_alarm_t
alarmed
;
thr_alarm_t
alarmed
;
#if !defined(__WIN__)
ALARM
alarm_buff
;
ALARM
alarm_buff
;
#endif
#ifdef __WIN__
#ifdef __WIN__
HANDLE
hPipe
=
INVALID_HANDLE_VALUE
;
HANDLE
hPipe
=
INVALID_HANDLE_VALUE
;
...
...
sql/sql_repl.cc
View file @
e127a952
...
@@ -620,6 +620,9 @@ int stop_slave(THD* thd, bool net_report )
...
@@ -620,6 +620,9 @@ int stop_slave(THD* thd, bool net_report )
#ifdef HAVE_TIMESPEC_TS_SEC
#ifdef HAVE_TIMESPEC_TS_SEC
abstime
.
ts_sec
=
time
(
NULL
)
+
2
;
abstime
.
ts_sec
=
time
(
NULL
)
+
2
;
abstime
.
ts_nsec
=
0
;
abstime
.
ts_nsec
=
0
;
#elif defined(__WIN__)
abstime
.
tv_sec
=
time
((
time_t
*
)
0
)
+
2
;
abstime
.
tv_nsec
=
0
;
#else
#else
struct
timeval
tv
;
struct
timeval
tv
;
gettimeofday
(
&
tv
,
0
);
gettimeofday
(
&
tv
,
0
);
...
...
sql/violite.c
View file @
e127a952
...
@@ -44,18 +44,10 @@
...
@@ -44,18 +44,10 @@
#endif
/* defined(__EMX__) */
#endif
/* defined(__EMX__) */
#if defined(MSDOS) || defined(__WIN__)
#if defined(MSDOS) || defined(__WIN__)
#ifdef __WIN__
#undef errno
#undef EINTR
#undef EAGAIN
#define errno WSAGetLastError()
#define EINTR WSAEINTR
#define EAGAIN WSAEINPROGRESS
#endif
/* __WIN__ */
#define O_NONBLOCK 1
/* For emulation of fcntl() */
#define O_NONBLOCK 1
/* For emulation of fcntl() */
#endif
#endif
#ifndef EWOULDBLOCK
#ifndef EWOULDBLOCK
#define
EWOULDBLOCK
EAGAIN
#define
SOCKET_EWOULDBLOCK SOCKET_
EAGAIN
#endif
#endif
#ifndef __WIN__
#ifndef __WIN__
...
@@ -327,8 +319,8 @@ int vio_keepalive(Vio* vio, my_bool set_keep_alive)
...
@@ -327,8 +319,8 @@ int vio_keepalive(Vio* vio, my_bool set_keep_alive)
my_bool
my_bool
vio_should_retry
(
Vio
*
vio
__attribute__
((
unused
)))
vio_should_retry
(
Vio
*
vio
__attribute__
((
unused
)))
{
{
int
en
=
errno
;
int
en
=
socket_
errno
;
return
en
==
EAGAIN
||
en
==
EINTR
||
en
==
EWOULDBLOCK
;
return
en
==
SOCKET_EAGAIN
||
en
==
SOCKET_EINTR
||
en
==
SOCKET_
EWOULDBLOCK
;
}
}
...
...
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