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
cf89b94c
Commit
cf89b94c
authored
May 22, 2009
by
MySQL Build Team
Browse files
Options
Browse Files
Download
Plain Diff
Pull in the few changes from mysql-5.4.0-release; also a minor portability fix up from mysql-5.1
parents
0bb9e683
331454c7
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
17 additions
and
15 deletions
+17
-15
.bzr-mysql/default.conf
.bzr-mysql/default.conf
+2
-2
cmd-line-utils/libedit/makelist.sh
cmd-line-utils/libedit/makelist.sh
+2
-2
cmd-line-utils/libedit/readline.c
cmd-line-utils/libedit/readline.c
+1
-4
cmd-line-utils/libedit/readline/readline.h
cmd-line-utils/libedit/readline/readline.h
+1
-1
cmd-line-utils/libedit/vi.c
cmd-line-utils/libedit/vi.c
+2
-2
include/Makefile.am
include/Makefile.am
+3
-4
mysys/Makefile.am
mysys/Makefile.am
+1
-0
sql/Makefile.am
sql/Makefile.am
+1
-0
storage/csv/Makefile.am
storage/csv/Makefile.am
+1
-0
storage/heap/Makefile.am
storage/heap/Makefile.am
+1
-0
storage/myisam/Makefile.am
storage/myisam/Makefile.am
+1
-0
storage/myisammrg/Makefile.am
storage/myisammrg/Makefile.am
+1
-0
No files found.
.bzr-mysql/default.conf
View file @
cf89b94c
[
MYSQL
]
[
MYSQL
]
post_commit_to
=
"commits@lists.mysql.com"
post_commit_to
=
False
#
"commits@lists.mysql.com"
post_push_to
=
"commits@lists.mysql.com"
post_push_to
=
False
#
"commits@lists.mysql.com"
tree_name
=
"mysql-5.1"
tree_name
=
"mysql-5.1"
cmd-line-utils/libedit/makelist.sh
View file @
cf89b94c
...
@@ -84,7 +84,7 @@ case $FLAG in
...
@@ -84,7 +84,7 @@ case $FLAG in
cat
$FILES
|
$AWK
'
cat
$FILES
|
$AWK
'
BEGIN {
BEGIN {
printf("/* Automatically generated file, do not edit */\n");
printf("/* Automatically generated file, do not edit */\n");
printf("#include \"
sys
.h\"\n#include \"el.h\"\n");
printf("#include \"
config
.h\"\n#include \"el.h\"\n");
printf("private const struct el_bindings_t el_func_help[] = {\n");
printf("private const struct el_bindings_t el_func_help[] = {\n");
low = "abcdefghijklmnopqrstuvwxyz_";
low = "abcdefghijklmnopqrstuvwxyz_";
high = "ABCDEFGHIJKLMNOPQRSTUVWXYZ_";
high = "ABCDEFGHIJKLMNOPQRSTUVWXYZ_";
...
@@ -169,7 +169,7 @@ case $FLAG in
...
@@ -169,7 +169,7 @@ case $FLAG in
cat
$FILES
|
$AWK
'/el_action_t/ { print $3 }'
|
sort
|
$AWK
'
cat
$FILES
|
$AWK
'/el_action_t/ { print $3 }'
|
sort
|
$AWK
'
BEGIN {
BEGIN {
printf("/* Automatically generated file, do not edit */\n");
printf("/* Automatically generated file, do not edit */\n");
printf("#include \"
sys
.h\"\n#include \"el.h\"\n");
printf("#include \"
config
.h\"\n#include \"el.h\"\n");
printf("private const el_func_t el_func[] = {");
printf("private const el_func_t el_func[] = {");
maxlen = 80;
maxlen = 80;
needn = 1;
needn = 1;
...
...
cmd-line-utils/libedit/readline.c
View file @
cf89b94c
...
@@ -51,13 +51,10 @@
...
@@ -51,13 +51,10 @@
#else
#else
#include "np/vis.h"
#include "np/vis.h"
#endif
#endif
#ifdef HAVE_ALLOCA_H
#include "readline/readline.h"
#include <alloca.h>
#endif
#include "el.h"
#include "el.h"
#include "fcns.h"
/* for EL_NUM_FCNS */
#include "fcns.h"
/* for EL_NUM_FCNS */
#include "histedit.h"
#include "histedit.h"
#include "readline/readline.h"
#include "filecomplete.h"
#include "filecomplete.h"
void
rl_prep_terminal
(
int
);
void
rl_prep_terminal
(
int
);
...
...
cmd-line-utils/libedit/readline/readline.h
View file @
cf89b94c
...
@@ -66,7 +66,7 @@ typedef KEYMAP_ENTRY *Keymap;
...
@@ -66,7 +66,7 @@ typedef KEYMAP_ENTRY *Keymap;
#ifndef CTRL
#ifndef CTRL
#include <sys/ioctl.h>
#include <sys/ioctl.h>
#if !defined(__sun
__) && !defined(__hpux
__)
#if !defined(__sun
) && !defined(__hpux) && !defined(_AIX) && !defined(__QNXNTO__) && !defined(__USLC
__)
#include <sys/ttydefaults.h>
#include <sys/ttydefaults.h>
#endif
#endif
#ifndef CTRL
#ifndef CTRL
...
...
cmd-line-utils/libedit/vi.c
View file @
cf89b94c
...
@@ -914,14 +914,14 @@ vi_comment_out(EditLine *el, int c)
...
@@ -914,14 +914,14 @@ vi_comment_out(EditLine *el, int c)
* NB: posix implies that we should enter insert mode, however
* NB: posix implies that we should enter insert mode, however
* this is against historical precedent...
* this is against historical precedent...
*/
*/
#if
def __weak_reference
#if
defined(__weak_reference) && !defined(__FreeBSD__)
extern
char
*
get_alias_text
(
const
char
*
)
__weak_reference
(
get_alias_text
);
extern
char
*
get_alias_text
(
const
char
*
)
__weak_reference
(
get_alias_text
);
#endif
#endif
protected
el_action_t
protected
el_action_t
/*ARGSUSED*/
/*ARGSUSED*/
vi_alias
(
EditLine
*
el
,
int
c
)
vi_alias
(
EditLine
*
el
,
int
c
)
{
{
#if
def __weak_reference
#if
defined(__weak_reference) && !defined(__FreeBSD__)
char
alias_name
[
3
];
char
alias_name
[
3
];
char
*
alias_text
;
char
*
alias_text
;
...
...
include/Makefile.am
View file @
cf89b94c
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
# MA 02111-1307, USA
# MA 02111-1307, USA
BUILT_SOURCES
=
$(HEADERS_GEN_MAKE)
link_sources
BUILT_SOURCES
=
$(HEADERS_GEN_MAKE)
link_sources
probes_mysql_nodtrace.h
HEADERS_GEN_CONFIGURE
=
mysql_version.h
HEADERS_GEN_CONFIGURE
=
mysql_version.h
HEADERS_GEN_MAKE
=
my_config.h
HEADERS_GEN_MAKE
=
my_config.h
HEADERS_ABI
=
mysql.h mysql_com.h mysql_time.h
\
HEADERS_ABI
=
mysql.h mysql_com.h mysql_time.h
\
...
@@ -40,8 +40,7 @@ noinst_HEADERS = config-win.h config-netware.h my_bit.h \
...
@@ -40,8 +40,7 @@ noinst_HEADERS = config-win.h config-netware.h my_bit.h \
my_vle.h my_user.h my_atomic.h atomic/nolock.h
\
my_vle.h my_user.h my_atomic.h atomic/nolock.h
\
atomic/rwlock.h atomic/x86-gcc.h atomic/x86-msvc.h
\
atomic/rwlock.h atomic/x86-gcc.h atomic/x86-msvc.h
\
atomic/solaris.h
\
atomic/solaris.h
\
atomic/gcc_builtins.h my_libwrap.h my_stacktrace.h
\
atomic/gcc_builtins.h my_libwrap.h my_stacktrace.h
probes_mysql.h probes_mysql_nodtrace.h
EXTRA_DIST
=
mysql.h.pp mysql/plugin.h.pp probes_mysql.d.base
EXTRA_DIST
=
mysql.h.pp mysql/plugin.h.pp probes_mysql.d.base
...
@@ -77,7 +76,7 @@ probes_mysql.d:
...
@@ -77,7 +76,7 @@ probes_mysql.d:
DTRACEPROVIDER
=
probes_mysql.d
DTRACEPROVIDER
=
probes_mysql.d
if
HAVE_DTRACE
if
HAVE_DTRACE
BUILT_SOURCES
+=
probes_mysql_dtrace.h
BUILT_SOURCES
+=
probes_mysql_dtrace.h
CLEANFILES
+=
probes_mysql_dtrace.h
CLEANFILES
+=
$(DTRACEPROVIDER)
# Fake for creating the probes file. If we are building a separate directory
# Fake for creating the probes file. If we are building a separate directory
# then we copy the probes from the source location and use that
# then we copy the probes from the source location and use that
...
...
mysys/Makefile.am
View file @
cf89b94c
...
@@ -132,6 +132,7 @@ libmysys_a_DEPENDENCIES += probes_mysql.o dtrace_files dtrace_providers
...
@@ -132,6 +132,7 @@ libmysys_a_DEPENDENCIES += probes_mysql.o dtrace_files dtrace_providers
CLEANFILES
=
probes_mysql.o dtrace_files dtrace_providers
CLEANFILES
=
probes_mysql.o dtrace_files dtrace_providers
DTRACEFILES
=
mf_keycache.o
DTRACEFILES
=
mf_keycache.o
DTRACEPROVIDER
=
probes_mysql.d
DTRACEPROVIDER
=
probes_mysql.d
CLEANFILES
+=
$(DTRACEPROVIDER)
dtrace_sources
dtrace_files
:
dtrace_files
:
echo
$(DTRACEFILES)
>
$@
echo
$(DTRACEFILES)
>
$@
...
...
sql/Makefile.am
View file @
cf89b94c
...
@@ -229,6 +229,7 @@ mysqld_LDADD += probes_all.o
...
@@ -229,6 +229,7 @@ mysqld_LDADD += probes_all.o
mysqld_DEPENDENCIES
+=
dtrace_files dtrace_providers probes_all.o
mysqld_DEPENDENCIES
+=
dtrace_files dtrace_providers probes_all.o
CLEANFILES
+=
dtrace_files dtrace_providers probes_all.o
CLEANFILES
+=
dtrace_files dtrace_providers probes_all.o
DTRACEPROVIDER
=
probes_mysql.d
DTRACEPROVIDER
=
probes_mysql.d
CLEANFILES
+=
$(DTRACEPROVIDER)
dtrace_files
:
dtrace_files
:
echo
$(DTRACEFILES)
>
$@
echo
$(DTRACEFILES)
>
$@
...
...
storage/csv/Makefile.am
View file @
cf89b94c
...
@@ -48,6 +48,7 @@ libcsv_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers
...
@@ -48,6 +48,7 @@ libcsv_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers
CLEANFILES
=
probes_mysql.o dtrace_files dtrace_providers
CLEANFILES
=
probes_mysql.o dtrace_files dtrace_providers
DTRACEFILES
=
libcsv_a-ha_tina.o
DTRACEFILES
=
libcsv_a-ha_tina.o
DTRACEPROVIDER
=
probes_mysql.d
DTRACEPROVIDER
=
probes_mysql.d
CLEANFILES
+=
$(DTRACEPROVIDER)
dtrace_sources
dtrace_files
:
dtrace_files
:
echo
$(DTRACEFILES)
>
$@
echo
$(DTRACEFILES)
>
$@
...
...
storage/heap/Makefile.am
View file @
cf89b94c
...
@@ -57,6 +57,7 @@ libheap_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers
...
@@ -57,6 +57,7 @@ libheap_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers
CLEANFILES
=
probes_mysql.o dtrace_files dtrace_providers
CLEANFILES
=
probes_mysql.o dtrace_files dtrace_providers
DTRACEFILES
=
ha_heap.o
DTRACEFILES
=
ha_heap.o
DTRACEPROVIDER
=
probes_mysql.d
DTRACEPROVIDER
=
probes_mysql.d
CLEANFILES
+=
$(DTRACEPROVIDER)
dtrace_sources
dtrace_files
:
dtrace_files
:
echo
$(DTRACEFILES)
>
$@
echo
$(DTRACEFILES)
>
$@
...
...
storage/myisam/Makefile.am
View file @
cf89b94c
...
@@ -156,6 +156,7 @@ libmyisam_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers
...
@@ -156,6 +156,7 @@ libmyisam_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers
CLEANFILES
+=
probes_mysql.o dtrace_files dtrace_providers
CLEANFILES
+=
probes_mysql.o dtrace_files dtrace_providers
DTRACEFILES
=
ha_myisam.o
DTRACEFILES
=
ha_myisam.o
DTRACEPROVIDER
=
probes_mysql.d
DTRACEPROVIDER
=
probes_mysql.d
CLEANFILES
+=
$(DTRACEPROVIDER)
dtrace_sources
dtrace_files
:
dtrace_files
:
echo
$(DTRACEFILES)
>
$@
echo
$(DTRACEFILES)
>
$@
...
...
storage/myisammrg/Makefile.am
View file @
cf89b94c
...
@@ -46,6 +46,7 @@ libmyisammrg_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers
...
@@ -46,6 +46,7 @@ libmyisammrg_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers
CLEANFILES
=
probes_mysql.o dtrace_files dtrace_providers
CLEANFILES
=
probes_mysql.o dtrace_files dtrace_providers
DTRACEFILES
=
ha_myisammrg.o
DTRACEFILES
=
ha_myisammrg.o
DTRACEPROVIDER
=
probes_mysql.d
DTRACEPROVIDER
=
probes_mysql.d
CLEANFILES
+=
$(DTRACEPROVIDER)
dtrace_sources
dtrace_files
:
dtrace_files
:
echo
$(DTRACEFILES)
>
$@
echo
$(DTRACEFILES)
>
$@
...
...
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