Below is the list of changes that have just been committed into a local
5.1 repository of guilhem. When guilhem 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@stripped, 2007-03-22 16:00:47+01:00, guilhem@stripped +7 -0
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
MERGE: 1.1810.2373.153
mysql-test/t/rpl_misc_functions.test@stripped, 2007-03-22 15:58:46+01:00, guilhem@stripped +0 -0
Auto merged
MERGE: 1.5.1.2
sql/lock.cc@stripped, 2007-03-22 15:58:46+01:00, guilhem@stripped +0 -0
Auto merged
MERGE: 1.64.1.31
sql/mysqld.cc@stripped, 2007-03-22 15:58:47+01:00, guilhem@stripped +0 -0
Auto merged
MERGE: 1.439.1.158
sql/sql_base.cc@stripped, 2007-03-22 15:58:47+01:00, guilhem@stripped +0 -0
Auto merged
MERGE: 1.235.1.136
sql/sql_derived.cc@stripped, 2007-03-22 15:58:47+01:00, guilhem@stripped +0 -0
Auto merged
MERGE: 1.78.1.4
sql/sql_select.cc@stripped, 2007-03-22 15:59:27+01:00, guilhem@stripped +0 -1
will fix by hand
MERGE: 1.312.1.187
sql/table.h@stripped, 2007-03-22 16:00:44+01:00, guilhem@stripped +1 -3
merge from 5.0
MERGE: 1.102.1.38
# 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: guilhem
# Host: gbichot3.local
# Root: /home/mysql_src/mysql-5.1-rpl-26194/RESYNC
--- 1.104/sql/lock.cc 2007-03-22 16:01:00 +01:00
+++ 1.105/sql/lock.cc 2007-03-22 16:01:00 +01:00
@@ -582,7 +582,7 @@ TABLE_LIST *mysql_lock_have_duplicate(TH
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(TH
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 *th
*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 *th
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)
--- 1.619/sql/mysqld.cc 2007-03-22 16:01:00 +01:00
+++ 1.620/sql/mysqld.cc 2007-03-22 16:01:00 +01:00
@@ -6435,12 +6435,12 @@ The minimum value for this variable is 4
(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},
--- 1.385/sql/sql_base.cc 2007-03-22 16:01:00 +01:00
+++ 1.386/sql/sql_base.cc 2007-03-22 16:01:00 +01:00
@@ -3752,7 +3752,7 @@ TABLE *open_temporary_table(THD *thd, co
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)
{
--- 1.166/sql/table.h 2007-03-22 16:01:00 +01:00
+++ 1.167/sql/table.h 2007-03-22 16:01:00 +01:00
@@ -58,7 +58,7 @@ typedef struct st_grant_info
enum tmp_table_type
{
- NO_TMP_TABLE, TMP_TABLE, TRANSACTIONAL_TMP_TABLE,
+ NO_TMP_TABLE, NON_TRANSACTIONAL_TMP_TABLE, TRANSACTIONAL_TMP_TABLE,
INTERNAL_TMP_TABLE, SYSTEM_TMP_TABLE
};
--- 1.81/sql/sql_derived.cc 2007-03-22 16:01:00 +01:00
+++ 1.82/sql/sql_derived.cc 2007-03-22 16:01:00 +01:00
@@ -179,7 +179,7 @@ exit:
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;
--- 1.7/mysql-test/t/rpl_misc_functions.test 2007-03-22 16:01:00 +01:00
+++ 1.8/mysql-test/t/rpl_misc_functions.test 2007-03-22 16:01:00 +01:00
@@ -89,12 +89,14 @@ INSERT INTO t1 VALUES (test_replication_
--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
| Thread |
|---|
| • bk commit into 5.1 tree (guilhem:1.2478) | Guilhem Bichot | 22 Mar |
