5.1 merge

plugin/feedback/utils.cc

@@ -188,24 +188,24 @@ int fill_plugin_version(THD *thd, TABLE_LIST *tables)
 */
 static ulonglong my_getphysmem()
 {
+#ifdef _WIN32
+  MEMORYSTATUSEX memstatus;
+  memstatus.dwLength= sizeof(memstatus);
+  GlobalMemoryStatusEx(&memstatus);
+  return memstatus.ullTotalPhys;
+#else
   ulonglong pages= 0;
+
 #ifdef _SC_PHYS_PAGES
   pages= sysconf(_SC_PHYS_PAGES);
-#else
-  return 0;
 #endif
 
 #ifdef _SC_PAGESIZE
   return pages * sysconf(_SC_PAGESIZE);
-#endif
-#ifdef _WIN32
-  MEMORYSTATUSEX memstatus;
-  memstatus.dwLength= sizeof(memstatus);
-  GlobalMemoryStatusEx(&memstatus);
-  return memstatus.ullTotalPhys;
 #else
   return pages * my_getpagesize();
 #endif
+#endif
 }
 
 /* get the number of (online) CPUs */
@@ -356,6 +356,7 @@ int fill_misc_data(THD *thd, TABLE_LIST *tables)
   INSERT1("Cpu_count", (my_getncpus(), UNSIGNED));
 #endif
   INSERT1("Mem_total", (my_getphysmem(), UNSIGNED));
+  INSERT1("Now", (thd->query_start(), UNSIGNED));
 
   return 0;
 }

sql-common/my_time.c

@@ -337,7 +337,7 @@ str_to_datetime(const char *str, uint length, MYSQL_TIME *l_time,
         {
           if (str[0] == 'p' || str[0] == 'P')
             add_hours= 12;
-          else if (str[0] != 'a' || str[0] != 'A')
+          else if (str[0] != 'a' && str[0] != 'A')
             continue;                           /* Not AM/PM */
           str+= 2;                              /* Skip AM/PM */
           /* Skip space after AM/PM */

sql/records.cc

@@ -627,7 +627,7 @@ static int rr_cmp(uchar *a,uchar *b)
   if (a[4] != b[4])
     return (int) a[4] - (int) b[4];
   if (a[5] != b[5])
-    return (int) a[1] - (int) b[5];
+    return (int) a[5] - (int) b[5];
   if (a[6] != b[6])
     return (int) a[6] - (int) b[6];
   return (int) a[7] - (int) b[7];

storage/xtradb/handler/ha_innodb.cc

@@ -6972,7 +6972,7 @@ ha_innobase::create(
 
 	if (srv_file_per_table
 	    && !mysqld_embedded
-	    && (!create_info->options & HA_LEX_CREATE_TMP_TABLE)) {
+	    && !(create_info->options & HA_LEX_CREATE_TMP_TABLE)) {
 
 		if ((name[1] == ':')
 		    || (name[0] == '\\' && name[1] == '\\')) {