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
c7a2aae5
Commit
c7a2aae5
authored
Mar 02, 2009
by
unknown
Committed by
MySQL Build Team
Mar 02, 2009
Browse files
Options
Browse Files
Download
Plain Diff
Merge from mysql-5.1.32-release
parents
877a0849
c1b230dd
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
23 additions
and
12 deletions
+23
-12
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
mysql-test/Makefile.am
mysql-test/Makefile.am
+2
-2
mysql-test/mysql-test-run.pl
mysql-test/mysql-test-run.pl
+15
-1
No files found.
cmd-line-utils/libedit/makelist.sh
View file @
c7a2aae5
...
@@ -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 @
c7a2aae5
...
@@ -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 @
c7a2aae5
...
@@ -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
)
#include <sys/ttydefaults.h>
#include <sys/ttydefaults.h>
#endif
#endif
#ifndef CTRL
#ifndef CTRL
...
...
cmd-line-utils/libedit/vi.c
View file @
c7a2aae5
...
@@ -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
;
...
...
mysql-test/Makefile.am
View file @
c7a2aae5
...
@@ -81,7 +81,7 @@ TEST_DIRS = t r include std_data std_data/parts \
...
@@ -81,7 +81,7 @@ TEST_DIRS = t r include std_data std_data/parts \
std_data/funcs_1
\
std_data/funcs_1
\
extra/binlog_tests/ extra/rpl_tests
\
extra/binlog_tests/ extra/rpl_tests
\
suite/binlog suite/binlog/t suite/binlog/r suite/binlog/std_data
\
suite/binlog suite/binlog/t suite/binlog/r suite/binlog/std_data
\
suite/bugs/data suite/bugs/t suite/bugs/r
\
suite/bugs
suite/bugs
/data suite/bugs/t suite/bugs/r
\
suite/federated
\
suite/federated
\
suite/funcs_1 suite/funcs_1/bitdata
\
suite/funcs_1 suite/funcs_1/bitdata
\
suite/funcs_1/include suite/funcs_1/lib suite/funcs_1/r
\
suite/funcs_1/include suite/funcs_1/lib suite/funcs_1/r
\
...
@@ -90,7 +90,7 @@ TEST_DIRS = t r include std_data std_data/parts \
...
@@ -90,7 +90,7 @@ TEST_DIRS = t r include std_data std_data/parts \
suite/funcs_2 suite/funcs_2/charset suite/funcs_2/data
\
suite/funcs_2 suite/funcs_2/charset suite/funcs_2/data
\
suite/funcs_2/include suite/funcs_2/lib suite/funcs_2/r
\
suite/funcs_2/include suite/funcs_2/lib suite/funcs_2/r
\
suite/funcs_2/t
\
suite/funcs_2/t
\
suite/jp suite/jp/t suite/jp/r suite/jp/std_data
\
suite/jp suite/jp/t suite/jp/r suite/jp/std_data
suite/jp/include
\
suite/manual/t suite/manual/r
\
suite/manual/t suite/manual/r
\
suite/ndb_team suite/ndb_team/t suite/ndb_team/r
\
suite/ndb_team suite/ndb_team/t suite/ndb_team/r
\
suite/rpl suite/rpl/data suite/rpl/include suite/rpl/r
\
suite/rpl suite/rpl/data suite/rpl/include suite/rpl/r
\
...
...
mysql-test/mysql-test-run.pl
View file @
c7a2aae5
...
@@ -107,6 +107,17 @@ our $default_vardir;
...
@@ -107,6 +107,17 @@ our $default_vardir;
our
$opt_vardir
;
# Path to use for var/ dir
our
$opt_vardir
;
# Path to use for var/ dir
my
$path_vardir_trace
;
# unix formatted opt_vardir for trace files
my
$path_vardir_trace
;
# unix formatted opt_vardir for trace files
my
$opt_tmpdir
;
# Path to use for tmp/ dir
my
$opt_tmpdir
;
# Path to use for tmp/ dir
my
$opt_tmpdir_pid
;
END
{
if
(
defined
$opt_tmpdir_pid
and
$opt_tmpdir_pid
==
$$
)
{
# Remove the tempdir this process has created
mtr_verbose
("
Removing tmpdir '
$opt_tmpdir
");
rmtree
(
$opt_tmpdir
);
}
}
my
$path_config_file
;
# The generated config file, var/my.cnf
my
$path_config_file
;
# The generated config file, var/my.cnf
# Visual Studio produces executables in different sub-directories based on the
# Visual Studio produces executables in different sub-directories based on the
...
@@ -1066,8 +1077,11 @@ sub command_line_setup {
...
@@ -1066,8 +1077,11 @@ sub command_line_setup {
"
creating a shorter one...
");
"
creating a shorter one...
");
# Create temporary directory in standard location for temporary files
# Create temporary directory in standard location for temporary files
$opt_tmpdir
=
tempdir
(
TMPDIR
=>
1
,
CLEANUP
=>
1
);
$opt_tmpdir
=
tempdir
(
TMPDIR
=>
1
,
CLEANUP
=>
0
);
mtr_report
("
- using tmpdir: '
$opt_tmpdir
'
\n
");
mtr_report
("
- using tmpdir: '
$opt_tmpdir
'
\n
");
# Remember pid that created dir so it's removed by correct process
$opt_tmpdir_pid
=
$$
;
}
}
}
}
$opt_tmpdir
=~
s,/+$,,
;
# Remove ending slash if any
$opt_tmpdir
=~
s,/+$,,
;
# Remove ending slash if any
...
...
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