bzr push into mysql-next-mr-wl1054 branch (joro:2957 to 2959)

[Georgi Kodinov]

 2959 Georgi Kodinov	2010-05-31
      WL1054 : updated a test case to reflect the updated root privileges

    modified:
      mysql-test/suite/funcs_1/r/processlist_priv_ps.result
 2958 Georgi Kodinov	2010-05-31
      WL1054: fixed an unitialized variable  problem that caused 
      sys_vars.proxy_user_basic on windows embedded.

    modified:
      libmysqld/lib_sql.cc
 2957 Georgi Kodinov	2010-05-28
      WL1054: fixed windows compilation problems.

    modified:
      include/mysql/client_plugin.h
      plugin/auth/dialog.c*
      plugin/auth/test_plugin.c
      sql-common/client.c*
      sql/mysqld.cc
      sql/sql_acl.cc
      sql/sys_vars.h*
=== modified file 'libmysqld/lib_sql.cc'
--- a/libmysqld/lib_sql.cc	2010-05-27 08:41:00 +0000
+++ b/libmysqld/lib_sql.cc	2010-05-31 11:45:40 +0000
@@ -673,6 +673,7 @@ int check_embedded_connection(MYSQL *mys
   strmake(sctx->priv_host, (char*) my_localhost,  MAX_HOSTNAME-1);
   strmake(sctx->priv_user, mysql->user,  USERNAME_LENGTH-1);
   sctx->user= my_strdup(mysql->user, MYF(0));
+  sctx->proxy_user[0]= 0;
   sctx->master_access= GLOBAL_ACLS;       // Full rights
   /* Change database if necessary */
   if (!(result= (db && db[0] && mysql_change_db(thd, &db_str, FALSE))))

=== modified file 'mysql-test/suite/funcs_1/r/processlist_priv_ps.result'
--- a/mysql-test/suite/funcs_1/r/processlist_priv_ps.result	2009-10-23 06:56:30 +0000
+++ b/mysql-test/suite/funcs_1/r/processlist_priv_ps.result	2010-05-31 12:03:20 +0000
@@ -65,6 +65,7 @@ ERROR 42000: Access denied for user 'roo
 SHOW GRANTS;
 Grants for root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
+GRANT PROXY ON ''@'' TO 'root'@'localhost' WITH GRANT OPTION
 CREATE INDEX i_processlist ON processlist (user);
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
 DROP TABLE processlist;


Attachment: [text/bzr-bundle] bzr/[e-mail]