database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

embedded-server related fixes

Browse Source
This commit is contained in:
holyfoot/hf@mysql.com/hfmain.(none)
2007-01-02 17:46:20 +04:00
parent 0831699f5c
commit 998167acce
4 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libmysqld/lib_sql.cc
View File

@@ -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;
} }

2
mysql-test/t/distinct.test
View File

@@ -1,3 +1,5 @@
# 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

2
mysql-test/t/mysqladmin.test
View File

@@ -1,3 +1,5 @@
# Embedded server doesn't support external clients
--source include/not_embedded.inc
# #
# Test "mysqladmin ping" # Test "mysqladmin ping"
# #

2
sql/sql_prepare.cc
View File

@@ -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,
} }
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))
{ {