Below is the list of changes that have just been committed into a local
5.1 repository of lthalmann. When lthalmann 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-31 12:38:20+02:00, lars@stripped +7 -0
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
MERGE: 1.2538.1.3
sql/field.h@stripped, 2007-03-31 12:38:12+02:00, lars@stripped +0 -0
Auto merged
MERGE: 1.216.1.1
sql/mysqld.cc@stripped, 2007-03-31 12:38:12+02:00, lars@stripped +0 -0
Auto merged
MERGE: 1.622.1.7
sql/sql_base.cc@stripped, 2007-03-31 12:38:12+02:00, lars@stripped +0 -0
Auto merged
MERGE: 1.390.1.3
sql/sql_class.h@stripped, 2007-03-31 12:38:12+02:00, lars@stripped +0 -0
Auto merged
MERGE: 1.349.1.1
sql/sql_select.cc@stripped, 2007-03-31 12:38:13+02:00, lars@stripped +0 -0
Auto merged
MERGE: 1.502.1.3
sql/sql_yacc.yy@stripped, 2007-03-31 12:38:13+02:00, lars@stripped +0 -0
Auto merged
MERGE: 1.556.1.2
sql/table.h@stripped, 2007-03-31 12:38:13+02:00, lars@stripped +0 -0
Auto merged
MERGE: 1.163.1.1
# 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: lars
# Host: dl145h.mysql.com
# Root: /nfsdisk1/lars/MERGE/mysql-5.1-merge/RESYNC
--- 1.217/sql/field.h 2007-03-31 12:38:29 +02:00
+++ 1.218/sql/field.h 2007-03-31 12:38:29 +02:00
@@ -193,9 +193,9 @@ public:
*/
virtual void sql_type(String &str) const =0;
virtual uint size_of() const =0; // For new field
- inline bool is_null(uint row_offset=0)
+ inline bool is_null(my_ptrdiff_t row_offset= 0)
{ return null_ptr ? (null_ptr[row_offset] & null_bit ? 1 : 0) : table->null_row; }
- inline bool is_real_null(uint row_offset=0)
+ inline bool is_real_null(my_ptrdiff_t row_offset= 0)
{ return null_ptr ? (null_ptr[row_offset] & null_bit ? 1 : 0) : 0; }
inline bool is_null_in_record(const uchar *record)
{
@@ -210,9 +210,9 @@ public:
return 0;
return test(null_ptr[offset] & null_bit);
}
- inline void set_null(int row_offset=0)
+ inline void set_null(my_ptrdiff_t row_offset= 0)
{ if (null_ptr) null_ptr[row_offset]|= null_bit; }
- inline void set_notnull(int row_offset=0)
+ inline void set_notnull(my_ptrdiff_t row_offset= 0)
{ if (null_ptr) null_ptr[row_offset]&= (uchar) ~null_bit; }
inline bool maybe_null(void) { return null_ptr != 0 || table->maybe_null; }
inline bool real_maybe_null(void) { return null_ptr != 0; }
--- 1.624/sql/mysqld.cc 2007-03-31 12:38:29 +02:00
+++ 1.625/sql/mysqld.cc 2007-03-31 12:38:29 +02:00
@@ -6454,12 +6454,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.394/sql/sql_base.cc 2007-03-31 12:38:29 +02:00
+++ 1.395/sql/sql_base.cc 2007-03-31 12:38:29 +02:00
@@ -1394,10 +1394,10 @@ void close_temporary_tables(THD *thd)
due to special characters in the names
*/
append_identifier(thd, &s_query, table->s->db.str, strlen(table->s->db.str));
- s_query.q_append('.');
+ s_query.append('.');
append_identifier(thd, &s_query, table->s->table_name.str,
strlen(table->s->table_name.str));
- s_query.q_append(',');
+ s_query.append(',');
next= table->next;
close_temporary(table, 1, 1);
}
@@ -3815,7 +3815,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.350/sql/sql_class.h 2007-03-31 12:38:29 +02:00
+++ 1.351/sql/sql_class.h 2007-03-31 12:38:29 +02:00
@@ -1270,7 +1270,7 @@ public:
return first_successful_insert_id_in_prev_stmt;
}
/*
- Used by Intvar_log_event::exec_event() and by "SET INSERT_ID=#"
+ Used by Intvar_log_event::do_apply_event() and by "SET INSERT_ID=#"
(mysqlbinlog). We'll soon add a variant which can take many intervals in
argument.
*/
--- 1.557/sql/sql_yacc.yy 2007-03-31 12:38:29 +02:00
+++ 1.558/sql/sql_yacc.yy 2007-03-31 12:38:29 +02:00
@@ -948,6 +948,7 @@ bool my_yyoverflow(short **a, YYSTYPE **
%token SIGNED_SYM
%token SIMPLE_SYM /* SQL-2003-N */
%token SLAVE
+%token SLAVESIDE_DISABLE_SYM
%token SMALLINT /* SQL-2003-R */
%token SNAPSHOT_SYM
%token SOCKET_SYM
@@ -1770,12 +1771,17 @@ ev_schedule_time: EVERY_SYM expr interva
opt_ev_status: /* empty */ { $$= 0; }
| ENABLE_SYM
{
- Lex->event_parse_data->status= Event_parse_data::ENABLED;
+ Lex->event_parse_data->status= Event_basic::ENABLED;
+ $$= 1;
+ }
+ | DISABLE_SYM ON SLAVE
+ {
+ Lex->event_parse_data->status= Event_basic::SLAVESIDE_DISABLED;
$$= 1;
}
| DISABLE_SYM
{
- Lex->event_parse_data->status= Event_parse_data::DISABLED;
+ Lex->event_parse_data->status= Event_basic::DISABLED;
$$= 1;
}
;
@@ -1805,13 +1811,13 @@ ev_on_completion:
ON COMPLETION_SYM PRESERVE_SYM
{
Lex->event_parse_data->on_completion=
- Event_parse_data::ON_COMPLETION_PRESERVE;
+ Event_basic::ON_COMPLETION_PRESERVE;
$$= 1;
}
| ON COMPLETION_SYM NOT_SYM PRESERVE_SYM
{
Lex->event_parse_data->on_completion=
- Event_parse_data::ON_COMPLETION_DROP;
+ Event_basic::ON_COMPLETION_DROP;
$$= 1;
}
;
@@ -9998,6 +10004,7 @@ keyword_sp:
| SIMPLE_SYM {}
| SHARE_SYM {}
| SHUTDOWN {}
+ | SLAVESIDE_DISABLE_SYM {}
| SNAPSHOT_SYM {}
| SOUNDS_SYM {}
| SQL_CACHE_SYM {}
--- 1.164/sql/table.h 2007-03-31 12:38:29 +02:00
+++ 1.165/sql/table.h 2007-03-31 12:38:29 +02:00
@@ -439,6 +439,11 @@ struct st_table {
my_bool no_cache;
/* To signal that we should reset query_id for tables and cols */
my_bool clear_query_id;
+ /*
+ To indicate that a non-null value of the auto_increment field
+ was provided by the user or retrieved from the current record.
+ Used only in the MODE_NO_AUTO_VALUE_ON_ZERO mode.
+ */
my_bool auto_increment_field_not_null;
my_bool insert_or_update; /* Can be used by the handler */
my_bool alias_name_used; /* true if table_name is alias */
| Thread |
|---|
| • bk commit into 5.1 tree (lars:1.2543) | Lars Thalmann | 31 Mar |
