Added locks needed for Innobase

Fixed mutex problem when doing automatic repair of MyISAM tables


Docs/manual.texi:
  changelog
include/thr_lock.h:
  Added TL_READ_WITH_SHARED_LOCKS for Innobase
mysql-test/r/update.result:
  Added 'select' to verify update results
mysql-test/t/update.test:
  Better code coverage
mysys/getvar.c:
  Allow space in to --set-variable
mysys/thr_lock.c:
  Added TL_READ_WITH_SHARED_LOCKS
sql/ha_myisam.cc:
  Added comment
sql/lock.cc:
  Added missing broadcast
sql/sql_base.cc:
  Fixed some mutex problem when doing automatic repair of MyISAM tables
sql/sql_update.cc:
  Purecoverage

1 files changed, 11 insertions, 3 deletions

diff --git a/mysys/getvar.c b/mysys/getvar.c
index 1d452002490..a86215ea56b 100644
--- a/mysys/getvar.c
+++ b/mysys/getvar.c
@@ -52,11 +52,17 @@ my_bool set_changeable_var(my_string str,CHANGEABLE_VAR *vars)
       fprintf(stderr,"Can't find '=' in expression '%s' to option -O\n",str);
     else
     {
-      uint length=(uint) (end-str),found_count=0;
-      CHANGEABLE_VAR *var,*found;
+      uint length,found_count=0;
+      CHANGEABLE_VAR *var,*found, *var_end;
       const char *name;
       long num;
 
+      /* Skip end space from variable */
+      for (var_end=end ; end > str && is_space(end[-1]) ; end--) ;
+      length=(uint) (var_end-str);
+      /* Skip start space from argument */
+      for (end++ ; is_space(*end) ; end++) ;
+
       for (var=vars,found=0 ; (name=var->name) ; var++)
       {
 	if (!my_casecmp(name,str,length))
@@ -80,11 +86,13 @@ my_bool set_changeable_var(my_string str,CHANGEABLE_VAR *vars)
 	DBUG_RETURN(1);
       }
 
-      num=(long) atol(end+1); endchar=strend(end+1)[-1];
+      num=(long) atol(end); endchar=strend(end)[-1];
       if (endchar == 'k' || endchar == 'K')
 	num*=1024;
       else if (endchar == 'm' || endchar == 'M')
 	num*=1024L*1024L;
+      else if (endchar == 'g' || endchar == 'G')
+	num*=1024L*1024L*1024L;
       else if (!isdigit(endchar))
       {
 	fprintf(stderr,"Unknown prefix used for variable value '%s'\n",str);