Below is the list of changes that have just been committed into a local
4.1 repository of jimw. When jimw 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-08-31 18:19:16-07:00, jimw@rama.(none) +6 -0
Merge bk-internal:/home/bk/mysql-4.1
into rama.(none):/home/jimw/my/mysql-4.1-clean
MERGE: 1.2527.7.3
sql/item_subselect.cc@stripped, 2006-08-31 18:19:14-07:00, jimw@rama.(none) +0 -0
Auto merged
MERGE: 1.142.1.1
sql/item_timefunc.cc@stripped, 2006-08-31 18:19:14-07:00, jimw@rama.(none) +0 -0
Auto merged
MERGE: 1.105.1.1
sql/mysqld.cc@stripped, 2006-08-31 18:19:14-07:00, jimw@rama.(none) +0 -0
Auto merged
MERGE: 1.615.1.1
sql/set_var.cc@stripped, 2006-08-31 18:19:14-07:00, jimw@rama.(none) +0 -0
Auto merged
MERGE: 1.185.1.1
sql/slave.cc@stripped, 2006-08-31 18:19:14-07:00, jimw@rama.(none) +0 -0
Auto merged
MERGE: 1.279.1.1
sql/sql_acl.cc@stripped, 2006-08-31 18:19:14-07:00, jimw@rama.(none) +0 -0
Auto merged
MERGE: 1.176.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: jimw
# Host: rama.(none)
# Root: /home/jimw/my/mysql-4.1-clean/RESYNC
--- 1.106/sql/item_timefunc.cc 2006-08-31 18:19:19 -07:00
+++ 1.107/sql/item_timefunc.cc 2006-08-31 18:19:19 -07:00
@@ -65,7 +65,7 @@ static bool make_datetime(date_time_form
ltime->hour, ltime->minute, ltime->second);
break;
case TIME_MICROSECOND:
- length= cs->cset->snprintf(cs, buff, length, "%s%02d:%02d:%02d.%06d",
+ length= cs->cset->snprintf(cs, buff, length, "%s%02d:%02d:%02d.%06ld",
ltime->neg ? "-" : "",
ltime->hour, ltime->minute, ltime->second,
ltime->second_part);
@@ -82,7 +82,7 @@ static bool make_datetime(date_time_form
break;
case DATE_TIME_MICROSECOND:
length= cs->cset->snprintf(cs, buff, length,
- "%04d-%02d-%02d %02d:%02d:%02d.%06d",
+ "%04d-%02d-%02d %02d:%02d:%02d.%06ld",
ltime->year, ltime->month, ltime->day,
ltime->hour, ltime->minute, ltime->second,
ltime->second_part);
--- 1.616/sql/mysqld.cc 2006-08-31 18:19:19 -07:00
+++ 1.617/sql/mysqld.cc 2006-08-31 18:19:19 -07:00
@@ -953,8 +953,8 @@ extern "C" sig_handler print_signal_warn
if (!DBUG_IN_USE)
{
if (global_system_variables.log_warnings)
- sql_print_warning("Got signal %d from thread %d",
- sig,my_thread_id());
+ sql_print_warning("Got signal %d from thread %ld",
+ sig, my_thread_id());
}
#ifdef DONT_REMEMBER_SIGNAL
my_sigset(sig,print_signal_warning); /* int. thread system calls */
@@ -1444,8 +1444,8 @@ static void server_init(void)
if (strlen(mysqld_unix_port) > (sizeof(UNIXaddr.sun_path) - 1))
{
- sql_print_error("The socket file path is too long (> %d): %s",
- sizeof(UNIXaddr.sun_path) - 1, mysqld_unix_port);
+ sql_print_error("The socket file path is too long (> %lu): %s",
+ sizeof(UNIXaddr.sun_path) - 1, mysqld_unix_port);
unireg_abort(1);
}
if ((unix_sock= socket(AF_UNIX, SOCK_STREAM, 0)) < 0)
@@ -2787,9 +2787,9 @@ static void openssl_lock(int mode, opens
sql_print_error("Fatal: OpenSSL interface problem (mode=0x%x)", mode);
abort();
}
- if (err)
+ if (err)
{
- sql_print_error("Fatal: can't %s OpenSSL %s lock", what);
+ sql_print_error("Fatal: can't %s OpenSSL lock", what);
abort();
}
}
@@ -6551,14 +6551,15 @@ get_one_option(int optid, const struct m
exit(1);
}
switch (method-1) {
- case 0:
- method_conv= MI_STATS_METHOD_NULLS_EQUAL;
+ case 2:
+ method_conv= MI_STATS_METHOD_IGNORE_NULLS;
break;
case 1:
method_conv= MI_STATS_METHOD_NULLS_NOT_EQUAL;
break;
- case 2:
- method_conv= MI_STATS_METHOD_IGNORE_NULLS;
+ case 0:
+ default:
+ method_conv= MI_STATS_METHOD_NULLS_EQUAL;
break;
}
global_system_variables.myisam_stats_method= method_conv;
--- 1.281/sql/slave.cc 2006-08-31 18:19:19 -07:00
+++ 1.282/sql/slave.cc 2006-08-31 18:19:19 -07:00
@@ -4073,7 +4073,7 @@ static int connect_to_master(THD* thd, M
suppress_warnings= 0;
sql_print_error("Slave I/O thread: error %s to master \
'%s@%s:%d': \
-Error: '%s' errno: %d retry-time: %d retries: %d",
+Error: '%s' errno: %d retry-time: %d retries: %lu",
(reconnect ? "reconnecting" : "connecting"),
mi->user,mi->host,mi->port,
mysql_error(mysql), last_errno,
--- 1.179/sql/sql_acl.cc 2006-08-31 18:19:19 -07:00
+++ 1.180/sql/sql_acl.cc 2006-08-31 18:19:19 -07:00
@@ -426,7 +426,7 @@ static my_bool acl_load(THD *thd, TABLE_
"case that has been forced to lowercase because "
"lower_case_table_names is set. It will not be "
"possible to remove this privilege using REVOKE.",
- db.db, db.user, db.host.hostname, db.host.hostname);
+ db.db, db.user, db.host.hostname);
}
}
db.sort=get_sort(3,db.host.hostname,db.db,db.user);
@@ -2782,7 +2782,7 @@ static my_bool grant_load(TABLE_LIST *ta
sql_print_warning("'tables_priv' entry '%s %s@%s' "
"ignored in --skip-name-resolve mode.",
mem_check->tname, mem_check->user,
- mem_check->host);
+ mem_check->host.hostname);
continue;
}
}
--- 1.143/sql/item_subselect.cc 2006-08-31 18:19:19 -07:00
+++ 1.144/sql/item_subselect.cc 2006-08-31 18:19:19 -07:00
@@ -976,18 +976,18 @@ Item_in_subselect::row_value_transformer
DBUG_RETURN(RES_ERROR);
Item *item_eq=
new Item_func_eq(new
- Item_direct_ref((*optimizer->get_cache())->
+ Item_ref((*optimizer->get_cache())->
addr(i),
(char *)"<no matter>",
(char *)in_left_expr_name),
new
- Item_direct_ref(select_lex->ref_pointer_array + i,
+ Item_ref(select_lex->ref_pointer_array + i,
(char *)"<no matter>",
(char *)"<list ref>")
);
Item *item_isnull=
new Item_func_isnull(new
- Item_direct_ref( select_lex->
+ Item_ref( select_lex->
ref_pointer_array+i,
(char *)"<no matter>",
(char *)"<list ref>")
@@ -1000,7 +1000,7 @@ Item_in_subselect::row_value_transformer
new
Item_is_not_null_test(this,
new
- Item_direct_ref(select_lex->
+ Item_ref(select_lex->
ref_pointer_array + i,
(char *)"<no matter>",
(char *)"<list ref>")
@@ -1057,7 +1057,7 @@ Item_in_subselect::row_value_transformer
new
Item_is_not_null_test(this,
new
- Item_direct_ref(select_lex->
+ Item_ref(select_lex->
ref_pointer_array + i,
(char *)"<no matter>",
(char *)"<list ref>")
--- 1.186/sql/set_var.cc 2006-08-31 18:19:19 -07:00
+++ 1.187/sql/set_var.cc 2006-08-31 18:19:19 -07:00
@@ -1150,14 +1150,14 @@ static void fix_net_retry_count(THD *thd
thd->net.retry_count=thd->variables.net_retry_count;
}
#else /* HAVE_REPLICATION */
-static void fix_net_read_timeout(THD *thd __attribute__(unused),
- enum_var_type type __attribute__(unused))
+static void fix_net_read_timeout(THD *thd __attribute__((unused)),
+ enum_var_type type __attribute__((unused)))
{}
-static void fix_net_write_timeout(THD *thd __attribute__(unused),
- enum_var_type type __attribute__(unused))
+static void fix_net_write_timeout(THD *thd __attribute__((unused)),
+ enum_var_type type __attribute__((unused)))
{}
-static void fix_net_retry_count(THD *thd __attribute__(unused),
- enum_var_type type __attribute__(unused))
+static void fix_net_retry_count(THD *thd __attribute__((unused)),
+ enum_var_type type __attribute__((unused)))
{}
#endif /* HAVE_REPLICATION */
| Thread |
|---|
| • bk commit into 4.1 tree (jimw:1.2549) | Jim Winstead | 1 Sep |
