diff options
| author | unknown <ndbdev@dl145b.mysql.com> | 2005-05-09 20:28:54 +0200 |
|---|---|---|
| committer | unknown <ndbdev@dl145b.mysql.com> | 2005-05-09 20:28:54 +0200 |
| commit | df96db6318701e702d930938d877060b04d71913 (patch) | |
| tree | 88663673de6e036d99f56dfd56c4f3158ca700ea /libmysqld | |
| parent | afbb97bab462181b5a9609a15ef31fdf833299c2 (diff) | |
| parent | 9a71e2dbc63bebe5c895e559c3a317c372288445 (diff) | |
| download | mariadb-git-df96db6318701e702d930938d877060b04d71913.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
sql/ha_ndbcluster.h:
Auto merged
sql/handler.h:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
storage/heap/hp_hash.c:
Auto merged
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/libmysqld.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/libmysqld/libmysqld.c b/libmysqld/libmysqld.c index 6fa41fb3fd0..70074e44c6f 100644 --- a/libmysqld/libmysqld.c +++ b/libmysqld/libmysqld.c @@ -199,6 +199,14 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user, unix_socket=0; db_name = db ? my_strdup(db,MYF(MY_WME)) : NULL; + /* Send client information for access check */ + client_flag|=CLIENT_CAPABILITIES; + if (client_flag & CLIENT_MULTI_STATEMENTS) + client_flag|= CLIENT_MULTI_RESULTS; + client_flag&= ~CLIENT_COMPRESS; + if (db) + client_flag|=CLIENT_CONNECT_WITH_DB; + mysql->thd= create_embedded_thd(client_flag, db_name); init_embedded_mysql(mysql, client_flag, db_name); @@ -209,11 +217,6 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user, if (mysql_init_charset(mysql)) goto error; - /* Send client information for access check */ - client_flag|=CLIENT_CAPABILITIES; - client_flag&= ~CLIENT_COMPRESS; - if (db) - client_flag|=CLIENT_CONNECT_WITH_DB; mysql->server_status= SERVER_STATUS_AUTOCOMMIT; if (mysql->options.init_commands) |