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
aba98848
Commit
aba98848
authored
Dec 08, 2006
by
msvensson@neptunus.(none)
Browse files
Options
Browse Files
Download
Plain Diff
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
parents
c24381bd
3a4491c7
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
7 deletions
+11
-7
client/mysqltest.c
client/mysqltest.c
+9
-5
mysql-test/Makefile.am
mysql-test/Makefile.am
+1
-1
scripts/make_binary_distribution.sh
scripts/make_binary_distribution.sh
+1
-1
No files found.
client/mysqltest.c
View file @
aba98848
...
...
@@ -1247,7 +1247,9 @@ void var_set(const char *var_name, const char *var_name_end,
v
->
int_dirty
=
0
;
v
->
str_val_len
=
strlen
(
v
->
str_val
);
}
strxmov
(
buf
,
v
->
name
,
"="
,
v
->
str_val
,
NullS
);
my_snprintf
(
buf
,
sizeof
(
buf
),
"%.*s=%.*s"
,
v
->
name_len
,
v
->
name
,
v
->
str_val_len
,
v
->
str_val
);
if
(
!
(
v
->
env_s
=
my_strdup
(
buf
,
MYF
(
MY_WME
))))
die
(
"Out of memory"
);
putenv
(
v
->
env_s
);
...
...
@@ -4692,10 +4694,9 @@ void run_query_normal(struct st_connection *cn, struct st_command *command,
}
/*
Store the result. If res is NULL, use mysql_field_count to
determine if that was expected
Store the result of the query if it will return any fields
*/
if
(
!
(
res
=
mysql_store_result
(
mysql
))
&&
mysql_field_count
(
mysql
))
if
(
mysql_field_count
(
mysql
)
&&
((
res
=
mysql_store_result
(
mysql
))
==
0
))
{
handle_error
(
command
,
mysql_errno
(
mysql
),
mysql_error
(
mysql
),
mysql_sqlstate
(
mysql
),
ds
);
...
...
@@ -4747,7 +4748,10 @@ void run_query_normal(struct st_connection *cn, struct st_command *command,
}
if
(
res
)
{
mysql_free_result
(
res
);
res
=
0
;
}
counter
++
;
}
while
(
!
(
err
=
mysql_next_result
(
mysql
)));
if
(
err
>
0
)
...
...
@@ -4814,7 +4818,7 @@ void handle_error(struct st_command *command,
err_errno
,
err_error
);
/* Abort the run of this test, pass the failed query as reason */
abort_not_supported_test
(
"Query '%s' failed, required functionality"
\
abort_not_supported_test
(
"Query '%s' failed, required functionality
"
\
"not supported"
,
command
->
query
);
}
...
...
mysql-test/Makefile.am
View file @
aba98848
...
...
@@ -108,7 +108,7 @@ install-data-local:
$(INSTALL_DATA)
$(srcdir)
/std_data/Moscow_leap
$(DESTDIR)$(testdir)
/std_data
$(INSTALL_DATA)
$(srcdir)
/std_data/
*
.pem
$(DESTDIR)$(testdir)
/std_data
$(INSTALL_DATA)
$(srcdir)
/std_data/
*
.frm
$(DESTDIR)$(testdir)
/std_data
$(INSTALL_DATA)
$(srcdir)
/std_data/
*
.MY
*
$(distdir)
/std_data
$(INSTALL_DATA)
$(srcdir)
/std_data/
*
.MY
*
$(
DESTDIR)$(
distdir)
/std_data
$(INSTALL_DATA)
$(srcdir)
/std_data/
*
.cnf
$(DESTDIR)$(testdir)
/std_data
$(INSTALL_DATA)
$(srcdir)
/std_data/ndb_backup50/BACKUP
*
$(DESTDIR)$(testdir)
/std_data/ndb_backup50
$(INSTALL_DATA)
$(srcdir)
/std_data/ndb_backup51/BACKUP
*
$(DESTDIR)$(testdir)
/std_data/ndb_backup51
...
...
scripts/make_binary_distribution.sh
View file @
aba98848
...
...
@@ -248,7 +248,7 @@ $CP mysql-test/t/*.def $BASE/mysql-test/t
$CP
mysql-test/std_data/
*
.dat mysql-test/std_data/
*
.frm
\
mysql-test/std_data/
*
.pem mysql-test/std_data/Moscow_leap
\
mysql-test/std_data/des_key_file mysql-test/std_data/
*
.
*
001
\
mysql-test/std_data/
*
.cnf
\
mysql-test/std_data/
*
.cnf
mysql-test/std_data/
*
.MY
*
\
$BASE
/mysql-test/std_data
$CP
mysql-test/t/
*
.test
$BASE
/mysql-test/t
$CP
mysql-test/t/
*
.imtest mysql-test/t/
*
.disabled
$BASE
/mysql-test/t
...
...
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