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

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new


config/ac-macros/zlib.m4:
  Auto merged
include/my_sys.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
parents 55e9c051 69e1ccc8

mysql-test/t/rpl_temporary.test

+1 −1
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ drop table t1; 
#

#14157: utf8 encoding in binlog without set character_set_client

#

--exec $MYSQL --character-sets-dir=../sql/share/charsets/ --default-character-set=koi8r test -e 'create table t1 (a int); set names koi8r; create temporary table `ÑÝÉË` (a int); insert into `ÑÝÉË` values (1); insert into t1 select * from `ÑÝÉË`'

--exec $MYSQL --character-sets-dir=../sql/share/charsets/ --default-character-set=latin1 test -e 'create table t1 (a int); set names latin1; create temporary table `äöüÄÖÜ` (a int); insert into `äöüÄÖÜ` values (1); insert into t1 select * from `äöüÄÖÜ`'



sync_slave_with_master;

#connection slave;

sql/item.cc

+1 −1
Original line number Diff line number Diff line
@@ -5413,7 +5413,7 @@ bool Item_trigger_field::eq(const Item *item, bool binary_cmp) const 
}





void Item_trigger_field::set_required_privilege(const bool rw)

void Item_trigger_field::set_required_privilege(bool rw)

{

  /*

    Require SELECT and UPDATE privilege if this field will be read and

sql/item.h

+1 −1
Original line number Diff line number Diff line
@@ -2233,7 +2233,7 @@ class Item_trigger_field : public Item_field, 
  void cleanup();



private:

  void set_required_privilege(const bool rw);

  void set_required_privilege(bool rw);

  bool set_value(THD *thd, sp_rcontext *ctx, Item **it);



public:

sql/sql_acl.cc

+3 −2
Original line number Diff line number Diff line
@@ -6154,20 +6154,21 @@ void fill_effective_table_privileges(THD *thd, GRANT_INFO *grant, 
  }



  /* table privileges */

  rw_rdlock(&LOCK_grant);

  if (grant->version != grant_version)

  {

    rw_rdlock(&LOCK_grant);

    grant->grant_table=

      table_hash_search(sctx->host, sctx->ip, db,

			sctx->priv_user,

			table, 0);              /* purecov: inspected */

    grant->version= grant_version;              /* purecov: inspected */

    rw_unlock(&LOCK_grant);

  }

  if (grant->grant_table != 0)

  {

    grant->privilege|= grant->grant_table->privs;

  }

  rw_unlock(&LOCK_grant);



  DBUG_PRINT("info", ("privilege 0x%lx", grant->privilege));

  DBUG_VOID_RETURN;

}

storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp

+7 −2
Original line number Diff line number Diff line
@@ -1926,8 +1926,8 @@ int Dbtup::interpreterNextLab(Signal* signal, 
	    // word read. Thus we set the register to be a 32 bit register.

	    /* ------------------------------------------------------------- */

	    TregMemBuffer[theRegister]= 0x50;

            * (Int64*)(TregMemBuffer+theRegister+2)=

                                       TregMemBuffer[theRegister+1];

            // arithmetic conversion if big-endian

            * (Int64*)(TregMemBuffer+theRegister+2)= TregMemBuffer[theRegister+1];

	  } else if (TnoDataRW == 3) {

	    /* ------------------------------------------------------------- */

	    // Three words read means that we get the instruction plus two
@@ -1985,6 +1985,11 @@ int Dbtup::interpreterNextLab(Signal* signal, 
	  Tlen= TattrNoOfWords + 1;

	  if (Toptype == ZUPDATE) {

	    if (TattrNoOfWords <= 2) {

              if (TattrNoOfWords == 1) {

                // arithmetic conversion if big-endian

                TdataForUpdate[1] = *(Int64*)&TregMemBuffer[theRegister + 2];

                TdataForUpdate[2] = 0;

              }

	      if (TregType == 0) {

		/* --------------------------------------------------------- */

		// Write a NULL value into the attribute