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
f1a262bc
Commit
f1a262bc
authored
Jul 31, 2006
by
msvensson@neptunus.(none)
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal:/home/bk/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
parents
5d948f5e
dce84a7e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
3 deletions
+7
-3
client/mysqltest.c
client/mysqltest.c
+4
-2
mysql-test/Makefile.am
mysql-test/Makefile.am
+2
-0
scripts/make_win_src_distribution.sh
scripts/make_win_src_distribution.sh
+1
-1
No files found.
client/mysqltest.c
View file @
f1a262bc
...
...
@@ -147,7 +147,7 @@ const char *user = 0, *host = 0, *unix_sock = 0, *opt_basedir="./";
static
int
port
=
0
;
static
my_bool
opt_big_test
=
0
,
opt_compress
=
0
,
silent
=
0
,
verbose
=
0
;
static
my_bool
tty_password
=
0
,
ps_protocol
=
0
,
ps_protocol_enabled
=
0
;
static
uint
start_lineno
,
*
lineno
;
static
uint
start_lineno
=
0
,
*
lineno
;
const
char
*
manager_user
=
"root"
,
*
manager_host
=
0
;
char
*
manager_pass
=
0
;
int
manager_port
=
MYSQL_MANAGER_PORT
;
...
...
@@ -580,7 +580,7 @@ static void die(const char *fmt, ...)
if
(
cur_file
&&
cur_file
!=
file_stack
)
fprintf
(
stderr
,
"In included file
\"
%s
\"
: "
,
cur_file
->
file_name
);
if
(
start_lineno
!=
0
)
if
(
start_lineno
>
0
)
fprintf
(
stderr
,
"At line %u: "
,
start_lineno
);
vfprintf
(
stderr
,
fmt
,
args
);
fprintf
(
stderr
,
"
\n
"
);
...
...
@@ -4072,6 +4072,8 @@ int main(int argc, char **argv)
parser
.
current_line
+=
current_line_inc
;
}
start_lineno
=
0
;
if
(
!
query_executed
&&
result_file
&&
my_stat
(
result_file
,
&
res_info
,
0
))
{
/*
...
...
mysql-test/Makefile.am
View file @
f1a262bc
...
...
@@ -60,6 +60,7 @@ dist-hook:
$(INSTALL_DATA)
$(srcdir)
/std_data/
*
.dat
$(srcdir)
/std_data/
*
.000001
$(distdir)
/std_data
$(INSTALL_DATA)
$(srcdir)
/std_data/des_key_file
$(distdir)
/std_data
$(INSTALL_DATA)
$(srcdir)
/std_data/
*
.pem
$(distdir)
/std_data
$(INSTALL_DATA)
$(srcdir)
/std_data/
*
.cnf
$(distdir)
/std_data
$(INSTALL_DATA)
$(srcdir)
/lib/init_db.sql
$(distdir)
/lib
$(INSTALL_DATA)
$(srcdir)
/lib/
*
.pl
$(distdir)
/lib
...
...
@@ -83,6 +84,7 @@ install-data-local:
$(INSTALL_DATA)
$(srcdir)
/include/
*
.inc
$(DESTDIR)$(testdir)
/include
$(INSTALL_DATA)
$(srcdir)
/std_data/
*
.dat
$(DESTDIR)$(testdir)
/std_data
$(INSTALL_DATA)
$(srcdir)
/std_data/
*
.
*
001
$(DESTDIR)$(testdir)
/std_data
$(INSTALL_DATA)
$(srcdir)
/std_data/
*
.cnf
$(DESTDIR)$(testdir)
/std_data
$(INSTALL_DATA)
$(srcdir)
/std_data/des_key_file
$(DESTDIR)$(testdir)
/std_data
$(INSTALL_DATA)
$(srcdir)
/std_data/Moscow_leap
$(DESTDIR)$(testdir)
/std_data
$(INSTALL_DATA)
$(srcdir)
/std_data/
*
.pem
$(DESTDIR)$(testdir)
/std_data
...
...
scripts/make_win_src_distribution.sh
View file @
f1a262bc
...
...
@@ -206,7 +206,7 @@ copy_dir_files()
for
i
in
*
.c
*
.cpp
*
.h
*
.ih
*
.i
*
.ic
*
.asm
*
.def
*
.hpp
*
.yy
\
README INSTALL
*
LICENSE AUTHORS NEWS ChangeLog
\
*
.inc
*
.test
*
.result
*
.pem Moscow_leap des_key_file
\
*
.vcproj
*
.sln
*
.dat
*
.000001
*
.require
*
.opt
*
.vcproj
*
.sln
*
.dat
*
.000001
*
.require
*
.opt
*
.cnf
do
if
[
-f
$i
]
then
...
...
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