Commit c4e4bc32 authored by unknown's avatar unknown
Browse files

Merge gbichot3.local:/home/mysql_src/mysql-5.0-rpl 

into  gbichot3.local:/home/mysql_src/mysql-5.1-rpl-26194
will fix by hand


mysql-test/t/rpl_misc_functions.test:
  Auto merged
sql/lock.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_derived.cc:
  Auto merged
sql/sql_select.cc:
  will fix by hand
sql/table.h:
  merge from 5.0
parents 89bfca83 685d21b7

mysql-test/t/rpl_misc_functions.test

+2 −0
Original line number Diff line number Diff line
@@ -89,12 +89,14 @@ INSERT INTO t1 VALUES (test_replication_sf()); 
--exec diff $MYSQLTEST_VARDIR/tmp/rpl_rand_master.sql $MYSQLTEST_VARDIR/tmp/rpl_rand_slave.sql



# Cleanup

connection master;

--disable_warnings

DROP PROCEDURE IF EXISTS test_replication_sp1;

DROP PROCEDURE IF EXISTS test_replication_sp2;

DROP FUNCTION IF EXISTS test_replication_sf;

DROP TABLE IF EXISTS t1;

--enable_warnings

--sync_slave_with_master



# If all is good, when can cleanup our dump files.

--system rm $MYSQLTEST_VARDIR/tmp/rpl_rand_master.sql

sql/lock.cc

+4 −4
Original line number Diff line number Diff line
@@ -582,7 +582,7 @@ TABLE_LIST *mysql_lock_have_duplicate(THD *thd, TABLE_LIST *needle, 
    goto end;



  /* A temporary table does not have locks. */

  if (table->s->tmp_table == TMP_TABLE)

  if (table->s->tmp_table == NON_TRANSACTIONAL_TMP_TABLE)

    goto end;



  /* Get command lock or LOCK TABLES lock. Maybe empty for INSERT DELAYED. */
@@ -607,7 +607,7 @@ TABLE_LIST *mysql_lock_have_duplicate(THD *thd, TABLE_LIST *needle, 
    if (haystack->placeholder())

      continue;

    table2= haystack->table;

    if (table2->s->tmp_table == TMP_TABLE)

    if (table2->s->tmp_table == NON_TRANSACTIONAL_TMP_TABLE)

      continue;



    /* All tables in list must be in lock. */
@@ -694,7 +694,7 @@ static MYSQL_LOCK *get_lock_data(THD *thd, TABLE **table_ptr, uint count, 
  *write_lock_used=0;

  for (i=tables=lock_count=0 ; i < count ; i++)

  {

    if (table_ptr[i]->s->tmp_table != TMP_TABLE)

    if (table_ptr[i]->s->tmp_table != NON_TRANSACTIONAL_TMP_TABLE)

    {

      tables+=table_ptr[i]->file->lock_count();

      lock_count++;
@@ -736,7 +736,7 @@ static MYSQL_LOCK *get_lock_data(THD *thd, TABLE **table_ptr, uint count, 
    TABLE *table;

    enum thr_lock_type lock_type;



    if ((table=table_ptr[i])->s->tmp_table == TMP_TABLE)

    if ((table=table_ptr[i])->s->tmp_table == NON_TRANSACTIONAL_TMP_TABLE)

      continue;

    lock_type= table->reginfo.lock_type;

    if (lock_type >= TL_WRITE_ALLOW_WRITE)

sql/mysqld.cc

+2 −2
Original line number Diff line number Diff line
@@ -6435,12 +6435,12 @@ The minimum value for this variable is 4096.", 
   (gptr*) &max_system_variables.tmp_table_size, 0, GET_ULL,

   REQUIRED_ARG, 16*1024*1024L, 1024, MAX_MEM_TABLE_SIZE, 0, 1, 0},

  {"transaction_alloc_block_size", OPT_TRANS_ALLOC_BLOCK_SIZE,

   "Allocation block size for transactions to be stored in binary log",

   "Allocation block size for various transaction-related structures",

   (gptr*) &global_system_variables.trans_alloc_block_size,

   (gptr*) &max_system_variables.trans_alloc_block_size, 0, GET_ULONG,

   REQUIRED_ARG, QUERY_ALLOC_BLOCK_SIZE, 1024, ~0L, 0, 1024, 0},

  {"transaction_prealloc_size", OPT_TRANS_PREALLOC_SIZE,

   "Persistent buffer for transactions to be stored in binary log",

   "Persistent buffer for various transaction-related structures",

   (gptr*) &global_system_variables.trans_prealloc_size,

   (gptr*) &max_system_variables.trans_prealloc_size, 0, GET_ULONG,

   REQUIRED_ARG, TRANS_ALLOC_PREALLOC_SIZE, 1024, ~0L, 0, 1024, 0},

sql/sql_base.cc

+1 −1
Original line number Diff line number Diff line
@@ -3752,7 +3752,7 @@ TABLE *open_temporary_table(THD *thd, const char *path, const char *db, 


  tmp_table->reginfo.lock_type= TL_WRITE;	 // Simulate locked

  share->tmp_table= (tmp_table->file->has_transactions() ? 

                     TRANSACTIONAL_TMP_TABLE : TMP_TABLE);

                     TRANSACTIONAL_TMP_TABLE : NON_TRANSACTIONAL_TMP_TABLE);



  if (link_in_list)

  {

sql/sql_derived.cc

+1 −1
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ bool mysql_derived_prepare(THD *thd, LEX *lex, TABLE_LIST *orig_table_list) 
      orig_table_list->table_name=        table->s->table_name.str;

      orig_table_list->table_name_length= table->s->table_name.length;

      table->derived_select_number= first_select->select_number;

      table->s->tmp_table= TMP_TABLE;

      table->s->tmp_table= NON_TRANSACTIONAL_TMP_TABLE;

#ifndef NO_EMBEDDED_ACCESS_CHECKS

      if (orig_table_list->referencing_view)

        table->grant= orig_table_list->grant;