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
998167ac
Commit
998167ac
authored
Jan 02, 2007
by
holyfoot/hf@mysql.com/hfmain.(none)
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
embedded-server related fixes
parent
0831699f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
2 deletions
+10
-2
libmysqld/lib_sql.cc
libmysqld/lib_sql.cc
+6
-0
mysql-test/t/distinct.test
mysql-test/t/distinct.test
+2
-0
mysql-test/t/mysqladmin.test
mysql-test/t/mysqladmin.test
+2
-0
sql/sql_prepare.cc
sql/sql_prepare.cc
+0
-2
No files found.
libmysqld/lib_sql.cc
View file @
998167ac
...
@@ -249,7 +249,13 @@ int emb_read_binary_rows(MYSQL_STMT *stmt)
...
@@ -249,7 +249,13 @@ int emb_read_binary_rows(MYSQL_STMT *stmt)
{
{
MYSQL_DATA
*
data
;
MYSQL_DATA
*
data
;
if
(
!
(
data
=
emb_read_rows
(
stmt
->
mysql
,
0
,
0
)))
if
(
!
(
data
=
emb_read_rows
(
stmt
->
mysql
,
0
,
0
)))
{
strmake
(
stmt
->
sqlstate
,
stmt
->
mysql
->
net
.
sqlstate
,
sizeof
(
stmt
->
sqlstate
));
strmake
(
stmt
->
last_error
,
stmt
->
mysql
->
net
.
last_error
,
sizeof
(
stmt
->
last_error
));
stmt
->
last_errno
=
stmt
->
mysql
->
net
.
last_errno
;
return
1
;
return
1
;
}
return
0
;
return
0
;
}
}
...
...
mysql-test/t/distinct.test
View file @
998167ac
# test script should specify proper directories for embedded
--
source
include
/
not_embedded
.
inc
#
#
# Bug with distinct and INSERT INTO
# Bug with distinct and INSERT INTO
# Bug with group by and not used fields
# Bug with group by and not used fields
...
...
mysql-test/t/mysqladmin.test
View file @
998167ac
# Embedded server doesn't support external clients
--
source
include
/
not_embedded
.
inc
#
#
# Test "mysqladmin ping"
# Test "mysqladmin ping"
#
#
...
...
sql/sql_prepare.cc
View file @
998167ac
...
@@ -1063,7 +1063,6 @@ static int mysql_test_select(Prepared_statement *stmt,
...
@@ -1063,7 +1063,6 @@ static int mysql_test_select(Prepared_statement *stmt,
int
result
=
1
;
int
result
=
1
;
DBUG_ENTER
(
"mysql_test_select"
);
DBUG_ENTER
(
"mysql_test_select"
);
#ifndef NO_EMBEDDED_ACCESS_CHECKS
ulong
privilege
=
lex
->
exchange
?
SELECT_ACL
|
FILE_ACL
:
SELECT_ACL
;
ulong
privilege
=
lex
->
exchange
?
SELECT_ACL
|
FILE_ACL
:
SELECT_ACL
;
if
(
tables
)
if
(
tables
)
{
{
...
@@ -1072,7 +1071,6 @@ static int mysql_test_select(Prepared_statement *stmt,
...
@@ -1072,7 +1071,6 @@ static int mysql_test_select(Prepared_statement *stmt,
}
}
else
if
(
check_access
(
thd
,
privilege
,
any_db
,
0
,
0
,
0
))
else
if
(
check_access
(
thd
,
privilege
,
any_db
,
0
,
0
,
0
))
DBUG_RETURN
(
1
);
DBUG_RETURN
(
1
);
#endif
if
(
!
lex
->
result
&&
!
(
lex
->
result
=
new
(
stmt
->
mem_root
)
select_send
))
if
(
!
lex
->
result
&&
!
(
lex
->
result
=
new
(
stmt
->
mem_root
)
select_send
))
{
{
...
...
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