10.0-base merge

(without InnoDB - all InnoDB changes were ignored)
This commit is contained in:
Sergei Golubchik 2013-06-06 21:32:29 +02:00
commit 72ba95873a
464 changed files with 8657 additions and 2905 deletions

View file

@ -435,7 +435,7 @@ void init_user_stats(USER_STATS *user_stats,
memcpy(user_stats->user, user, user_length);
user_stats->user[user_length]= 0;
user_stats->user_name_length= user_length;
strmake(user_stats->priv_user, priv_user, sizeof(user_stats->priv_user)-1);
strmake_buf(user_stats->priv_user, priv_user);
user_stats->total_connections= total_connections;
user_stats->concurrent_connections= concurrent_connections;