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

Merge mysql.com:/d2/hf/common/my50-common

Browse Source 
into  mysql.com:/d2/hf/common/my51-common


libmysqld/lib_sql.cc:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
This commit is contained in:
unknown
2007-01-02 17:55:18 +04:00
parent cbff25d04a 1c48d72376
commit 3c9be16912
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libmysqld/lib_sql.cc
View File

@@ -306,7 +306,11 @@ 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)))
{
set_stmt_errmsg(stmt, stmt->mysql->net.last_error,
stmt->mysql->net.last_errno, stmt->mysql->net.sqlstate);
return 1; return 1;
}
stmt->result= *data; stmt->result= *data;
my_free((char *) data, MYF(0)); my_free((char *) data, MYF(0));
set_stmt_errmsg(stmt, stmt->mysql->net.last_error, set_stmt_errmsg(stmt, stmt->mysql->net.last_error,

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

@@ -1253,7 +1253,6 @@ static int mysql_test_select(Prepared_statement *stmt,
lex->select_lex.context.resolve_in_select_list= TRUE; lex->select_lex.context.resolve_in_select_list= TRUE;
#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)
{ {
@@ -1262,7 +1261,6 @@ static int mysql_test_select(Prepared_statement *stmt,
} }
else if (check_access(thd, privilege, any_db,0,0,0,0)) else if (check_access(thd, privilege, any_db,0,0,0,0))
goto error; goto error;
#endif
if (!lex->result && !(lex->result= new (stmt->mem_root) select_send)) if (!lex->result && !(lex->result= new (stmt->mem_root) select_send))
{ {