Author: Arun Kuruvila

mysql-test/r/grant_debug.result

@@ -67,7 +67,7 @@ CREATE USER user_name_robert_golebiowski@oh_my_gosh_this_is_a_long_hostname_look
 ERROR HY000: Cannot load from mysql.procs_priv. The table is probably corrupted
 GRANT ALL PRIVILEGES ON *.* TO user_name_robert_golebiowski@oh_my_gosh_this_is_a_long_hostname_look_at_it_it_has_60_char WITH GRANT OPTION;
 ERROR 42000: Can't find any matching row in the user table
-connect(localhost,user_name_robert_golebiowski,,test,13000,/home/arun/git_childs/bps21/23295423/dbg/mysql-test/var/tmp/mysqld.1.sock);
+connect(localhost,user_name_robert_golebiowski,,test,MASTER_PORT,MASTER_SOCKET);
 ERROR 28000: Access denied for user 'user_name_robert_golebiowski'@'localhost' (using password: NO)
 # This will change CURRENT_USER from user_name_robert_golebiowski@localhost to
 # user_name_robert_golebiowski@oh_my_gosh_this_is_a_long_hostname_look_at_it_it_has_60_char
@@ -104,7 +104,7 @@ CREATE USER robert_golebiows@localhost;
 ERROR HY000: Cannot load from mysql.procs_priv. The table is probably corrupted
 GRANT ALL PRIVILEGES ON *.* TO robert_golebiows@localhost WITH GRANT OPTION;
 ERROR 42000: Can't find any matching row in the user table
-connect(localhost,robert_golebiows,,test,13000,/home/arun/git_childs/bps21/23295423/dbg/mysql-test/var/tmp/mysqld.1.sock);
+connect(localhost,robert_golebiows,,test,MASTER_PORT,MASTER_SOCKET);
 ERROR 28000: Access denied for user 'robert_golebiows'@'localhost' (using password: NO)
 # Again we change localhost to oh_my_gosh_this_is_a_long_hostname_look_at_it_it_has_60_char
 # for CURRENT_USER

mysql-test/r/mysql_upgrade.result

@@ -2620,7 +2620,7 @@ SET sql_mode= @orig_sql_mode;
 Warnings:
 Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 Run mysql_upgrade
-mysql_upgrade: (non fatal) [ERROR] 1728: Incorrect definition of table mysql.proc: expected column 'comment' at position 15 to have type text, found type blob.
+mysql_upgrade: (non fatal) [ERROR] 1728: Cannot load from mysql.proc. The table is probably corrupted
 mysql.columns_priv                                 OK
 mysql.db                                           OK
 mysql.engine_cost                                  OK

mysql-test/t/grant_debug.test

@@ -83,6 +83,7 @@ CREATE USER user_name_robert_golebiowski@oh_my_gosh_this_is_a_long_hostname_look
 --error ER_PASSWORD_NO_MATCH
 GRANT ALL PRIVILEGES ON *.* TO user_name_robert_golebiowski@oh_my_gosh_this_is_a_long_hostname_look_at_it_it_has_60_char WITH GRANT OPTION;
 
+--replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
 --error ER_ACCESS_DENIED_ERROR
 connect (con_grant,localhost,user_name_robert_golebiowski,,);
 
@@ -124,6 +125,7 @@ CREATE USER robert_golebiows@localhost;
 --error ER_PASSWORD_NO_MATCH
 GRANT ALL PRIVILEGES ON *.* TO robert_golebiows@localhost WITH GRANT OPTION;
 
+--replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
 --error ER_ACCESS_DENIED_ERROR
 connect (con_grant_2,localhost,robert_golebiows,,);
 

sql/auth/sql_auth_cache.cc

@@ -704,6 +704,8 @@ GRANT_TABLE::GRANT_TABLE(TABLE *form)
     cols= (ulong) form->field[MYSQL_TABLES_PRIV_FIELD_COLUMN_PRIV]->val_int();
     cols =  fix_rights_for_column(cols);
   }
+  else
+    cols= 0;
 
   (void) my_hash_init2(&hash_columns,4,system_charset_info,
                    0,0,0, (my_hash_get_key) get_key_column,0,0,