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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
a7c5cc01
Commit
a7c5cc01
authored
Oct 05, 2000
by
monty@donna.mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Small fixes
parent
527113d3
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
3 deletions
+8
-3
configure.in
configure.in
+2
-1
libmysql/Makefile.shared
libmysql/Makefile.shared
+1
-1
myisam/mi_open.c
myisam/mi_open.c
+3
-0
mysys/mf_tempfile.c
mysys/mf_tempfile.c
+1
-1
sql/sql_repl.cc
sql/sql_repl.cc
+1
-0
No files found.
configure.in
View file @
a7c5cc01
...
@@ -1201,7 +1201,8 @@ AC_SUBST(MAKE_SHELL)
...
@@ -1201,7 +1201,8 @@ AC_SUBST(MAKE_SHELL)
# Already-done: stdlib.h string.h unistd.h termios.h
# Already-done: stdlib.h string.h unistd.h termios.h
AC_CHECK_HEADERS(varargs.h stdarg.h dirent.h locale.h ndir.h sys/dir.h \
AC_CHECK_HEADERS(varargs.h stdarg.h dirent.h locale.h ndir.h sys/dir.h \
sys/file.h sys/ndir.h sys/ptem.h sys/pte.h sys/select.h sys/stream.h \
sys/file.h sys/ndir.h sys/ptem.h sys/pte.h sys/select.h sys/stream.h \
sys/mman.h curses.h termcap.h termio.h termbits.h asm/termbits.h grp.h)
sys/mman.h curses.h termcap.h termio.h termbits.h asm/termbits.h grp.h \
paths.h)
# Already-done: strcasecmp
# Already-done: strcasecmp
AC_CHECK_FUNCS(lstat putenv select setenv setlocale strcoll tcgetattr)
AC_CHECK_FUNCS(lstat putenv select setenv setlocale strcoll tcgetattr)
...
...
libmysql/Makefile.shared
View file @
a7c5cc01
...
@@ -45,7 +45,7 @@ mystringsextra= strto.c ctype_autoconf.c
...
@@ -45,7 +45,7 @@ mystringsextra= strto.c ctype_autoconf.c
dbugobjects
=
dbug.lo
# IT IS IN SAFEMALLOC.C sanity.lo
dbugobjects
=
dbug.lo
# IT IS IN SAFEMALLOC.C sanity.lo
mysysheaders
=
mysys_priv.h my_static.h
mysysheaders
=
mysys_priv.h my_static.h
mysysobjects1
=
my_init.lo my_static.lo my_malloc.lo my_realloc.lo
\
mysysobjects1
=
my_init.lo my_static.lo my_malloc.lo my_realloc.lo
\
my_create.lo my_delete.lo m
y_tempnam
.lo my_open.lo
\
my_create.lo my_delete.lo m
f_tempfile
.lo my_open.lo
\
mf_casecnv.lo my_read.lo my_write.lo errors.lo
\
mf_casecnv.lo my_read.lo my_write.lo errors.lo
\
my_error.lo my_getwd.lo my_div.lo
\
my_error.lo my_getwd.lo my_div.lo
\
mf_pack.lo my_messnc.lo mf_dirname.lo mf_fn_ext.lo
\
mf_pack.lo my_messnc.lo mf_dirname.lo mf_fn_ext.lo
\
...
...
myisam/mi_open.c
View file @
a7c5cc01
...
@@ -178,6 +178,7 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags)
...
@@ -178,6 +178,7 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags)
((
share
->
state
.
changed
&
STATE_CRASHED
)
||
((
share
->
state
.
changed
&
STATE_CRASHED
)
||
(
my_disable_locking
&&
share
->
state
.
open_count
)))
(
my_disable_locking
&&
share
->
state
.
open_count
)))
{
{
DBUG_PRINT
(
"error"
,(
"Table is marked as crashed"
));
my_errno
=
((
share
->
state
.
changed
&
STATE_CRASHED_ON_REPAIR
)
?
my_errno
=
((
share
->
state
.
changed
&
STATE_CRASHED_ON_REPAIR
)
?
HA_ERR_CRASHED_ON_REPAIR
:
HA_ERR_CRASHED
);
HA_ERR_CRASHED_ON_REPAIR
:
HA_ERR_CRASHED
);
goto
err
;
goto
err
;
...
@@ -209,6 +210,7 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags)
...
@@ -209,6 +210,7 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags)
#elif !defined(USE_RAID)
#elif !defined(USE_RAID)
if
(
share
->
base
.
raid_type
)
if
(
share
->
base
.
raid_type
)
{
{
DBUG_PRINT
(
"error"
,(
"Table uses RAID but we don't have RAID support"
));
my_errno
=
HA_ERR_UNSUPPORTED
;
my_errno
=
HA_ERR_UNSUPPORTED
;
goto
err
;
goto
err
;
}
}
...
@@ -219,6 +221,7 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags)
...
@@ -219,6 +221,7 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags)
if
(
share
->
base
.
max_key_length
>
MI_MAX_KEY_BUFF
||
keys
>
MI_MAX_KEY
||
if
(
share
->
base
.
max_key_length
>
MI_MAX_KEY_BUFF
||
keys
>
MI_MAX_KEY
||
key_parts
>=
MI_MAX_KEY
*
MI_MAX_KEY_SEG
)
key_parts
>=
MI_MAX_KEY
*
MI_MAX_KEY_SEG
)
{
{
DBUG_PRINT
(
"error"
,(
"Wrong key info: Max_key_length: %d keys: %d key_parts: %d"
,
share
->
base
.
max_key_length
,
keys
,
key_parts
));
my_errno
=
HA_ERR_UNSUPPORTED
;
my_errno
=
HA_ERR_UNSUPPORTED
;
goto
err
;
goto
err
;
}
}
...
...
mysys/mf_tempfile.c
View file @
a7c5cc01
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
#include "my_static.h"
#include "my_static.h"
#include "mysys_err.h"
#include "mysys_err.h"
#include <errno.h>
#include <errno.h>
#ifdef HAVE_PATH_H
#ifdef HAVE_PATH
S
_H
#include <paths.h>
#include <paths.h>
#endif
#endif
...
...
sql/sql_repl.cc
View file @
a7c5cc01
...
@@ -21,6 +21,7 @@
...
@@ -21,6 +21,7 @@
#include "sql_repl.h"
#include "sql_repl.h"
#include "sql_acl.h"
#include "sql_acl.h"
#include "log_event.h"
#include "log_event.h"
#include <thr_alarm.h>
#include <my_dir.h>
#include <my_dir.h>
extern
const
char
*
any_db
;
extern
const
char
*
any_db
;
...
...
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