bk commit into 5.1 tree (andrey:1.2111)

[ahristov]

Below is the list of changes that have just been committed into a local
5.1 repository of andrey. When andrey 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
  1.2111 06/02/15 23:43:11 andrey@lmy004. +3 -0
  build fixes

  sql/set_var.cc
    1.173 06/02/15 23:43:04 andrey@lmy004. +1 -1
    fix for the broken build of Serg. gcc seems to be pretty happy without
    the return and returns the value of the last statement

  sql/event_timed.cc
    1.30 06/02/15 23:43:04 andrey@lmy004. +6 -1
    acl_getroot_no_password() is not there in libmysqld, disable it's usage
    in this case.

  sql/event.cc
    1.27 06/02/15 23:43:04 andrey@lmy004. +1 -1
    - make this not unsigned. gcc complains

# 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:	andrey
# Host:	lmy004.
# Root:	/work/mysql-5.1-bug17289

--- 1.26/sql/event.cc	2006-02-14 20:10:43 +01:00
+++ 1.27/sql/event.cc	2006-02-15 23:43:04 +01:00
@@ -1239,7 +1239,7 @@ int db_drop_event(THD *thd, event_timed 
 {
   TABLE *table;
   Open_tables_state backup;
-  uint ret;
+  int ret;
 
   DBUG_ENTER("db_drop_event");
   ret= EVEX_OPEN_TABLE_FAILED;

--- 1.29/sql/event_timed.cc	2006-02-15 22:32:14 +01:00
+++ 1.30/sql/event_timed.cc	2006-02-15 23:43:04 +01:00
@@ -1093,6 +1093,7 @@ event_timed::execute(THD *thd, MEM_ROOT 
   DBUG_PRINT("info", ("master_access=%d db_access=%d",
              thd->security_ctx->master_access, thd->security_ctx->db_access));
   change_security_context(thd, &save_ctx);
+
   DBUG_PRINT("info", ("master_access=%d db_access=%d",
              thd->security_ctx->master_access, thd->security_ctx->db_access));
   if (mysql_change_db(thd, dbname.str, 0))
@@ -1108,6 +1109,7 @@ event_timed::execute(THD *thd, MEM_ROOT 
     ret= -99;
   }
   restore_security_context(thd, save_ctx);
+
   DBUG_PRINT("info", ("master_access=%d db_access=%d",
              thd->security_ctx->master_access, thd->security_ctx->db_access));
 
@@ -1145,6 +1147,7 @@ event_timed::change_security_context(THD
 {
   DBUG_ENTER("event_timed::change_security_context");
   DBUG_PRINT("info",("%s@%s@%s",definer_user.str,definer_host.str, dbname.str));
+#ifndef NO_EMBEDDED_ACCESS_CHECKS
   *backup= 0;
   if (acl_getroot_no_password(&sphead->m_security_ctx, definer_user.str,
                               definer_host.str, definer_host.str, dbname.str))
@@ -1154,7 +1157,7 @@ event_timed::change_security_context(THD
   }
   *backup= thd->security_ctx;
   thd->security_ctx= &sphead->m_security_ctx;
-
+#endif
   DBUG_RETURN(FALSE);
 }
 
@@ -1171,8 +1174,10 @@ void
 event_timed::restore_security_context(THD *thd, Security_context *backup)
 {
   DBUG_ENTER("event_timed::change_security_context");
+#ifndef NO_EMBEDDED_ACCESS_CHECKS
   if (backup)
     thd->security_ctx= backup;
+#endif
   DBUG_VOID_RETURN;
 }
 

--- 1.172/sql/set_var.cc	2006-02-15 00:01:27 +01:00
+++ 1.173/sql/set_var.cc	2006-02-15 23:43:04 +01:00
@@ -3488,7 +3488,7 @@ byte *sys_var_thd_dbug::value_ptr(THD *t
     DBUG_EXPLAIN_INITIAL(buf, sizeof(buf));
   else
     DBUG_EXPLAIN(buf, sizeof(buf));
-  (byte*) thd->strdup(buf);
+  return (byte*) thd->strdup(buf);
 }
 
 /****************************************************************************