Below is the list of changes that have just been committed into a local
5.1 repository of monty. When monty 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, 2006-11-01 19:46:23+02:00, monty@stripped +8 -0
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/my/mysql-5.1
MERGE: 1.2303.1.18
sql/Makefile.am@stripped, 2006-11-01 19:43:24+02:00, monty@stripped +0 -0
Auto merged
MERGE: 1.161.1.1
sql/ha_ndbcluster.cc@stripped, 2006-11-01 19:46:21+02:00, monty@stripped +1 -3
Manual merge
MERGE: 1.358.1.2
sql/handler.cc@stripped, 2006-11-01 19:43:24+02:00, monty@stripped +0 -0
Auto merged
MERGE: 1.273.1.1
sql/mysqld.cc@stripped, 2006-11-01 19:43:24+02:00, monty@stripped +0 -0
Auto merged
MERGE: 1.583.1.1
sql/sql_base.cc@stripped, 2006-11-01 19:43:25+02:00, monty@stripped +0 -0
Auto merged
MERGE: 1.356.1.4
sql/sql_select.cc@stripped, 2006-11-01 19:43:25+02:00, monty@stripped +0 -0
Auto merged
MERGE: 1.458.1.1
sql/sql_view.cc@stripped, 2006-11-01 19:43:25+02:00, monty@stripped +0 -0
Auto merged
MERGE: 1.110.1.1
sql/table.cc@stripped, 2006-11-01 19:43:25+02:00, monty@stripped +0 -0
Auto merged
MERGE: 1.246.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: monty
# Host: nosik.monty.fi
# Root: /home/my/mysql-5.1/RESYNC
--- 1.162/sql/Makefile.am 2006-11-01 19:46:29 +02:00
+++ 1.163/sql/Makefile.am 2006-11-01 19:46:29 +02:00
@@ -151,9 +151,12 @@
# things like different grammars for different pars of MySQL can
# happen if you are unlucky.
sql_yacc.cc: sql_yacc.yy
+
sql_yacc.h: sql_yacc.yy
sql_yacc.o: sql_yacc.cc sql_yacc.h $(HEADERS)
+ @SED@ -e 's/__attribute__ ((__unused__))//' sql_yacc.cc > sql_yacc.cc-new
+ @MV@ sql_yacc.cc-new sql_yacc.cc
@echo "Note: The following compile may take a long time."
@echo "If it fails, re-run configure with --with-low-memory"
$(CXXCOMPILE) $(LM_CFLAGS) -c $<
--- 1.279/sql/handler.cc 2006-11-01 19:46:29 +02:00
+++ 1.280/sql/handler.cc 2006-11-01 19:46:29 +02:00
@@ -2958,15 +2958,15 @@
static my_bool binlog_func_foreach(THD *thd, binlog_func_st *bfn)
{
- handlerton *hton;
hton_list_st hton_list;
+ uint i, sz;
+
hton_list.sz= 0;
plugin_foreach(thd, binlog_func_list,
MYSQL_STORAGE_ENGINE_PLUGIN, &hton_list);
- uint i= 0, sz= hton_list.sz;
- while(i < sz)
- hton_list.hton[i++]->binlog_func(hton, thd, bfn->fn, bfn->arg);
+ for (i= 0, sz= hton_list.sz; i < sz ; i++)
+ hton_list.hton[i]->binlog_func(hton_list.hton[i], thd, bfn->fn, bfn->arg);
return FALSE;
}
--- 1.584/sql/mysqld.cc 2006-11-01 19:46:29 +02:00
+++ 1.585/sql/mysqld.cc 2006-11-01 19:46:29 +02:00
@@ -1609,7 +1609,7 @@
if (strlen(mysqld_unix_port) > (sizeof(UNIXaddr.sun_path) - 1))
{
- sql_print_error("The socket file path is too long (> %lu): %s",
+ sql_print_error("The socket file path is too long (> %u): %s",
sizeof(UNIXaddr.sun_path) - 1, mysqld_unix_port);
unireg_abort(1);
}
@@ -3506,7 +3506,7 @@
{
if (global_system_variables.log_warnings)
sql_print_warning("Asked for %ld thread stack, but got %ld",
- thread_stack, stack_size);
+ thread_stack, (long) stack_size);
#if defined(__ia64__) || defined(__ia64)
thread_stack= stack_size*2;
#else
@@ -5315,7 +5315,7 @@
(gptr*) &locked_in_memory, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
{"merge", OPT_MERGE, "Enable Merge storage engine. Disable with \
--skip-merge.",
- (gptr*) &opt_merge, (gptr*) &opt_merge, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0},
+ (gptr*) &opt_merge, (gptr*) &opt_merge, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},
{"myisam-recover", OPT_MYISAM_RECOVER,
"Syntax: myisam-recover[=option[,option...]], where option can be DEFAULT, BACKUP, FORCE or QUICK.",
(gptr*) &myisam_recover_options_str, (gptr*) &myisam_recover_options_str, 0,
--- 1.358/sql/sql_base.cc 2006-11-01 19:46:29 +02:00
+++ 1.359/sql/sql_base.cc 2006-11-01 19:46:29 +02:00
@@ -6558,6 +6558,8 @@
has_two_write_locked_tables_with_auto_increment(TABLE_LIST *tables)
{
char *first_table_name= NULL, *first_db;
+ LINT_INIT(first_db);
+
for (TABLE_LIST *table= tables; table; table= table->next_global)
{
/* we must do preliminary checks as table->table may be NULL */
--- 1.459/sql/sql_select.cc 2006-11-01 19:46:29 +02:00
+++ 1.460/sql/sql_select.cc 2006-11-01 19:46:29 +02:00
@@ -3605,7 +3605,7 @@
double best= DBL_MAX;
double best_time= DBL_MAX;
double records= DBL_MAX;
- table_map best_ref_depends_map;
+ table_map best_ref_depends_map= 0;
double tmp;
ha_rows rec;
@@ -10106,7 +10106,8 @@
enum_nested_loop_state error= NESTED_LOOP_OK;
JOIN_TAB *join_tab;
DBUG_ENTER("do_select");
-
+ LINT_INIT(join_tab);
+
join->procedure=procedure;
join->tmp_table= table; /* Save for easy recursion */
join->fields= fields;
@@ -10136,9 +10137,9 @@
*/
if (!join->conds || join->conds->val_int())
{
- error= (*end_select)(join,join_tab,0);
+ error= (*end_select)(join, 0, 0);
if (error == NESTED_LOOP_OK || error == NESTED_LOOP_QUERY_LIMIT)
- error= (*end_select)(join,join_tab,1);
+ error= (*end_select)(join, 0, 1);
}
else if (join->send_row_on_empty_set())
{
@@ -10694,7 +10695,7 @@
*/
if (error != HA_ERR_LOCK_DEADLOCK && error != HA_ERR_LOCK_WAIT_TIMEOUT)
sql_print_error("Got error %d when reading table '%s'",
- error, table->s->path);
+ error, table->s->path.str);
table->file->print_error(error,MYF(0));
return 1;
}
--- 1.247/sql/table.cc 2006-11-01 19:46:29 +02:00
+++ 1.248/sql/table.cc 2006-11-01 19:46:29 +02:00
@@ -480,7 +480,7 @@
sql_print_warning("'%s' had no or invalid character set, "
"and default character set is multi-byte, "
"so character column sizes may have changed",
- share->path);
+ share->path.str);
}
share->table_charset= default_charset_info;
}
--- 1.111/sql/sql_view.cc 2006-11-01 19:46:29 +02:00
+++ 1.112/sql/sql_view.cc 2006-11-01 19:46:29 +02:00
@@ -1073,6 +1073,8 @@
bool view_is_mergeable= (table->algorithm != VIEW_ALGORITHM_TMPTABLE &&
lex->can_be_merged());
TABLE_LIST *view_main_select_tables;
+ LINT_INIT(view_main_select_tables);
+
if (view_is_mergeable)
{
/*
--- 1.367/sql/ha_ndbcluster.cc 2006-11-01 19:46:29 +02:00
+++ 1.368/sql/ha_ndbcluster.cc 2006-11-01 19:46:29 +02:00
@@ -6511,7 +6511,7 @@
}
{
char buf[128];
- my_snprintf(buf, sizeof(buf), "mysqld --server-id=%d", server_id);
+ my_snprintf(buf, sizeof(buf), "mysqld --server-id=%lu", server_id);
g_ndb_cluster_connection->set_name(buf);
}
g_ndb_cluster_connection->set_optimized_node_selection
@@ -7268,7 +7268,7 @@
share->key_length= min_key_length;
}
share->key_length=
- my_snprintf(share->key, min_key_length + 1, "#leak%d",
+ my_snprintf(share->key, min_key_length + 1, "#leak%lu",
trailing_share_id++);
}
/* Keep it for possible the future trailing free */
@@ -9805,12 +9805,12 @@
update_status_variables(g_ndb_cluster_connection);
buflen=
my_snprintf(buf, sizeof(buf),
- "cluster_node_id=%u, "
+ "cluster_node_id=%ld, "
"connected_host=%s, "
- "connected_port=%u, "
- "number_of_data_nodes=%u, "
- "number_of_ready_data_nodes=%u, "
- "connect_count=%u",
+ "connected_port=%ld, "
+ "number_of_data_nodes=%ld, "
+ "number_of_ready_data_nodes=%ld, "
+ "connect_count=%ld",
ndb_cluster_node_id,
ndb_connected_host,
ndb_connected_port,
@@ -10696,7 +10696,8 @@
table->field[IS_FILES_VERSION]->store(uf.getObjectVersion());
char extra[100];
- int len= my_snprintf(extra,sizeof(extra),"CLUSTER_NODE=%u;UNDO_BUFFER_SIZE=%lu",id,lfg.getUndoBufferSize());
+ int len= my_snprintf(extra,sizeof(extra),"CLUSTER_NODE=%u;UNDO_BUFFER_SIZE=%lu",
+ id, (ulong) lfg.getUndoBufferSize());
table->field[IS_FILES_EXTRA]->set_notnull();
table->field[IS_FILES_EXTRA]->store(extra, len, system_charset_info);
schema_table_store_record(thd, table);
@@ -10713,7 +10714,6 @@
for (i= 0; i < lfglist.count; i++)
{
NdbDictionary::Dictionary::List::Element& elt= lfglist.elements[i];
- unsigned id;
NdbDictionary::LogfileGroup lfg= dict->getLogfileGroup(elt.name);
ndberr= dict->getNdbError();
@@ -10751,7 +10751,7 @@
char extra[100];
int len= my_snprintf(extra,sizeof(extra),
"UNDO_BUFFER_SIZE=%lu",
- lfg.getUndoBufferSize());
+ (ulong) lfg.getUndoBufferSize());
table->field[IS_FILES_EXTRA]->set_notnull();
table->field[IS_FILES_EXTRA]->store(extra, len, system_charset_info);
schema_table_store_record(thd, table);
| Thread |
|---|
| • bk commit into 5.1 tree (monty:1.2335) | monty | 1 Nov |
