Below is the list of changes that have just been committed into a local
4.1 repository of bar. When bar 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-10-11 09:06:22+05:00, bar@stripped +7 -0
Merge abarkov@stripped:/home/bk/mysql-4.1-kt
into mysql.com:/usr/home/bar/mysql-4.1-kt
MERGE: 1.2526.1.1
sql/log_event.cc@stripped, 2006-10-11 09:06:07+05:00, bar@stripped +0 -0
Auto merged
MERGE: 1.188.1.1
sql/slave.cc@stripped, 2006-10-11 09:06:08+05:00, bar@stripped +0 -0
Auto merged
MERGE: 1.281.1.1
sql/slave.h@stripped, 2006-10-11 09:06:09+05:00, bar@stripped +0 -0
Auto merged
MERGE: 1.88.1.1
sql/sql_acl.cc@stripped, 2006-10-11 09:06:09+05:00, bar@stripped +0 -0
Auto merged
MERGE: 1.179.1.2
sql/sql_class.h@stripped, 2006-10-11 09:06:10+05:00, bar@stripped +0 -0
Auto merged
MERGE: 1.287.3.1
sql/sql_parse.cc@stripped, 2006-10-11 09:06:10+05:00, bar@stripped +0 -0
Auto merged
MERGE: 1.486.1.1
sql/sql_table.cc@stripped, 2006-10-11 09:06:11+05:00, bar@stripped +0 -0
Auto merged
MERGE: 1.308.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: bar
# Host: bar.intranet.mysql.r18.ru
# Root: /usr/home/bar/mysql-4.1-kt/RESYNC
--- 1.190/sql/log_event.cc 2006-10-11 09:06:35 +05:00
+++ 1.191/sql/log_event.cc 2006-10-11 09:06:35 +05:00
@@ -2970,7 +2970,7 @@
#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
void Create_file_log_event::pack_info(Protocol *protocol)
{
- char buf[NAME_LEN*2 + 30 + 21*2], *pos;
+ char buf[NAME_BYTE_LEN*2 + 30 + 21*2], *pos;
pos= strmov(buf, "db=");
memcpy(pos, db, db_len);
pos= strmov(pos + db_len, ";table=");
--- 1.282/sql/slave.cc 2006-10-11 09:06:35 +05:00
+++ 1.283/sql/slave.cc 2006-10-11 09:06:35 +05:00
@@ -4073,7 +4073,7 @@
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.180/sql/sql_acl.cc 2006-10-11 09:06:36 +05:00
+++ 1.181/sql/sql_acl.cc 2006-10-11 09:06:36 +05:00
@@ -426,7 +426,7 @@
"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);
@@ -2644,11 +2644,7 @@
while ((Str = str_list++))
{
if (Str->host.length > HOSTNAME_LENGTH ||
- system_charset_info->cset->charpos(system_charset_info,
- Str->user.str,
- Str->user.str +
- Str->user.length,
- USERNAME_LENGTH) < Str->user.length)
+ Str->user.length > USERNAME_LENGTH)
{
my_error(ER_GRANT_WRONG_HOST_OR_USER,MYF(0));
result= -1;
@@ -2786,7 +2782,7 @@
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.289/sql/sql_class.h 2006-10-11 09:06:36 +05:00
+++ 1.290/sql/sql_class.h 2006-10-11 09:06:36 +05:00
@@ -88,7 +88,7 @@
IO_CACHE log_file;
IO_CACHE index_file;
char *name;
- char time_buff[20],db[NAME_LEN+1];
+ char time_buff[20],db[NAME_BYTE_LEN+1];
char log_file_name[FN_REFLEN],index_file_name[FN_REFLEN];
// current file sequence number for load data infile binary logging
uint file_id;
--- 1.488/sql/sql_parse.cc 2006-10-11 09:06:36 +05:00
+++ 1.489/sql/sql_parse.cc 2006-10-11 09:06:36 +05:00
@@ -146,7 +146,7 @@
{
int return_val= 0;
uint temp_len, user_len;
- char temp_user[USERNAME_LENGTH+HOSTNAME_LENGTH+2];
+ char temp_user[USERNAME_BYTE_LENGTH+HOSTNAME_LENGTH+2];
struct user_conn *uc;
DBUG_ASSERT(user != 0);
@@ -640,7 +640,7 @@
{
USER_CONN *uc;
uint temp_len=lu->user.length+lu->host.length+2;
- char temp_user[USERNAME_LENGTH+HOSTNAME_LENGTH+2];
+ char temp_user[USERNAME_BYTE_LENGTH+HOSTNAME_LENGTH+2];
memcpy(temp_user,lu->user.str,lu->user.length);
memcpy(temp_user+lu->user.length+1,lu->host.str,lu->host.length);
@@ -1395,7 +1395,11 @@
{
char *db, *tbl_name;
uint db_len= *(uchar*) packet;
- if (db_len >= packet_length || db_len > NAME_LEN)
+ if (db_len >= packet_length ||
+ system_charset_info->cset->charpos(system_charset_info,
+ packet + 1,
+ packet + 1 + db_len,
+ USERNAME_LENGTH) < db_len)
{
send_error(thd, ER_UNKNOWN_COM_ERROR);
break;
@@ -1429,7 +1433,7 @@
password. New clients send the size (1 byte) + string (not null
terminated, so also '\0' for empty string).
*/
- char db_buff[NAME_LEN+1]; // buffer to store db in utf8
+ char db_buff[NAME_BYTE_LEN+1]; // buffer to store db in utf8
char *db= passwd;
uint passwd_len= thd->client_capabilities & CLIENT_SECURE_CONNECTION ?
*passwd++ : strlen(passwd);
--- 1.309/sql/sql_table.cc 2006-10-11 09:06:36 +05:00
+++ 1.310/sql/sql_table.cc 2006-10-11 09:06:36 +05:00
@@ -2013,7 +2013,7 @@
mysql_ha_flush(thd, tables, MYSQL_HA_CLOSE_FINAL, FALSE);
for (table = tables; table; table = table->next)
{
- char table_name[NAME_LEN*2+2];
+ char table_name[NAME_BYTE_LEN*2+2];
char* db = table->db;
bool fatal_error=0;
strxmov(table_name, db, ".", table->real_name, NullS);
@@ -3804,7 +3804,7 @@
for (table= tables; table; table= table->next)
{
- char table_name[NAME_LEN*2+2];
+ char table_name[NAME_BYTE_LEN*2+2];
TABLE *t;
strxmov(table_name, table->db ,".", table->real_name, NullS);
--- 1.89/sql/slave.h 2006-10-11 09:06:36 +05:00
+++ 1.90/sql/slave.h 2006-10-11 09:06:36 +05:00
@@ -398,7 +398,7 @@
/* the variables below are needed because we can change masters on the fly */
char master_log_name[FN_REFLEN];
char host[HOSTNAME_LENGTH+1];
- char user[USERNAME_LENGTH+1];
+ char user[USERNAME_BYTE_LENGTH+1];
char password[MAX_PASSWORD_LENGTH+1];
my_bool ssl; // enables use of SSL connection if true
char ssl_ca[FN_REFLEN], ssl_capath[FN_REFLEN], ssl_cert[FN_REFLEN];
| Thread |
|---|
| • bk commit into 4.1 tree (bar:1.2528) | bar | 11 Oct |
