Below is the list of changes that have just been committed into a local
5.1 repository of marcsql. When marcsql 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-04-25 15:39:40-06:00, malff@weblab.(none) +18 -0
Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-runtime
into weblab.(none):/home/marcsql/TREE/mysql-5.1-25411_merge
MERGE: 1.1810.2374.116
mysql-test/r/sp.result@stripped, 2007-04-25 15:37:28-06:00, malff@weblab.(none) +0 -0
Auto merged
MERGE: 1.170.28.12
mysql-test/t/sp.test@stripped, 2007-04-25 15:37:28-06:00, malff@weblab.(none) +0 -0
Auto merged
MERGE: 1.174.28.11
sql/item_func.cc@stripped, 2007-04-25 15:37:28-06:00, malff@weblab.(none) +0 -0
Auto merged
MERGE: 1.270.1.64
sql/log_event.cc@stripped, 2007-04-25 15:37:29-06:00, malff@weblab.(none) +0 -0
Auto merged
MERGE: 1.174.1.58
sql/mysql_priv.h@stripped, 2007-04-25 15:39:14-06:00, malff@weblab.(none) +1 -4
MERGE: 1.290.1.156
sql/slave.cc@stripped, 2007-04-25 15:39:17-06:00, malff@weblab.(none) +1 -2
MERGE: 1.241.1.58
sql/sp.cc@stripped, 2007-04-25 15:39:18-06:00, malff@weblab.(none) +1 -7
MERGE: 1.82.1.48
sql/sp_head.cc@stripped, 2007-04-25 15:39:19-06:00, malff@weblab.(none) +21 -8
MERGE: 1.200.7.19
sql/sp_head.h@stripped, 2007-04-25 15:39:23-06:00, malff@weblab.(none) +0 -4
MERGE: 1.79.1.18
sql/sql_class.cc@stripped, 2007-04-25 15:39:25-06:00, malff@weblab.(none) +0 -1
MERGE: 1.223.1.47
sql/sql_class.h@stripped, 2007-04-25 15:39:26-06:00, malff@weblab.(none) +0 -10
MERGE: 1.230.1.99
sql/sql_lex.cc@stripped, 2007-04-25 15:39:27-06:00, malff@weblab.(none) +125 -160
MERGE: 1.142.1.78
sql/sql_lex.h@stripped, 2007-04-25 15:39:29-06:00, malff@weblab.(none) +15 -58
MERGE: 1.175.1.69
sql/sql_parse.cc@stripped, 2007-04-25 15:39:30-06:00, malff@weblab.(none) +30 -70
MERGE: 1.426.1.193
sql/sql_prepare.cc@stripped, 2007-04-25 15:39:31-06:00, malff@weblab.(none) +1 -6
MERGE: 1.142.1.57
sql/sql_trigger.cc@stripped, 2007-04-25 15:39:33-06:00, malff@weblab.(none) +1 -6
MERGE: 1.35.1.31
sql/sql_view.cc@stripped, 2007-04-25 15:39:34-06:00, malff@weblab.(none) +3 -9
MERGE: 1.78.1.32
sql/sql_yacc.yy@stripped, 2007-04-25 15:39:35-06:00, malff@weblab.(none) +59 -108
MERGE: 1.371.1.144
# 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: malff
# Host: weblab.(none)
# Root: /home/marcsql/TREE/mysql-5.1-25411_merge/RESYNC
--- 1.379/sql/item_func.cc 2007-04-25 15:39:49 -06:00
+++ 1.380/sql/item_func.cc 2007-04-25 15:39:49 -06:00
@@ -4266,7 +4266,7 @@ int get_var_with_binlog(THD *thd, enum_s
List<set_var_base> tmp_var_list;
LEX *sav_lex= thd->lex, lex_tmp;
thd->lex= &lex_tmp;
- lex_start(thd, NULL, 0);
+ lex_start(thd);
tmp_var_list.push_back(new set_var_user(new Item_func_set_user_var(name,
new Item_null())));
/* Create the variable */
--- 1.276/sql/log_event.cc 2007-04-25 15:39:49 -06:00
+++ 1.277/sql/log_event.cc 2007-04-25 15:39:49 -06:00
@@ -2053,7 +2053,8 @@ int Query_log_event::do_apply_event(RELA
thd->variables.collation_database= thd->db_charset;
/* Execute the query (note that we bypass dispatch_command()) */
- mysql_parse(thd, thd->query, thd->query_length);
+ const char* found_semicolon= NULL;
+ mysql_parse(thd, thd->query, thd->query_length, &found_semicolon);
}
else
@@ -3224,10 +3225,12 @@ int Load_log_event::do_apply_event(NET*
/* see Query_log_event::do_apply_event() and BUG#13360 */
DBUG_ASSERT(!rli->m_table_map.count());
/*
- Usually mysql_init_query() is called by mysql_parse(), but we need it here
+ Usually lex_start() is called by mysql_parse(), but we need it here
as the present method does not call mysql_parse().
*/
- mysql_init_query(thd, 0, 0);
+ lex_start(thd);
+ mysql_reset_thd_for_next_command(thd);
+
if (!use_rli_only_for_errors)
{
/*
| Thread |
|---|
| • bk commit into 5.1 tree (malff:1.2575) | marc.alff | 25 Apr |
