diff options
| -rw-r--r-- | libmysql/dll.c | 2 | ||||
| -rw-r--r-- | libmysql/libmysql.c | 2 | ||||
| -rw-r--r-- | mysys/my_getopt.c | 2 | ||||
| -rw-r--r-- | sql/net_serv.cc | 4 | ||||
| -rw-r--r-- | strings/ctype-bin.c | 2 | ||||
| -rw-r--r-- | tests/client_test.c | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/libmysql/dll.c b/libmysql/dll.c index 92aa611000b..e9334d68a0c 100644 --- a/libmysql/dll.c +++ b/libmysql/dll.c @@ -123,7 +123,7 @@ extern "C" unsigned long _System DllMain(unsigned long modhandle, unsigned long flag) { if (flag == 0) { - tzset(); // Set tzname + tzset(); /* Set tzname */ time_t currentTime = time(NULL); struct tm *ts = localtime(¤tTime); if (ts->tm_isdst > 0) diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index debe3e54679..3efce367cae 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -629,7 +629,7 @@ my_bool STDCALL mysql_change_user(MYSQL *mysql, const char *user, } } else - *end++= '\0'; // empty password + *end++= '\0'; /* empty password */ /* Add database if needed */ end= strmov(end, db ? db : "") + 1; diff --git a/mysys/my_getopt.c b/mysys/my_getopt.c index 06e7b626bd7..edd35749633 100644 --- a/mysys/my_getopt.c +++ b/mysys/my_getopt.c @@ -461,7 +461,7 @@ static char *check_struct_option(char *cur_arg, char *key_name) { char *ptr, *end; - ptr= strcend(cur_arg + 1, '.'); // Skip the first character + ptr= strcend(cur_arg + 1, '.'); /* Skip the first character */ end= strcend(cur_arg, '='); /* diff --git a/sql/net_serv.cc b/sql/net_serv.cc index d39fca595ac..eac197e530b 100644 --- a/sql/net_serv.cc +++ b/sql/net_serv.cc @@ -460,7 +460,7 @@ net_real_write(NET *net,const char *packet,ulong len) #ifdef MYSQL_SERVER net->last_errno= ER_OUT_OF_RESOURCES; net->error= 2; - //TODO is it needed to set this variable if we have no socket + /* TODO is it needed to set this variable if we have no socket */ net->report_error= 1; #endif net->reading_or_writing= 0; @@ -889,7 +889,7 @@ my_net_read(NET *net) if (net->remain_in_buf) { - buf_length= net->buf_length; // Data left in old packet + buf_length= net->buf_length; /* Data left in old packet */ first_packet_offset= start_of_packet= (net->buf_length - net->remain_in_buf); /* Restore the character that was overwritten by the end 0 */ diff --git a/strings/ctype-bin.c b/strings/ctype-bin.c index 3f74f514c48..75070203239 100644 --- a/strings/ctype-bin.c +++ b/strings/ctype-bin.c @@ -272,7 +272,7 @@ int my_instr_bin(CHARSET_INFO *cs __attribute__((unused)), if (s_length <= b_length) { if (!s_length) - return 0; // Empty string is always found + return 0; /* Empty string is always found */ str= (const uchar*) big; search= (const uchar*) small; diff --git a/tests/client_test.c b/tests/client_test.c index ac83ceda39f..388d5743cfb 100644 --- a/tests/client_test.c +++ b/tests/client_test.c @@ -6841,7 +6841,7 @@ static void test_logs() fprintf(stdout, "\n name : %s(%ld)", data, length); myassert(id == 9876); - myassert(length == 19);//Due to VARCHAR(20) + myassert(length == 19); /* Due to VARCHAR(20) */ myassert(strcmp(data,"MySQL - Open Source")==0); rc = mysql_fetch(stmt); |