Some

C++ comments cleanup


sql/stacktrace.c:
  C++ comments cleanup
sql/structs.h:
  C++ comments cleanup
sql/ha_myisam.h:
  C++ comments cleanup
include/config-os2.h:
  C++ comments cleanup
include/sslopt-case.h:
  C++ comments cleanup
mysys/mf_tempfile.c:
  C++ comments cleanup
sql/mysql_priv.h:
  C++ comments cleanup
sql/slave.h:
  C++ comments cleanup
sql/time.cc:
  C++ comments cleanup
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

2 files changed, 30 insertions, 30 deletions

diff --git a/include/config-os2.h b/include/config-os2.h
index 9064cd5a5bb..2554cfd8495 100644
--- a/include/config-os2.h
+++ b/include/config-os2.h
@@ -64,10 +64,10 @@
 #define NO_FCNTL_NONBLOCK
 
 #define EFBIG			   E2BIG
-//#define ENFILE		  EMFILE
-//#define ENAMETOOLONG		(EOS2ERR+2)
-//#define ETIMEDOUT		  145
-//#define EPIPE			  146
+/*#define ENFILE		  EMFILE    */
+/*#define ENAMETOOLONG		(EOS2ERR+2) */
+/*#define ETIMEDOUT		  145       */
+/*#define EPIPE			  146       */
 #define EROFS			147
 
 #define sleep(A)	DosSleep((A)*1000)
@@ -129,7 +129,7 @@ typedef unsigned long long os_off_t;
 #define HAVE_ALLOCA 1
 
 /* Define if you have <alloca.h> and it should be used (not on Ultrix).  */
-//#define HAVE_ALLOCA_H 1
+/* #define HAVE_ALLOCA_H 1 */
 
 /* Define if you don't have vprintf but do have _doprnt.  */
 /* #undef HAVE_DOPRNT */
@@ -145,7 +145,7 @@ typedef unsigned long long os_off_t;
 #define HAVE_ST_RDEV 1
 
 /* Define if you have <sys/wait.h> that is POSIX.1 compatible.	*/
-//#define HAVE_SYS_WAIT_H 1
+/* #define HAVE_SYS_WAIT_H 1 */
 
 /* Define if you don't have tm_zone but do have the external array
    tzname.  */
@@ -216,7 +216,7 @@ typedef unsigned long long os_off_t;
 #define HAVE_BOOL 1
 
 /* Have berkeley db installed */
-//#define HAVE_BERKELEY_DB 1
+/* #define HAVE_BERKELEY_DB 1 */
 
 /* DSB style signals ? */
 /* #undef HAVE_BSD_SIGNALS */
@@ -395,7 +395,7 @@ typedef unsigned long long os_off_t;
 #define HAVE_CHSIZE 1
 
 /* Define if you have the cuserid function.  */
-//#define HAVE_CUSERID 1
+/* #define HAVE_CUSERID 1 */
 
 /* Define if you have the dlerror function.  */
 #define HAVE_DLERROR 1
@@ -407,7 +407,7 @@ typedef unsigned long long os_off_t;
 /* #undef HAVE_FCHMOD */
 
 /* Define if you have the fcntl function.  */
-//#define HAVE_FCNTL 1
+/* #define HAVE_FCNTL 1 */
 
 /* Define if you have the fconvert function.  */
 /* #undef HAVE_FCONVERT */
@@ -425,7 +425,7 @@ typedef unsigned long long os_off_t;
 /* #undef HAVE_FSEEKO */
 
 /* Define if you have the ftruncate function.  */
-//#define HAVE_FTRUNCATE 1
+/* #define HAVE_FTRUNCATE 1 */
 
 /* Define if you have the getcwd function.  */
 #define HAVE_GETCWD 1
@@ -440,16 +440,16 @@ typedef unsigned long long os_off_t;
 #define HAVE_GETPAGESIZE 1
 
 /* Define if you have the getpass function.  */
-//#define HAVE_GETPASS 1
+/*#define HAVE_GETPASS 1 */
 
 /* Define if you have the getpassphrase function.  */
 /* #undef HAVE_GETPASSPHRASE */
 
 /* Define if you have the getpwnam function.  */
-//#define HAVE_GETPWNAM 1
+/* #define HAVE_GETPWNAM 1 */
 
 /* Define if you have the getpwuid function.  */
-//#define HAVE_GETPWUID 1
+/* #define HAVE_GETPWUID 1 */
 
 /* Define if you have the getrlimit function.  */
 /* #undef HAVE_GETRLIMIT */
@@ -491,7 +491,7 @@ typedef unsigned long long os_off_t;
 #define HAVE_MEMMOVE 1
 
 /* Define if you have the mkstemp function.  */
-//#define HAVE_MKSTEMP 1
+/* #define HAVE_MKSTEMP 1 */
 
 /* Define if you have the mlockall function.  */
 /* #undef HAVE_MLOCKALL */
@@ -581,7 +581,7 @@ typedef unsigned long long os_off_t;
 /* #undef HAVE_SIGTHREADMASK */
 
 /* Define if you have the snprintf function.  */
