Merge work:/my/mysql into donna.mysql.com:/home/my/bk/mysql

client/violite.c

@@ -206,9 +206,9 @@ int vio_blocking(Vio * vio, my_bool set_blocking_mode)
       old_fcntl=vio->fcntl_mode = fcntl(vio->sd, F_GETFL);
     }
     if (set_blocking_mode)
-      vio->fcntl_mode &= ~O_NONBLOCK; //clear bit
+      vio->fcntl_mode &= ~O_NONBLOCK; /*clear bit */
     else
-      vio->fcntl_mode |= O_NONBLOCK; //set bit
+      vio->fcntl_mode |= O_NONBLOCK; /*set bit */
     if (old_fcntl != vio->fcntl_mode)
       r = fcntl(vio->sd, F_SETFL, vio->fcntl_mode);
   }
@@ -228,12 +228,12 @@ int vio_blocking(Vio * vio, my_bool set_blocking_mode)
     if (set_blocking_mode)
     {
       arg = 0;
-      vio->fcntl_mode &= ~O_NONBLOCK; //clear bit
+      vio->fcntl_mode &= ~O_NONBLOCK; /*clear bit */
     }
     else
     {
       arg = 1;
-      vio->fcntl_mode |= O_NONBLOCK; //set bit
+      vio->fcntl_mode |= O_NONBLOCK; /*set bit */
     }
     if (old_fcntl != vio->fcntl_mode)
       r = ioctlsocket(vio->sd,FIONBIO,(void*) &arg, sizeof(arg));

div/deadlock_test.c

@@ -125,7 +125,7 @@ static void permute_aux(int *order, int num_queries, int* fixed)
 	}
     }
 
