bzr push into mysql-5.1-bugteam branch (magnus.blaudd:3149 to 3151) Bug#47129

[Magnus Blåudd]

 3151 Magnus Blåudd	2009-10-08
      BUG#47129 fix small bug in test

    modified:
      mysql-test/suite/binlog/t/binlog_stm_unsafe_warning.test
 3150 Magnus Blåudd	2009-10-08 [merge]
      Merge

    removed:
      mysys/mf_strip.c
    modified:
      include/my_sys.h
      mysys/CMakeLists.txt
      mysys/Makefile.am
      sql/mysql_priv.h.pp
 3149 Magnus Blåudd	2009-10-08
      Merge

    modified:
      mysql-test/suite/binlog/t/binlog_stm_unsafe_warning.test
=== modified file 'include/my_sys.h'
--- a/include/my_sys.h	2009-09-29 15:38:40 +0000
+++ b/include/my_sys.h	2009-10-06 11:04:51 +0000
@@ -720,7 +720,6 @@ extern int wild_compare(const char *str,
 extern WF_PACK *wf_comp(char * str);
 extern int wf_test(struct wild_file_pack *wf_pack,const char *name);
 extern void wf_end(struct wild_file_pack *buffer);
-extern size_t strip_sp(char * str);
 extern my_bool array_append_string_unique(const char *str,
                                           const char **array, size_t size);
 extern void get_date(char * to,int timeflag,time_t use_time);

=== modified file 'mysql-test/suite/binlog/t/binlog_stm_unsafe_warning.test'
--- a/mysql-test/suite/binlog/t/binlog_stm_unsafe_warning.test	2009-10-08 11:25:11 +0000
+++ b/mysql-test/suite/binlog/t/binlog_stm_unsafe_warning.test	2009-10-08 12:00:43 +0000
@@ -94,22 +94,22 @@ DROP TABLE t1;
 
 SET GLOBAL log_warnings = @old_log_warnings;
 
-let $log_error= `SELECT @@GLOBAL.log_error`;
-if(!$log_error)
+let $log_error_= `SELECT @@GLOBAL.log_error`;
+if(!`select LENGTH('$log_error_')`)
 {
   # MySQL Server on windows is started with --console and thus
   # does not know the location of its .err log, use default location
-  let $log_error = $MYSQLTEST_VARDIR/log/mysqld.1.err;
+  let $log_error_ = $MYSQLTEST_VARDIR/log/mysqld.1.err;
 }
 # Assign env variable LOG_ERROR
-let LOG_ERROR=$log_error;
+let LOG_ERROR=$log_error_;
 
 --echo # Count the number of times the "Unsafe" message was printed
 --echo # to the error log.
 
 perl;
   use strict;
-  my $log_error= $ENV{'LOG_ERROR'} || die "LOG_ERROR not set";
+  my $log_error= $ENV{'LOG_ERROR'} or die "LOG_ERROR not set";
   open(FILE, "$log_error") or die("Unable to open $log_error: $!\n");
   my $count = () = grep(/Bug#46265/g,<FILE>);
   print "Occurrences: $count\n";

=== modified file 'mysys/CMakeLists.txt'
--- a/mysys/CMakeLists.txt	2008-06-18 16:17:15 +0000
+++ b/mysys/CMakeLists.txt	2009-10-06 11:04:51 +0000
@@ -29,7 +29,7 @@ SET(MYSYS_SOURCES  array.c charset-def.c
 				errors.c hash.c list.c md5.c mf_brkhant.c mf_cache.c mf_dirname.c mf_fn_ext.c
 				mf_format.c mf_getdate.c mf_iocache.c mf_iocache2.c mf_keycache.c 
 				mf_keycaches.c mf_loadpath.c mf_pack.c mf_path.c mf_qsort.c mf_qsort2.c
-				mf_radix.c mf_same.c mf_sort.c mf_soundex.c mf_strip.c mf_arr_appstr.c mf_tempdir.c
+				mf_radix.c mf_same.c mf_sort.c mf_soundex.c mf_arr_appstr.c mf_tempdir.c
 				mf_tempfile.c mf_unixpath.c mf_wcomp.c mf_wfile.c mulalloc.c my_access.c
 				my_aes.c my_alarm.c my_alloc.c my_append.c my_bit.c my_bitmap.c my_chsize.c
 				my_clock.c my_compress.c my_conio.c my_copy.c my_crc32.c my_create.c my_delete.c

=== modified file 'mysys/Makefile.am'
--- a/mysys/Makefile.am	2009-09-17 16:34:24 +0000
+++ b/mysys/Makefile.am	2009-10-06 11:04:51 +0000
@@ -35,7 +35,7 @@ libmysys_a_SOURCES =    my_init.c my_get
 			my_error.c errors.c my_div.c my_messnc.c \
 			mf_format.c mf_same.c mf_dirname.c mf_fn_ext.c \
 			my_symlink.c my_symlink2.c \
-			mf_pack.c mf_unixpath.c mf_strip.c mf_arr_appstr.c \
+			mf_pack.c mf_unixpath.c mf_arr_appstr.c \
 			mf_wcomp.c mf_wfile.c my_gethwaddr.c \
 			mf_qsort.c mf_qsort2.c mf_sort.c \
 			ptr_cmp.c mf_radix.c queues.c my_getncpus.c \

=== removed file 'mysys/mf_strip.c'
--- a/mysys/mf_strip.c	2007-05-10 09:59:39 +0000
+++ b/mysys/mf_strip.c	1970-01-01 00:00:00 +0000
@@ -1,45 +0,0 @@
-/* Copyright (C) 2000 MySQL AB
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
-
-/* T|mmer en str{ng p{ slut_space */
-
-#include "mysys_priv.h"
-
-/*
-	strip_sp(char * str)
-	Strips end-space from string and returns new length.
-*/
-
-size_t strip_sp(register char * str)
-{
-  reg2 char * found;
-  reg3 char * start;
-
-  start=found=str;
-
-  while (*str)
-  {
-    if (*str != ' ')
-    {
-      while (*++str && *str != ' ') {};
-      if (!*str)
-	return (size_t) (str-start);	/* Return stringlength */
-    }
-    found=str;
-    while (*++str == ' ') {};
-  }
-  *found= '\0';				/* Stripp at first space */
-  return (size_t) (found-start);
-} /* strip_sp */

=== modified file 'sql/mysql_priv.h.pp'
--- a/sql/mysql_priv.h.pp	2008-06-17 12:27:04 +0000
+++ b/sql/mysql_priv.h.pp	2009-10-06 11:04:51 +0000
@@ -773,7 +773,6 @@ extern int wild_compare(const char *str,
 extern WF_PACK *wf_comp(char * str);
 extern int wf_test(struct wild_file_pack *wf_pack,const char *name);
 extern void wf_end(struct wild_file_pack *buffer);
-extern size_t strip_sp(char * str);
 extern my_bool array_append_string_unique(const char *str,
                                           const char **array, size_t size);
 extern void get_date(char * to,int timeflag,time_t use_time);

Attachment: [text/bzr-bundle] bzr/[e-mail]