-//#define HAVE_SNPRINTF 1
+/* #define HAVE_SNPRINTF 1 */
 
 /* Define if you have the socket function.  */
 #define HAVE_SOCKET 1
@@ -635,7 +635,7 @@ typedef unsigned long long os_off_t;
 /* #undef HAVE_VIDATTR */
 
 /* Define if you have the <alloca.h> header file.  */
-//#define HAVE_ALLOCA_H 1
+/* #define HAVE_ALLOCA_H 1 */
 
 /* Define if you have the <arpa/inet.h> header file.  */
 #define HAVE_ARPA_INET_H 1
@@ -647,10 +647,10 @@ typedef unsigned long long os_off_t;
 #define HAVE_CRYPT_H 1
 
 /* Define if you have the <curses.h> header file.  */
-//#define HAVE_CURSES_H 1
+/* #define HAVE_CURSES_H 1 */
 
 /* Define if you have the <dirent.h> header file.  */
-//#define HAVE_DIRENT_H 1
+/* #define HAVE_DIRENT_H 1 */
 
 /* Define if you have the <fcntl.h> header file.  */
 #define HAVE_FCNTL_H 1
@@ -662,7 +662,7 @@ typedef unsigned long long os_off_t;
 /* #undef HAVE_FLOATINGPOINT_H */
 
 /* Define if you have the <grp.h> header file.	*/
-//#define HAVE_GRP_H 1
+/* #define HAVE_GRP_H 1 */
 
 /* Define if you have the <ieeefp.h> header file.  */
 /* #undef HAVE_IEEEFP_H */
@@ -686,7 +686,7 @@ typedef unsigned long long os_off_t;
 /* #undef HAVE_PATHS_H */
 
 /* Define if you have the <pwd.h> header file.	*/
-//#define HAVE_PWD_H 1
+/* #define HAVE_PWD_H 1 */
 
 /* Define if you have the <sched.h> header file.  */
 /* #undef HAVE_SCHED_H */
@@ -707,16 +707,16 @@ typedef unsigned long long os_off_t;
 #define HAVE_STRING_H 1
 
 /* Define if you have the <strings.h> header file.  */
-//#define HAVE_STRINGS_H 1
+/* #define HAVE_STRINGS_H 1 */
 
 /* Define if you have the <synch.h> header file.  */
 /* #undef HAVE_SYNCH_H */
 
 /* Define if you have the <sys/dir.h> header file.  */
-//#define HAVE_SYS_DIR_H 1
+/* #define HAVE_SYS_DIR_H 1 */
 
 /* Define if you have the <sys/file.h> header file.  */
-//#define HAVE_SYS_FILE_H 1
+/* #define HAVE_SYS_FILE_H 1 */
 
 /* Define if you have the <sys/ioctl.h> header file.  */
 #define HAVE_SYS_IOCTL_H 1
@@ -758,7 +758,7 @@ typedef unsigned long long os_off_t;
 /* #undef HAVE_SYS_VADVISE_H */
 
 /* Define if you have the <sys/wait.h> header file.  */
-//#define HAVE_SYS_WAIT_H 1
+/* #define HAVE_SYS_WAIT_H 1 */
 
 /* Define if you have the <term.h> header file.  */
 /* #undef HAVE_TERM_H */
@@ -767,13 +767,13 @@ typedef unsigned long long os_off_t;
 /* #undef HAVE_TERMBITS_H */
 
 /* Define if you have the <termcap.h> header file.  */
-//#define HAVE_TERMCAP_H 1
+/* #define HAVE_TERMCAP_H 1 */
 
 /* Define if you have the <termio.h> header file.  */
-//#define HAVE_TERMIO_H 1
+/* /#define HAVE_TERMIO_H 1 */
 
 /* Define if you have the <termios.h> header file.  */
-//#define HAVE_TERMIOS_H 1
+/* #define HAVE_TERMIOS_H 1 */
 
 /* Define if you have the <unistd.h> header file.  */
 #define HAVE_UNISTD_H 1
@@ -826,4 +826,4 @@ typedef unsigned long long os_off_t;
 /* Define for large files, on AIX-style hosts. */
 /* #undef _LARGE_FILES */
 
-#endif // __CONFIG_OS2_H__
+#endif /* __CONFIG_OS2_H__ */
diff --git a/include/sslopt-case.h b/include/sslopt-case.h
index e6e3a416bb0..331c9a307f1 100644
--- a/include/sslopt-case.h
+++ b/include/sslopt-case.h
@@ -20,8 +20,8 @@
       break;
     case OPT_SSL_KEY:
       opt_use_ssl = 1;				/* true */
-//QQ to be removed???      my_free(opt_ssl_key, MYF(MY_ALLOW_ZERO_PTR));
-//QQ to be removed???      opt_ssl_key = my_strdup(optarg, MYF(0));
+/* QQ to be removed???      my_free(opt_ssl_key, MYF(MY_ALLOW_ZERO_PTR)); */
+/* QQ to be removed???      opt_ssl_key = my_strdup(optarg, MYF(0)); */
       break;
     case OPT_SSL_CERT:
       opt_use_ssl = 1;				/* true */