bk commit into 5.1 tree (holyfoot:1.2554)

[holyfoot]

Below is the list of changes that have just been committed into a local
5.1 repository of hf. When hf does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-04-04 14:04:05+05:00, holyfoot@hfmain.(none) +4 -0
  Merge mysql.com:/home/hf/work/23675/my51-23675
  into  mysql.com:/home/hf/work/my_mrg/my51-my_mrg
  MERGE: 1.2473.49.1

  sql/mysql_priv.h@stripped, 2007-04-04 14:03:40+05:00, holyfoot@hfmain.(none) +0 -0
    Auto merged
    MERGE: 1.489.2.1

  sql/share/errmsg.txt@stripped, 2007-04-04 14:03:58+05:00, holyfoot@hfmain.(none) +2 -2
    merging
    MERGE: 1.148.1.1

  sql/sql_base.cc@stripped, 2007-04-04 14:03:40+05:00, holyfoot@hfmain.(none) +0 -0
    Auto merged
    MERGE: 1.386.2.1

  sql/sql_parse.cc@stripped, 2007-04-04 14:03:40+05:00, holyfoot@hfmain.(none) +0 -0
    Auto merged
    MERGE: 1.647.1.1

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	holyfoot
# Host:	hfmain.(none)
# Root:	/home/hf/work/my_mrg/my51-my_mrg/RESYNC

--- 1.494/sql/mysql_priv.h	2007-04-04 14:04:11 +05:00
+++ 1.495/sql/mysql_priv.h	2007-04-04 14:04:11 +05:00
@@ -599,7 +599,7 @@ class THD;
 void close_thread_tables(THD *thd, bool locked=0, bool skip_derived=0);
 bool check_one_table_access(THD *thd, ulong privilege, TABLE_LIST *tables);
 bool check_single_table_access(THD *thd, ulong privilege,
-			   TABLE_LIST *tables);
+			   TABLE_LIST *tables, bool no_errors);
 bool check_routine_access(THD *thd,ulong want_access,char *db,char *name,
 			  bool is_proc, bool no_errors);
 bool check_some_access(THD *thd, ulong want_access, TABLE_LIST *table);

--- 1.396/sql/sql_base.cc	2007-04-04 14:04:11 +05:00
+++ 1.397/sql/sql_base.cc	2007-04-04 14:04:11 +05:00
@@ -5852,7 +5852,7 @@ bool setup_tables_and_check_access(THD *
   {
     if (leaves_tmp->belong_to_view && 
         check_single_table_access(thd, first_table ? want_access_first :
-                                  want_access,  leaves_tmp))
+                                  want_access, leaves_tmp, FALSE))
     {
       tables->hide_view_error(thd);
       return TRUE;

--- 1.651/sql/sql_parse.cc	2007-04-04 14:04:11 +05:00
+++ 1.652/sql/sql_parse.cc	2007-04-04 14:04:11 +05:00
@@ -4452,6 +4452,8 @@ static bool execute_sqlcom_select(THD *t
     thd			Thread handler
     privilege		requested privilege
     all_tables		global table list of query
+    no_errors           FALSE/TRUE - report/don't report error to
+                            the client (using my_error() call).
 
   RETURN
     0 - OK
@@ -4459,7 +4461,7 @@ static bool execute_sqlcom_select(THD *t
 */
 
 bool check_single_table_access(THD *thd, ulong privilege, 
-                               TABLE_LIST *all_tables)
+                               TABLE_LIST *all_tables, bool no_errors)
 {
   Security_context * backup_ctx= thd->security_ctx;
 
@@ -4475,12 +4477,12 @@ bool check_single_table_access(THD *thd,
     db_name= all_tables->db;
 
   if (check_access(thd, privilege, db_name,
-		   &all_tables->grant.privilege, 0, 0,
+		   &all_tables->grant.privilege, 0, no_errors,
                    test(all_tables->schema_table)))
     goto deny;
 
   /* Show only 1 table for check_grant */
-  if (grant_option && check_grant(thd, privilege, all_tables, 0, 1, 0))
+  if (grant_option && check_grant(thd, privilege, all_tables, 0, 1, no_errors))
     goto deny;
 
   thd->security_ctx= backup_ctx;
@@ -4508,7 +4510,7 @@ deny:
 
 bool check_one_table_access(THD *thd, ulong privilege, TABLE_LIST *all_tables)
 {
-  if (check_single_table_access (thd,privilege,all_tables))
+  if (check_single_table_access (thd,privilege,all_tables, FALSE))
     return 1;
 
   /* Check rights on tables of subselects and implictly opened tables */
@@ -4521,7 +4523,7 @@ bool check_one_table_access(THD *thd, ul
     */
     if (view && subselects_tables->belong_to_view == view)
     {
-      if (check_single_table_access (thd, privilege, subselects_tables))
+      if (check_single_table_access (thd, privilege, subselects_tables, FALSE))
         return 1;
       subselects_tables= subselects_tables->next_global;
     }

--- 1.151/sql/share/errmsg.txt	2007-04-04 14:04:11 +05:00
+++ 1.152/sql/share/errmsg.txt	2007-04-04 14:04:11 +05:00
@@ -6057,3 +6057,5 @@ ER_EVENT_CANNOT_ALTER_IN_THE_PAST
         eng "Event execution time is in the past and ON COMPLETION NOT PRESERVE is set.
Event has not been altered"
 ER_SLAVE_INCIDENT
         eng "The incident %s occured on the master. Message: %-.64s"
+ER_NO_PARTITION_FOR_GIVEN_VALUE_SILENT
+        eng "Table has no partition for some existing values"