Commit 0b48fb08 authored by unknown's avatar unknown
Browse files

Additional patch for 5.1 commit for Bug#14262. 


sql/sp.cc:
  Update binlog-writing scheme to 5.1 model.
sql/sql_acl.cc:
  Update binlog-writing scheme to 5.1 model.
sql/sql_trigger.cc:
  Update binlog-writing scheme to 5.1 model.
parent 21e525c5

sql/sp.cc

+4 −4
Original line number Diff line number Diff line
@@ -659,8 +659,8 @@ db_drop_routine(THD *thd, int type, sp_name *name) 
    if (mysql_bin_log.is_open())

    {

      thd->clear_error();

      Query_log_event qinfo(thd, thd->query, thd->query_length, 0, FALSE);

      mysql_bin_log.write(&qinfo);

      thd->binlog_query(THD::MYSQL_QUERY_TYPE,

                        thd->query, thd->query_length, FALSE, FALSE);

    }

  }
@@ -704,8 +704,8 @@ db_update_routine(THD *thd, int type, sp_name *name, st_sp_chistics *chistics) 
    if (mysql_bin_log.is_open())

    {

      thd->clear_error();

      Query_log_event qinfo(thd, thd->query, thd->query_length, 0, FALSE);

      mysql_bin_log.write(&qinfo);

      thd->binlog_query(THD::MYSQL_QUERY_TYPE,

                        thd->query, thd->query_length, FALSE, FALSE);

    }

  }

sql/sql_acl.cc

+14 −14
Original line number Diff line number Diff line
@@ -3146,8 +3146,8 @@ bool mysql_table_grant(THD *thd, TABLE_LIST *table_list, 
    if (mysql_bin_log.is_open())

    {

      thd->clear_error();

      Query_log_event qinfo(thd, thd->query, thd->query_length, 0, FALSE);

      mysql_bin_log.write(&qinfo);

      thd->binlog_query(THD::MYSQL_QUERY_TYPE,

                        thd->query, thd->query_length, FALSE, FALSE);

    }

  }
@@ -3312,8 +3312,8 @@ bool mysql_routine_grant(THD *thd, TABLE_LIST *table_list, bool is_proc, 
    if (mysql_bin_log.is_open())

    {

      thd->clear_error();

      Query_log_event qinfo(thd, thd->query, thd->query_length, 0, FALSE);

      mysql_bin_log.write(&qinfo);

      thd->binlog_query(THD::MYSQL_QUERY_TYPE,

                        thd->query, thd->query_length, FALSE, FALSE);

    }

  }
@@ -3425,8 +3425,8 @@ bool mysql_grant(THD *thd, const char *db, List <LEX_USER> &list, 
    if (mysql_bin_log.is_open())

    {

      thd->clear_error();

      Query_log_event qinfo(thd, thd->query, thd->query_length, 0, FALSE);

      mysql_bin_log.write(&qinfo);

      thd->binlog_query(THD::MYSQL_QUERY_TYPE,

                        thd->query, thd->query_length, FALSE, FALSE);

    }

  }
@@ -5438,8 +5438,8 @@ bool mysql_create_user(THD *thd, List <LEX_USER> &list) 


  if (mysql_bin_log.is_open())

  {

    Query_log_event qinfo(thd, thd->query, thd->query_length, 0, FALSE);

    mysql_bin_log.write(&qinfo);

    thd->binlog_query(THD::MYSQL_QUERY_TYPE,

                      thd->query, thd->query_length, FALSE, FALSE);

  }



  rw_unlock(&LOCK_grant);
@@ -5501,8 +5501,8 @@ bool mysql_drop_user(THD *thd, List <LEX_USER> &list) 


  if (mysql_bin_log.is_open())

  {

    Query_log_event qinfo(thd, thd->query, thd->query_length, 0, FALSE);

    mysql_bin_log.write(&qinfo);

    thd->binlog_query(THD::MYSQL_QUERY_TYPE,

                      thd->query, thd->query_length, FALSE, FALSE);

  }



  rw_unlock(&LOCK_grant);
@@ -5577,8 +5577,8 @@ bool mysql_rename_user(THD *thd, List <LEX_USER> &list) 


  if (mysql_bin_log.is_open())

  {

    Query_log_event qinfo(thd, thd->query, thd->query_length, 0, FALSE);

    mysql_bin_log.write(&qinfo);

    thd->binlog_query(THD::MYSQL_QUERY_TYPE,

                      thd->query, thd->query_length, FALSE, FALSE);

  }



  rw_unlock(&LOCK_grant);
@@ -5758,8 +5758,8 @@ bool mysql_revoke_all(THD *thd, List <LEX_USER> &list) 


  if (mysql_bin_log.is_open())

  {

    Query_log_event qinfo(thd, thd->query, thd->query_length, 0, FALSE);

    mysql_bin_log.write(&qinfo);

    thd->binlog_query(THD::MYSQL_QUERY_TYPE,

                      thd->query, thd->query_length, FALSE, FALSE);

  }



  rw_unlock(&LOCK_grant);

sql/sql_trigger.cc

+2 −3
Original line number Diff line number Diff line
@@ -284,9 +284,8 @@ bool mysql_create_or_drop_trigger(THD *thd, TABLE_LIST *tables, bool create) 
      thd->clear_error();



      /* Such a statement can always go directly to binlog, no trans cache. */

      Query_log_event qinfo(thd, stmt_query.ptr(), stmt_query.length(), 0,

                            FALSE);

      mysql_bin_log.write(&qinfo);

      thd->binlog_query(THD::MYSQL_QUERY_TYPE,

                        stmt_query.ptr(), stmt_query.length(), FALSE, FALSE);

    }

  }