summaryrefslogtreecommitdiff
path: root/libmysqld
diff options
context:
space:
mode:
authorunknown <hf@deer.(none)>2004-02-14 20:26:21 +0400
committerunknown <hf@deer.(none)>2004-02-14 20:26:21 +0400
commitb012018b7a126eec08867b0726b7fad5b31a153f (patch)
tree4dd52b37d447d33fe6e01db093004f501c36c60a /libmysqld
parenta02bf29344f3ac58a49866e4be73dfbc9100b162 (diff)
downloadmariadb-git-b012018b7a126eec08867b0726b7fad5b31a153f.tar.gz
Fix for #2212 (mysql_change_user doesn't work in embedded library)
now it's working include/mysql.h: read_change_user_result 'virtual' method added libmysql/client_settings.h: cli_read_change_user_result interface libmysql/libmysql.c: cli_read_change_user_result implementation libmysqld/lib_sql.cc: emb_read_change_user_result implementation sql-common/client.c: cli_read_change_user_result added to the method's table sql/sql_parse.cc: fixes to make mysql_change_user working in embedded library
Diffstat (limited to 'libmysqld')
-rw-r--r--libmysqld/lib_sql.cc10
1 files changed, 9 insertions, 1 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc
index 63354149d42..ee6451f4a17 100644
--- a/libmysqld/lib_sql.cc
+++ b/libmysqld/lib_sql.cc
@@ -258,6 +258,13 @@ int emb_next_result(MYSQL *mysql)
DBUG_RETURN(0); /* No more results */
}
+int emb_read_change_user_result(MYSQL *mysql,
+ char *buff __attribute__((unused)),
+ const char *passwd __attribute__((unused)))
+{
+ return mysql_errno(mysql);
+}
+
MYSQL_METHODS embedded_methods=
{
emb_mysql_read_query_result,
@@ -272,7 +279,8 @@ MYSQL_METHODS embedded_methods=
emb_unbuffered_fetch,
emb_free_embedded_thd,
emb_read_statistic,
- emb_next_result
+ emb_next_result,
+ emb_read_change_user_result
};
C_MODE_END