Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.

Conflicts:

Conflict adding files to server-tools.  Created directory.
Conflict because server-tools is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to server-tools/instance-manager.  Created directory.
Conflict because server-tools/instance-manager is not versioned, but has versioned children.  Versioned directory.
Contents conflict in server-tools/instance-manager/instance_map.cc
Contents conflict in server-tools/instance-manager/listener.cc
Contents conflict in server-tools/instance-manager/options.cc
Contents conflict in server-tools/instance-manager/user_map.cc
This commit is contained in:
Alexey Kopytov 2009-12-23 16:42:05 +03:00
commit 930a08784c
15 changed files with 42 additions and 26 deletions

View File

@ -3521,7 +3521,8 @@ print_table_data_vertically(MYSQL_RES *result)
for (uint off=0; off < mysql_num_fields(result); off++) for (uint off=0; off < mysql_num_fields(result); off++)
{ {
field= mysql_fetch_field(result); field= mysql_fetch_field(result);
tee_fprintf(PAGER, "%*s: ",(int) max_length,field->name); if (column_names)
tee_fprintf(PAGER, "%*s: ",(int) max_length,field->name);
if (cur[off]) if (cur[off])
{ {
unsigned int i; unsigned int i;

View File

@ -808,7 +808,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
&err_ptr, &err_len); &err_ptr, &err_len);
if (err_len) if (err_len)
{ {
strmake(buff, err_ptr, min(sizeof(buff), err_len)); strmake(buff, err_ptr, min(sizeof(buff) - 1, err_len));
fprintf(stderr, "Invalid mode to --compatible: %s\n", buff); fprintf(stderr, "Invalid mode to --compatible: %s\n", buff);
exit(1); exit(1);
} }
@ -4452,7 +4452,7 @@ static ulong find_set(TYPELIB *lib, const char *x, uint length,
for (; pos != end && *pos != ','; pos++) ; for (; pos != end && *pos != ','; pos++) ;
var_len= (uint) (pos - start); var_len= (uint) (pos - start);
strmake(buff, start, min(sizeof(buff), var_len)); strmake(buff, start, min(sizeof(buff) - 1, var_len));
find= find_type(buff, lib, var_len); find= find_type(buff, lib, var_len);
if (!find) if (!find)
{ {

View File

@ -165,7 +165,7 @@ typedef uint rf_SetTimer;
#define isnan(X) _isnan(X) #define isnan(X) _isnan(X)
#define finite(X) _finite(X) #define finite(X) _finite(X)
#ifndef UNDEF_THREAD_HACK #ifndef MYSQL_CLIENT_NO_THREADS
#define THREAD #define THREAD
#endif #endif
#define VOID_SIGHANDLER #define VOID_SIGHANDLER

View File

@ -409,7 +409,10 @@ my_bool STDCALL mysql_change_user(MYSQL *mysql, const char *user,
if (!passwd) if (!passwd)
passwd=""; passwd="";
/* Store user into the buffer */ /*
Store user into the buffer.
Advance position as strmake returns a pointer to the closing NUL.
*/
end= strmake(end, user, USERNAME_LENGTH) + 1; end= strmake(end, user, USERNAME_LENGTH) + 1;
/* write scrambled password according to server capabilities */ /* write scrambled password according to server capabilities */
@ -897,7 +900,7 @@ mysql_list_fields(MYSQL *mysql, const char *table, const char *wild)
{ {
MYSQL_RES *result; MYSQL_RES *result;
MYSQL_FIELD *fields; MYSQL_FIELD *fields;
char buff[257],*end; char buff[258],*end;
DBUG_ENTER("mysql_list_fields"); DBUG_ENTER("mysql_list_fields");
DBUG_PRINT("enter",("table: '%s' wild: '%s'",table,wild ? wild : "")); DBUG_PRINT("enter",("table: '%s' wild: '%s'",table,wild ? wild : ""));
@ -1903,7 +1906,7 @@ mysql_stmt_param_metadata(MYSQL_STMT *stmt)
/* Store type of parameter in network buffer. */ /* Store type of parameter in network buffer. */
static void store_param_type(char **pos, MYSQL_BIND *param) static void store_param_type(unsigned char **pos, MYSQL_BIND *param)
{ {
uint typecode= param->buffer_type | (param->is_unsigned ? 32768 : 0); uint typecode= param->buffer_type | (param->is_unsigned ? 32768 : 0);
int2store(*pos, typecode); int2store(*pos, typecode);
@ -2182,7 +2185,7 @@ int cli_stmt_execute(MYSQL_STMT *stmt)
that is sent to the server. that is sent to the server.
*/ */
for (param= stmt->params; param < param_end ; param++) for (param= stmt->params; param < param_end ; param++)
store_param_type((char**) &net->write_pos, param); store_param_type(&net->write_pos, param);
} }
for (param= stmt->params; param < param_end; param++) for (param= stmt->params; param < param_end; param++)

View File

@ -231,4 +231,10 @@ a: b
</row> </row>
</resultset> </resultset>
drop table t1; drop table t1;
End of 5.0 tests
Bug #47147: mysql client option --skip-column-names does not apply to vertical output
*************************** 1. row ***************************
1
End of tests

View File

@ -158,8 +158,7 @@ source include/kill_query_and_diff_master_slave.inc;
######## EVENT ######## ######## EVENT ########
let $diff_statement= SELECT event_name, event_body, execute_at let $diff_statement= SELECT event_name, event_body, execute_at FROM information_schema.events where event_name like 'e%';
FROM information_schema.events where event_name like 'e%';
send CREATE EVENT e2 send CREATE EVENT e2
ON SCHEDULE AT CURRENT_TIMESTAMP + INTERVAL 1 DAY ON SCHEDULE AT CURRENT_TIMESTAMP + INTERVAL 1 DAY

View File

@ -626,9 +626,11 @@ let $wait_condition=
--source include/wait_condition.inc --source include/wait_condition.inc
let $tlwb= `show status like 'Table_locks_waited'`; let $tlwb= `show status like 'Table_locks_waited'`;
unlock tables; unlock tables;
connection waiter;
--reap
connection default;
drop table t1; drop table t1;
disconnect waiter; disconnect waiter;
connection default;
--disable_query_log --disable_query_log
eval SET @tlwa= SUBSTRING_INDEX('$tlwa', ' ', -1); eval SET @tlwa= SUBSTRING_INDEX('$tlwa', ' ', -1);
eval SET @tlwb= SUBSTRING_INDEX('$tlwb', ' ', -1); eval SET @tlwb= SUBSTRING_INDEX('$tlwb', ' ', -1);

View File

@ -412,5 +412,10 @@ insert into t1 values ('\0b\0');
--exec $MYSQL --xml test -e "select a from t1" --exec $MYSQL --xml test -e "select a from t1"
drop table t1; drop table t1;
--echo
--echo Bug #47147: mysql client option --skip-column-names does not apply to vertical output
--echo
--exec $MYSQL --skip-column-names --vertical test -e "select 1 as a"
--echo End of 5.0 tests --echo
--echo End of tests

View File

@ -679,7 +679,7 @@ static int search_default_file_with_ext(Process_option_func opt_handler,
int recursion_level) int recursion_level)
{ {
char name[FN_REFLEN + 10], buff[4096], curr_gr[4096], *ptr, *end, **tmp_ext; char name[FN_REFLEN + 10], buff[4096], curr_gr[4096], *ptr, *end, **tmp_ext;
char *value, option[4096], tmp[FN_REFLEN]; char *value, option[4096+2], tmp[FN_REFLEN];
static const char includedir_keyword[]= "includedir"; static const char includedir_keyword[]= "includedir";
static const char include_keyword[]= "include"; static const char include_keyword[]= "include";
const int max_recursion_level= 10; const int max_recursion_level= 10;

View File

@ -245,7 +245,7 @@ my_bool my_use_symdir=0; /* Set this if you want to use symdirs */
#ifdef USE_SYMDIR #ifdef USE_SYMDIR
void symdirget(char *dir) void symdirget(char *dir)
{ {
char buff[FN_REFLEN]; char buff[FN_REFLEN+1];
char *pos=strend(dir); char *pos=strend(dir);
if (dir[0] && pos[-1] != FN_DEVCHAR && my_access(dir, F_OK)) if (dir[0] && pos[-1] != FN_DEVCHAR && my_access(dir, F_OK))
{ {
@ -257,7 +257,7 @@ void symdirget(char *dir)
*pos++=temp; *pos=0; /* Restore old filename */ *pos++=temp; *pos=0; /* Restore old filename */
if (file >= 0) if (file >= 0)
{ {
if ((length= my_read(file, buff, sizeof(buff), MYF(0))) > 0) if ((length= my_read(file, buff, sizeof(buff) - 1, MYF(0))) > 0)
{ {
for (pos= buff + length ; for (pos= buff + length ;
pos > buff && (iscntrl(pos[-1]) || isspace(pos[-1])) ; pos > buff && (iscntrl(pos[-1]) || isspace(pos[-1])) ;

View File

@ -2433,7 +2433,7 @@ const char *MYSQL_LOG::generate_name(const char *log_name,
{ {
char *p= fn_ext(log_name); char *p= fn_ext(log_name);
uint length= (uint) (p - log_name); uint length= (uint) (p - log_name);
strmake(buff, log_name, min(length, FN_REFLEN)); strmake(buff, log_name, min(length, FN_REFLEN-1));
return (const char*)buff; return (const char*)buff;
} }
return log_name; return log_name;
@ -3683,7 +3683,7 @@ int MYSQL_BIN_LOG::purge_logs_before_date(time_t purge_time)
if (stat_area.st_mtime < purge_time) if (stat_area.st_mtime < purge_time)
strmake(to_log, strmake(to_log,
log_info.log_file_name, log_info.log_file_name,
sizeof(log_info.log_file_name)); sizeof(log_info.log_file_name) - 1);
else else
break; break;
} }
@ -5089,11 +5089,11 @@ bool flush_error_log()
if (opt_error_log) if (opt_error_log)
{ {
char err_renamed[FN_REFLEN], *end; char err_renamed[FN_REFLEN], *end;
end= strmake(err_renamed,log_error_file,FN_REFLEN-4); end= strmake(err_renamed,log_error_file,FN_REFLEN-5);
strmov(end, "-old"); strmov(end, "-old");
VOID(pthread_mutex_lock(&LOCK_error_log)); VOID(pthread_mutex_lock(&LOCK_error_log));
#ifdef __WIN__ #ifdef __WIN__
char err_temp[FN_REFLEN+4]; char err_temp[FN_REFLEN+5];
/* /*
On Windows is necessary a temporary file for to rename On Windows is necessary a temporary file for to rename
the current error file. the current error file.

View File

@ -1061,7 +1061,7 @@ int acl_getroot(THD *thd, USER_RESOURCES *mqh,
*mqh= acl_user->user_resource; *mqh= acl_user->user_resource;
if (acl_user->host.hostname) if (acl_user->host.hostname)
strmake(sctx->priv_host, acl_user->host.hostname, MAX_HOSTNAME); strmake(sctx->priv_host, acl_user->host.hostname, MAX_HOSTNAME - 1);
else else
*sctx->priv_host= 0; *sctx->priv_host= 0;
} }
@ -1162,7 +1162,7 @@ bool acl_getroot_no_password(Security_context *sctx, char *user, char *host,
sctx->priv_user= acl_user->user ? user : (char *) ""; sctx->priv_user= acl_user->user ? user : (char *) "";
if (acl_user->host.hostname) if (acl_user->host.hostname)
strmake(sctx->priv_host, acl_user->host.hostname, MAX_HOSTNAME); strmake(sctx->priv_host, acl_user->host.hostname, MAX_HOSTNAME - 1);
else else
*sctx->priv_host= 0; *sctx->priv_host= 0;
} }
@ -3768,11 +3768,11 @@ static my_bool grant_reload_procs_priv(THD *thd)
DBUG_RETURN(TRUE); DBUG_RETURN(TRUE);
} }
rw_wrlock(&LOCK_grant);
/* Save a copy of the current hash if we need to undo the grant load */ /* Save a copy of the current hash if we need to undo the grant load */
old_proc_priv_hash= proc_priv_hash; old_proc_priv_hash= proc_priv_hash;
old_func_priv_hash= func_priv_hash; old_func_priv_hash= func_priv_hash;
rw_wrlock(&LOCK_grant);
if ((return_val= grant_load_procs_priv(table.table))) if ((return_val= grant_load_procs_priv(table.table)))
{ {
/* Error; Reverting to old hash */ /* Error; Reverting to old hash */

View File

@ -721,7 +721,7 @@ static int check_connection(THD *thd)
ulong server_capabilites; ulong server_capabilites;
{ {
/* buff[] needs to big enough to hold the server_version variable */ /* buff[] needs to big enough to hold the server_version variable */
char buff[SERVER_VERSION_LENGTH + SCRAMBLE_LENGTH + 64]; char buff[SERVER_VERSION_LENGTH + 1 + SCRAMBLE_LENGTH + 1 + 64];
server_capabilites= CLIENT_BASIC_FLAGS; server_capabilites= CLIENT_BASIC_FLAGS;
if (opt_using_transactions) if (opt_using_transactions)

View File

@ -2081,7 +2081,7 @@ static int check_func_set(THD *thd, struct st_mysql_sys_var *var,
&error, &error_len, &not_used); &error, &error_len, &not_used);
if (error_len) if (error_len)
{ {
strmake(buff, error, min(sizeof(buff), error_len)); strmake(buff, error, min(sizeof(buff) - 1, error_len));
strvalue= buff; strvalue= buff;
goto err; goto err;
} }

View File

@ -2610,7 +2610,7 @@ mysql_prepare_create_table(THD *thd, HA_CREATE_INFO *create_info,
!(sql_field->charset= get_charset_by_csname(sql_field->charset->csname, !(sql_field->charset= get_charset_by_csname(sql_field->charset->csname,
MY_CS_BINSORT,MYF(0)))) MY_CS_BINSORT,MYF(0))))
{ {
char tmp[64]; char tmp[65];
strmake(strmake(tmp, save_cs->csname, sizeof(tmp)-4), strmake(strmake(tmp, save_cs->csname, sizeof(tmp)-4),
STRING_WITH_LEN("_bin")); STRING_WITH_LEN("_bin"));
my_error(ER_UNKNOWN_COLLATION, MYF(0), tmp); my_error(ER_UNKNOWN_COLLATION, MYF(0), tmp);