Skip to content

Commit a15234b

Browse files
committed
Merge branch '10.3' into 10.4
2 parents 9a62120 + e5e5877 commit a15234b

File tree

251 files changed

+2256
-940
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

251 files changed

+2256
-940
lines changed

client/mysql.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3208,7 +3208,7 @@ static int
32083208
com_go(String *buffer,char *line __attribute__((unused)))
32093209
{
32103210
charbuff[200]; /* about 110 chars used so far */
3211-
char time_buff[53+3+1]; /* time max + space&parens + NUL */
3211+
chartime_buff[53+3+1]; /* time max + space & parens + NUL */
32123212
MYSQL_RES *result;
32133213
ulonglong timer;
32143214
ulong warnings= 0;
@@ -3228,7 +3228,7 @@ com_go(String *buffer,char *line __attribute__((unused)))
32283228

32293229
if (buffer->is_empty())
32303230
{
3231-
if (status.batch)// Ignore empty quries
3231+
if (status.batch)// Ignore empty queries.
32323232
return 0;
32333233
return put_info("No query specified\n",INFO_ERROR);
32343234

@@ -3293,7 +3293,7 @@ com_go(String *buffer,char *line __attribute__((unused)))
32933293
else
32943294
time_buff[0]= '\0';
32953295

3296-
/* Every branch must truncate buff . */
3296+
/* Every branch must truncate buff. */
32973297
if (result)
32983298
{
32993299
if (!mysql_num_rows(result) && ! quick && !column_types_flag)

client/mysqldump.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4538,7 +4538,7 @@ static int dump_databases(char **db_names)
45384538

45394539

45404540
/*
4541-
View Specific database initalization.
4541+
View Specific database initialization.
45424542
45434543
SYNOPSIS
45444544
init_dumping_views
@@ -4555,7 +4555,7 @@ int init_dumping_views(char *qdatabase __attribute__((unused)))
45554555

45564556

45574557
/*
4558-
Table Specific database initalization.
4558+
Table Specific database initialization.
45594559
45604560
SYNOPSIS
45614561
init_dumping_tables

0 commit comments

Comments
 (0)