Commit 3fd4d0f7 authored by unknown's avatar unknown
Browse files

Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint_21757 

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-new-maint_21757


tests/mysql_client_test.c:
  Auto merged
client/mysqltest.c:
  manual merge.
parents ae705221 ad0f34e3

tests/mysql_client_test.c

+4 −2
Original line number Diff line number Diff line
@@ -14968,7 +14968,7 @@ static void test_bug17667() 
  strcpy(master_log_filename, opt_vardir);

  strcat(master_log_filename, "/log/master.log");

  printf("Opening '%s'\n", master_log_filename);

  log_file= fopen(master_log_filename, "r");

  log_file= my_fopen(master_log_filename, (int) (O_RDONLY | O_BINARY), MYF(MY_WME));

  free(master_log_filename);



  if (log_file != NULL) {
@@ -14993,6 +14993,8 @@ static void test_bug17667() 
            DIE("Read error");

          }

        }

        /* Print the line */

        printf("%s", line_buffer);



      } while (my_memmem(line_buffer, MAX_TEST_QUERY_LENGTH*2,

            statement_cursor->buffer, statement_cursor->length) == NULL);
@@ -15013,7 +15015,7 @@ static void test_bug17667() 
  }



  if (log_file != NULL)

    fclose(log_file);

    my_fclose(log_file, MYF(0));



}