-  //printf("num_free = %d\n", num_free);
+  /*printf("num_free = %d\n", num_free); */
   
   if(num_free <= 1)
     {

include/global.h

@@ -22,11 +22,11 @@
 #define _global_h
 
 #if defined( __EMX__) && !defined( MYSQL_SERVER)
-// moved here to use below VOID macro redefinition
+/* moved here to use below VOID macro redefinition */
 #define INCL_BASE
 #define INCL_NOPMAPI
 #include <os2.h>
-#endif // __EMX__
+#endif /* __EMX__ */
 
 #if defined(_WIN32) || defined(_WIN64) || defined(__WIN32__) || defined(WIN32)
 #include <config-win.h>

include/my_pthread.h

@@ -22,7 +22,7 @@
 
 #include <errno.h>
 #ifndef ETIME
-#define ETIME ETIMEDOUT				// For FreeBSD
+#define ETIME ETIMEDOUT				/* For FreeBSD */
 #endif
 
 #if defined(__WIN__)
@@ -119,8 +119,8 @@ void pthread_exit(void *a);	 /* was #define pthread_exit(A) ExitThread(A)*/
 #define pthread_condattr_init(A)
 #define pthread_condattr_destroy(A)
 
-//Irena: compiler does not like this:
-//#define my_pthread_getprio(pthread_t thread_id) pthread_dummy(0)
+/*Irena: compiler does not like this: */
+/*#define my_pthread_getprio(pthread_t thread_id) pthread_dummy(0) */
 #define my_pthread_getprio(thread_id) pthread_dummy(0)
 
 #elif defined(HAVE_UNIXWARE7_THREADS)

include/raid.h

@@ -16,9 +16,9 @@
    MA 02111-1307, USA */
 
 /* Parser needs these defines  always, even if USE_RAID is not defined */
-#define RAID_TYPE_0 1       // Striping
-#define RAID_TYPE_x 2       // Some new modes
-#define RAID_TYPE_y 3       //
+#define RAID_TYPE_0 1       /* Striping */
+#define RAID_TYPE_x 2       /* Some new modes */
+#define RAID_TYPE_y 3
 
 #define RAID_DEFAULT_CHUNKS 4
 #define RAID_DEFAULT_CHUNKSIZE 256*1024 /* 256kB */
@@ -102,9 +102,9 @@ class RaidName {
     bool IsRaid();
     int Rename(const char * from, const char * to, myf MyFlags);
   private:
-    uint _raid_type;       // RAID_TYPE_0 or RAID_TYPE_1 or RAID_TYPE_5
-    uint _raid_chunks;     // 1..n
-    ulong _raid_chunksize; // 1..n in bytes
+    uint _raid_type;       /* RAID_TYPE_0 or RAID_TYPE_1 or RAID_TYPE_5 */
+    uint _raid_chunks;     /* 1..n */
+    ulong _raid_chunksize; /* 1..n in bytes */
 };
 
 class RaidFd {
@@ -126,16 +126,16 @@ class RaidFd {
     static DYNAMIC_ARRAY _raid_map;		/* Map of RaidFD* */
   private:
 
-    uint _raid_type;       // RAID_TYPE_0 or RAID_TYPE_1 or RAID_TYPE_5
-    uint _raid_chunks;     // 1..n
-    ulong _raid_chunksize; // 1..n in bytes
+    uint _raid_type;       /* RAID_TYPE_0 or RAID_TYPE_1 or RAID_TYPE_5 */
+    uint _raid_chunks;     /* 1..n */
+    ulong _raid_chunksize; /* 1..n in bytes */
 
-    ulong _total_block;    // We are operating with block no x (can be 0..many).
-    uint _this_block;      // can be 0.._raid_chunks
-    uint _remaining_bytes; // Maximum bytes that can be written in this block
+    ulong _total_block;    /* We are operating with block no x (can be 0..many). */
+    uint _this_block;      /* can be 0.._raid_chunks */
+    uint _remaining_bytes; /* Maximum bytes that can be written in this block */
 
     my_off_t _position;
-    my_off_t _size;        // Cached file size for faster seek(SEEK_END)
+    my_off_t _size;        /* Cached file size for faster seek(SEEK_END) */
     File _fd;
     File *_fd_vector;		/* Array of File */
     off_t *_seek_vector;	/* Array of cached seek positions */
@@ -147,7 +147,7 @@ class RaidFd {
 			 (ulong) _position, _raid_chunksize, (ulong) _size));
 
       _total_block = (ulong) (_position / _raid_chunksize);
-      _this_block = _total_block % _raid_chunks;    // can be 0.._raid_chunks
+      _this_block = _total_block % _raid_chunks;    /* can be 0.._raid_chunks */
       _remaining_bytes = (uint) (_raid_chunksize -
 				 (_position - _total_block * _raid_chunksize));
       DBUG_PRINT("info",

include/sslopt-case.h

@@ -17,25 +17,25 @@
 
 #ifdef HAVE_OPENSSL
     case OPT_SSL_SSL:
-      opt_use_ssl = 1;				//true
+      opt_use_ssl = 1;				/* true */
       break;
     case OPT_SSL_KEY:
-      opt_use_ssl = 1;				//true
+      opt_use_ssl = 1;				/* true */
       my_free(opt_ssl_key, MYF(MY_ALLOW_ZERO_PTR));
       opt_ssl_key = my_strdup(optarg, MYF(0));
       break;
     case OPT_SSL_CERT:
-      opt_use_ssl = 1;				//true
+      opt_use_ssl = 1;				/* true */
       my_free(opt_ssl_cert, MYF(MY_ALLOW_ZERO_PTR));
       opt_ssl_cert = my_strdup(optarg, MYF(0));
       break;
     case OPT_SSL_CA:
-      opt_use_ssl = 1;				//true
+      opt_use_ssl = 1;				/* true */
       my_free(opt_ssl_ca, MYF(MY_ALLOW_ZERO_PTR));
       opt_ssl_ca = my_strdup(optarg, MYF(0));
       break;
     case OPT_SSL_CAPATH:
-      opt_use_ssl = 1;				//true
+      opt_use_ssl = 1;				/* true */
       my_free(opt_ssl_ca, MYF(MY_ALLOW_ZERO_PTR));
       opt_ssl_ca = my_strdup(optarg, MYF(0));
       break;

libmysql/libmysql.c

@@ -1404,7 +1404,10 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user,
   {
     charset_name=charset_name_buff;
     sprintf(charset_name,"%d",mysql->server_language);	/* In case of errors */
-    mysql->charset=get_charset((uint8) mysql->server_language, MYF(MY_WME));
+    if (!(mysql->charset =
+	  get_charset((uint8) mysql->server_language, MYF(MY_WME))))
+      mysql->charset = default_charset_info; /* shouldn't be fatal */
+
   }
   else
     mysql->charset=default_charset_info;

libmysql/net.c

@@ -50,7 +50,7 @@ ulong net_buffer_length=8192;	/* Default length. Enlarged if necessary */
 #if !defined(__WIN__) && !defined(MSDOS)
 #include <sys/socket.h>
 #else
-#undef MYSQL_SERVER			// Win32 can't handle interrupts
+#undef MYSQL_SERVER			/* Win32 can't handle interrupts */
 #endif
 #if !defined(MSDOS) && !defined(__WIN__) && !defined(HAVE_BROKEN_NETINET_INCLUDES) && !defined(__BEOS__)
 #include <netinet/in_systm.h>
@@ -418,7 +418,7 @@ static void my_net_skip_rest(NET *net, ulong remain, thr_alarm_t *alarmed)
   {
     if (!thr_alarm(alarmed,net->timeout,&alarm_buff) ||
 	(!vio_is_blocking(net->vio) && vio_blocking(net->vio,TRUE) < 0))
-      return;					// Can't setup, abort
+      return;					/* Can't setup, abort */
   }
   while (remain > 0)
   {