merge with 3.23.44

BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
Docs/manual.texi:
  Auto merged
include/my_base.h:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/join.test:
  Auto merged
mysql-test/t/rpl000012.test:
  Auto merged
BUILD/FINISH.sh:
  Auto merged
BitKeeper/deleted/.del-db_ext.h~a1e210bbd0de0a48:
  Auto merged
BitKeeper/deleted/.del-mutex_ext.h~f20f47ddc346598b:
  Auto merged
BitKeeper/deleted/.del-violite.c~984c09cffe14a11b:
  Auto merged
BitKeeper/deleted/.del-violite.c~d7b85be615595ace:
  Auto merged
Build-tools/Do-all-build-steps:
  Auto merged
client/client_priv.h:
  Auto merged
client/mysqladmin.c:
  Auto merged
innobase/include/srv0srv.h:
  Auto merged
innobase/include/univ.i:
  Auto merged
innobase/log/log0log.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
isam/pack_isam.c:
  Auto merged
libmysql_r/Makefile.am:
  Auto merged
myisam/myisamchk.c:
  Auto merged
mysql-test/t/having.test:
  Auto merged
mysql-test/t/rpl000015-slave.sh:
  Auto merged
mysql-test/t/rpl000016-slave.sh:
  Auto merged
mysys/mf_cache.c:
  Auto merged
mysys/mf_casecnv.c:
  Auto merged
mysys/mf_tempfile.c:
  Auto merged
readline/vi_mode.c:
  Auto merged
strings/strto.c:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/time.cc:
  Auto merged
BUILD/SETUP.sh:
  Use -mcpu as default (safe for all x86 cpu's)
client/mysqldump.c:
  Merge from 3.23.44
configure.in:
  Update version number
extra/resolveip.c:
  Portability fix

3 files changed, 5 insertions, 6 deletions

diff --git a/strings/ctype.c b/strings/ctype.c
index b343ff44bcd..dc827e1a471 100644
--- a/strings/ctype.c
+++ b/strings/ctype.c
@@ -16,7 +16,6 @@
    MA 02111-1307, USA */
 
 #include <my_global.h>
-
 #include <m_ctype.h>
 #include <m_string.h>
 
diff --git a/strings/strto.c b/strings/strto.c
index adada98e143..72ab29caed3 100644
--- a/strings/strto.c
+++ b/strings/strto.c
@@ -197,7 +197,7 @@ function (const char *nptr,char **endptr,int base)
   }
 
   /* Return the result of the appropriate sign.  */
-  return (negative ? -((longtype) i) : i);
+  return (negative ? -((longtype) i) : (longtype) i);
 
 noconv:
   /* There was no number to convert.  */
diff --git a/strings/t_ctype.h b/strings/t_ctype.h
index 6aca3fa911c..6699244c1f4 100644
--- a/strings/t_ctype.h
+++ b/strings/t_ctype.h
@@ -123,7 +123,7 @@ enum l1_symbols {
     L1_SARA_AE,
     L1_SARA_O,
     L1_SARA_AI_MAIMUAN,
-    L1_SARA_AI_MAIMALAI,
+    L1_SARA_AI_MAIMALAI
 };
   
 // level 2 symbols & order
@@ -137,7 +137,7 @@ enum l2_symbols {
     L2_TONE1,
     L2_TONE2,
     L2_TONE3,
-    L2_TONE4,
+    L2_TONE4
 };
   
 // level 3 symbols & order
@@ -182,7 +182,7 @@ enum l3_symbols {
     L3_LESS_THAN,
     L3_EQUAL,
     L3_GREATER_THAN,
-    L3_V_LINE,
+    L3_V_LINE
 };
 
 // level 4 symbols & order
@@ -190,7 +190,7 @@ enum l4_symbols {
     L4_BLANK = TOT_LEVELS,
     L4_MIN,
     L4_CAP,
-    L4_EXT,
+    L4_EXT
 };
 
 enum level_symbols {