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
3cddcc63
Commit
3cddcc63
authored
19 years ago
by
jan@hundin.mysql.fi
Browse files
Options
Browse Files
Download
Plain Diff
Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/jan/mysql-4.1
parents
71f62089
c4acdc6e
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
30 additions
and
5 deletions
+30
-5
cmd-line-utils/libedit/config.h
cmd-line-utils/libedit/config.h
+2
-0
cmd-line-utils/readline/terminal.c
cmd-line-utils/readline/terminal.c
+1
-1
configure.in
configure.in
+21
-2
include/my_sys.h
include/my_sys.h
+4
-0
sql/sql_bitmap.h
sql/sql_bitmap.h
+1
-1
support-files/mysql.server.sh
support-files/mysql.server.sh
+1
-1
No files found.
cmd-line-utils/libedit/config.h
View file @
3cddcc63
...
@@ -2,8 +2,10 @@
...
@@ -2,8 +2,10 @@
#include "my_config.h"
#include "my_config.h"
#include "sys.h"
#include "sys.h"
#if defined(LIBC_SCCS) && !defined(lint)
#define __RCSID(x)
#define __RCSID(x)
#define __COPYRIGHT(x)
#define __COPYRIGHT(x)
#endif
#define __RENAME(x)
#define __RENAME(x)
#define _DIAGASSERT(x)
#define _DIAGASSERT(x)
...
...
This diff is collapsed.
Click to expand it.
cmd-line-utils/readline/terminal.c
View file @
3cddcc63
...
@@ -346,7 +346,7 @@ get_term_capabilities (bp)
...
@@ -346,7 +346,7 @@ get_term_capabilities (bp)
register
unsigned
int
i
;
register
unsigned
int
i
;
for
(
i
=
0
;
i
<
NUM_TC_STRINGS
;
i
++
)
for
(
i
=
0
;
i
<
NUM_TC_STRINGS
;
i
++
)
# if
def __LCC__
# if
defined(__LCC__) || defined(__MWERKS__)
*
(
tc_strings
[
i
].
tc_value
)
=
tgetstr
((
char
*
)
tc_strings
[
i
].
tc_var
,
bp
);
*
(
tc_strings
[
i
].
tc_value
)
=
tgetstr
((
char
*
)
tc_strings
[
i
].
tc_var
,
bp
);
# else
# else
*
(
tc_strings
[
i
].
tc_value
)
=
tgetstr
(
tc_strings
[
i
].
tc_var
,
bp
);
*
(
tc_strings
[
i
].
tc_value
)
=
tgetstr
(
tc_strings
[
i
].
tc_var
,
bp
);
...
...
This diff is collapsed.
Click to expand it.
configure.in
View file @
3cddcc63
...
@@ -127,8 +127,25 @@ AC_PROG_MAKE_SET
...
@@ -127,8 +127,25 @@ AC_PROG_MAKE_SET
# This generates rules for webpage generation for the MySQL homepage.
# This generates rules for webpage generation for the MySQL homepage.
AM_CONDITIONAL
(
LOCAL,
test
-d
../web/SitePages
)
AM_CONDITIONAL
(
LOCAL,
test
-d
../web/SitePages
)
# This is need before AC_PROG_CC
##############################################################################
#
# The below section needs to be done before AC_PROG_CC
##############################################################################
# Hack for OS X/Darwin and Metrowerks CodeWarrior
AC_ARG_WITH
(
darwin-mwcc,
[
--with-darwin-mwcc
Use Metrowerks CodeWarrior wrappers on OS X/Darwin],[
builddir
=
`
pwd
`
ccwrapper
=
"
$builddir
/support-files/MacOSX/mwcc-wrapper"
arwrapper
=
"
$builddir
/support-files/MacOSX/mwar-wrapper"
CC
=
"
$ccwrapper
"
CXX
=
"
$ccwrapper
"
LD
=
"
$ccwrapper
"
AR
=
"
$arwrapper
"
RANLIB
=
:
export
CC CXX LD AR RANLIB
AC_SUBST
(
AR
)
AC_SUBST
(
RANLIB
)
])
if
test
"x
${
CFLAGS
-
}
"
=
x
;
then
if
test
"x
${
CFLAGS
-
}
"
=
x
;
then
cflags_is_set
=
no
cflags_is_set
=
no
...
@@ -148,6 +165,8 @@ else
...
@@ -148,6 +165,8 @@ else
ldflags_is_set
=
yes
ldflags_is_set
=
yes
fi
fi
################ End of section to be done before AC_PROG_CC #################
# The following hack should ensure that configure doesn't add optimizing
# The following hack should ensure that configure doesn't add optimizing
# or debugging flags to CFLAGS or CXXFLAGS
# or debugging flags to CFLAGS or CXXFLAGS
# C_EXTRA_FLAGS are flags that are automaticly added to both
# C_EXTRA_FLAGS are flags that are automaticly added to both
...
...
This diff is collapsed.
Click to expand it.
include/my_sys.h
View file @
3cddcc63
...
@@ -163,6 +163,10 @@ extern char *my_strdup_with_length(const byte *from, uint length,
...
@@ -163,6 +163,10 @@ extern char *my_strdup_with_length(const byte *from, uint length,
#if defined(_AIX) && !defined(__GNUC__) && !defined(_AIX43)
#if defined(_AIX) && !defined(__GNUC__) && !defined(_AIX43)
#pragma alloca
#pragma alloca
#endif
/* _AIX */
#endif
/* _AIX */
#if defined(__MWERKS__)
#undef alloca
#define alloca __alloca
#endif
/* __MWERKS__ */
#if defined(__GNUC__) && !defined(HAVE_ALLOCA_H) && ! defined(alloca)
#if defined(__GNUC__) && !defined(HAVE_ALLOCA_H) && ! defined(alloca)
#define alloca __builtin_alloca
#define alloca __builtin_alloca
#endif
/* GNUC */
#endif
/* GNUC */
...
...
This diff is collapsed.
Click to expand it.
sql/sql_bitmap.h
View file @
3cddcc63
...
@@ -91,7 +91,7 @@ template <> class Bitmap<64>
...
@@ -91,7 +91,7 @@ template <> class Bitmap<64>
ulonglong
map
;
ulonglong
map
;
public:
public:
Bitmap
<
64
>
()
{
}
Bitmap
<
64
>
()
{
}
#if defined(__NETWARE__)
#if defined(__NETWARE__)
|| defined(__MWERKS__)
/*
/*
Metwork compiler gives error on Bitmap<64>
Metwork compiler gives error on Bitmap<64>
Changed to Bitmap, since in this case also it will proper construct
Changed to Bitmap, since in this case also it will proper construct
...
...
This diff is collapsed.
Click to expand it.
support-files/mysql.server.sh
View file @
3cddcc63
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
# started and shut down when the systems goes down.
# started and shut down when the systems goes down.
# Comments to support chkconfig on RedHat Linux
# Comments to support chkconfig on RedHat Linux
# chkconfig: 2345
90 20
# chkconfig: 2345
64 36
# description: A very fast and reliable SQL database engine.
# description: A very fast and reliable SQL database engine.
# Comments to support LSB init script conventions
# Comments to support LSB init script conventions
...
...
This diff is collapsed.
Click to expand it.
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