List:Commits« Previous MessageNext Message »
From:msvensson Date:July 30 2006 5:30pm
Subject:bk commit into 4.1 tree (msvensson:1.2471) BUG#21217
View as plain text  
Below is the list of changes that have just been committed into a local
4.1 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-07-30 19:30:20+02:00, msvensson@shellback.(none) +1 -0
  BUG#21217 "mysqltest" client is inconsistent when to log a line number
   - Init start_lineno to 0

  client/mysqltest.c@stripped, 2006-07-30 19:30:17+02:00, msvensson@shellback.(none) +4 -2
    Init start_lineno to 0 and set it back to zero before comparing result file.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	shellback.(none)
# Root:	/home/msvensson/mysql/bug21217/my41-bug21217

--- 1.194/client/mysqltest.c	2006-07-30 19:30:26 +02:00
+++ 1.195/client/mysqltest.c	2006-07-30 19:30:26 +02:00
@@ -147,7 +147,7 @@
 static int port = 0;
 static my_bool opt_big_test= 0, opt_compress= 0, silent= 0, verbose = 0;
 static my_bool tty_password= 0, ps_protocol= 0, ps_protocol_enabled= 0;
-static uint start_lineno, *lineno;
+static uint start_lineno= 0, *lineno;
 const char *manager_user="root",*manager_host=0;
 char *manager_pass=0;
 int manager_port=MYSQL_MANAGER_PORT;
@@ -580,7 +580,7 @@
     if (cur_file && cur_file != file_stack)
       fprintf(stderr, "In included file \"%s\": ",
               cur_file->file_name);
-    if (start_lineno != 0)
+    if (start_lineno > 0)
       fprintf(stderr, "At line %u: ", start_lineno);
     vfprintf(stderr, fmt, args);
     fprintf(stderr, "\n");
@@ -4071,6 +4071,8 @@
 
     parser.current_line += current_line_inc;
   }
+
+  start_lineno= 0;
 
   if (!query_executed && result_file && my_stat(result_file, &res_info, 0))
   {
Thread
bk commit into 4.1 tree (msvensson:1.2471) BUG#21217msvensson31 Jul