diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2009-12-23 16:42:05 +0300 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2009-12-23 16:42:05 +0300 |
| commit | af74c3436f5ba44606dc3ffcf501001711ed06d0 (patch) | |
| tree | 1552ff636d911fe038d671ee60e55406bdadbf35 /libmysql | |
| parent | d05c63f721c8aac027f5acab0339a86a4747be16 (diff) | |
| parent | d332a1895282aa7b3786b8116ad89d93db8ddd6a (diff) | |
| download | mariadb-git-af74c3436f5ba44606dc3ffcf501001711ed06d0.tar.gz | |
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
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/libmysql.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 5533ccdf457..793e41b340e 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -409,7 +409,10 @@ my_bool STDCALL mysql_change_user(MYSQL *mysql, const char *user, if (!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; /* 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_FIELD *fields; - char buff[257],*end; + char buff[258],*end; DBUG_ENTER("mysql_list_fields"); 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. */ -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); int2store(*pos, typecode); @@ -2182,7 +2185,7 @@ int cli_stmt_execute(MYSQL_STMT *stmt) that is sent to the server. */ 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++) |