Commit 42904cdf authored by unknown's avatar unknown
Browse files

Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl 

into  romeo.(none):/home/bk/b18581-mysql-5.1-new-rpl


sql/log_event.cc:
  Auto merged
sql/rpl_rli.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
parents ae00d51b 66a04036

mysql-test/r/rpl_do_grant.result

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ password<>_binary'' 
delete from mysql.user where user=_binary'rpl_do_grant';

delete from mysql.db where user=_binary'rpl_do_grant';

flush privileges;

delete from mysql.user where user=_binary'rpl_do_grant';

delete from mysql.db where user=_binary'rpl_do_grant';

flush privileges;

show grants for rpl_do_grant@localhost;

ERROR 42000: There is no such grant defined for user 'rpl_do_grant' on host 'localhost'

mysql-test/t/rpl_do_grant.test

+5 −5
Original line number Diff line number Diff line
@@ -39,11 +39,11 @@ connection master; 
delete from mysql.user where user=_binary'rpl_do_grant';

delete from mysql.db where user=_binary'rpl_do_grant';

flush privileges;

save_master_pos;

connection slave;

sync_with_master;

# no need to delete manually, as the DELETEs must have done some real job on

# master (updated binlog)

sync_slave_with_master;

# The mysql database is not replicated, so we have to do the deletes

# manually on the slave as well. 

delete from mysql.user where user=_binary'rpl_do_grant';

delete from mysql.db where user=_binary'rpl_do_grant';

flush privileges;



# End of 4.1 tests

sql/handler.cc

+6 −29
Original line number Diff line number Diff line
@@ -3456,38 +3456,15 @@ bool ha_show_status(THD *thd, handlerton *db_type, enum ha_stat_type stat) 
   declared static, but it works by putting it into an anonymous

   namespace. */

namespace {

  struct st_table_data {

    char const *db;

    char const *name;

  };



  static int table_name_compare(void const *a, void const *b)

  {

    st_table_data const *x = (st_table_data const*) a;

    st_table_data const *y = (st_table_data const*) b;



    /* Doing lexical compare in order (db,name) */

    int const res= strcmp(x->db, y->db);

    return res != 0 ? res : strcmp(x->name, y->name);

  }



  bool check_table_binlog_row_based(THD *thd, TABLE *table)

  {

    static st_table_data const ignore[] = {

      { "mysql", "event" },

      { "mysql", "general_log" },

      { "mysql", "slow_log" }

    };



    my_size_t const ignore_size = sizeof(ignore)/sizeof(*ignore);

    st_table_data const item = { table->s->db.str, table->s->table_name.str };



    if (table->s->cached_row_logging_check == -1)

      table->s->cached_row_logging_check=

        (table->s->tmp_table == NO_TMP_TABLE) &&

    {

      int const check(table->s->tmp_table == NO_TMP_TABLE &&

                      binlog_filter->db_ok(table->s->db.str) &&

        bsearch(&item, ignore, ignore_size,

                sizeof(st_table_data), table_name_compare) == NULL;

                      strcmp("mysql", table->s->db.str) != 0);

      table->s->cached_row_logging_check= check;

    }



    DBUG_ASSERT(table->s->cached_row_logging_check == 0 ||

                table->s->cached_row_logging_check == 1);

sql/log_event.cc

+0 −1
Original line number Diff line number Diff line
@@ -5694,7 +5694,6 @@ int Rows_log_event::exec_event(st_relay_log_info *rli) 
    for (ptr= rli->tables_to_lock ; ptr ; ptr= ptr->next_global)

    {

      rli->m_table_map.set_table(ptr->table_id, ptr->table);

      rli->touching_table(ptr->db, ptr->table_name, ptr->table_id);

    }

#ifdef HAVE_QUERY_CACHE

    query_cache.invalidate_locked_for_write(rli->tables_to_lock);

sql/rpl_rli.h

+0 −16
Original line number Diff line number Diff line
@@ -293,22 +293,6 @@ typedef struct st_relay_log_info 
  void cached_charset_invalidate();

  bool cached_charset_compare(char *charset);



  /*

    To reload special tables when they are changes, we introduce a set

    of functions that will mark whenever special functions need to be

    called after modifying tables.  Right now, the tables are either

    ACL tables or grants tables.

  */

  enum enum_reload_flag

  {

    RELOAD_NONE_F   = 0UL,

    RELOAD_GRANT_F  = (1UL << 0), 

    RELOAD_ACCESS_F = (1UL << 1)

  };



  ulong m_reload_flags;



  void touching_table(char const* db, char const* table, ulong table_id);

  void transaction_end(THD*);



  void cleanup_context(THD *, bool);