Commit 8ea5f31a authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 

into  bodhi.local:/opt/local/work/mysql-5.0-14897


configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/im_life_cycle.result:
  Auto merged
mysql-test/t/im_life_cycle.imtest:
  Auto merged
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
mysql-test/r/grant.result:
  Manual merge.
mysql-test/r/view.result:
  Manual merge.
mysql-test/t/grant.test:
  Manual merge.
mysql-test/t/view.test:
  Manual merge.
parents 01ec88dc 4355ea5a

BitKeeper/etc/collapsed

+3 −0
Original line number Diff line number Diff line 
44d03f27qNdqJmARzBoP3Is_cN5e0w

44ec850ac2k4y2Omgr92GiWPBAVKGQ

44edb86b1iE5knJ97MbliK_3lCiAXA

44f33f3aj5KW5qweQeekY1LU0E9ZCg

include/mysql_com.h

+6 −0
Original line number Diff line number Diff line
@@ -209,7 +209,13 @@ typedef struct st_net { 
  char last_error[MYSQL_ERRMSG_SIZE], sqlstate[SQLSTATE_LENGTH+1];

  unsigned int last_errno;

  unsigned char error;



  /*

    'query_cache_query' should be accessed only via query cache

    functions and methods to maintain proper locking.

  */

  gptr query_cache_query;



  my_bool report_error; /* We should report error (we have unreported error) */

  my_bool return_errno;

} NET;

mysql-test/include/im_check_env.inc

+2 −4
Original line number Diff line number Diff line
@@ -2,10 +2,6 @@ 
# that ensure that starting conditions (environment) for the IM-test are as

# expected.



# Wait for mysqld1 (guarded instance) to start.



--exec $MYSQL_TEST_DIR/t/wait_for_process.sh $IM_MYSQLD1_PATH_PID 30 started



# Check the running instances.



--connect (mysql1_con,localhost,root,,mysql,$IM_MYSQLD1_PORT,$IM_MYSQLD1_SOCK)
@@ -14,6 +10,8 @@ 


SHOW VARIABLES LIKE 'server_id';



--source include/not_windows.inc



--connection default



# Let IM detect that mysqld1 is online. This delay should be longer than

mysql-test/include/im_check_os.inc

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
--connect (dflt_server_con,localhost,root,,mysql,$IM_MYSQLD1_PORT,$IM_MYSQLD1_SOCK)

--connection dflt_server_con



--source include/not_windows.inc



--connection default

--disconnect dflt_server_con

mysql-test/lib/mtr_io.pl

+32 −6
Original line number Diff line number Diff line
@@ -19,13 +19,39 @@ sub mtr_tonewfile($@); 
##############################################################################



sub mtr_get_pid_from_file ($) {

  my $file=  shift;

  my $pid_file_path=  shift;

  my $TOTAL_ATTEMPTS= 30;

  my $timeout= 1;



  # We should read from the file until we get correct pid. As it is

  # stated in BUG#21884, pid file can be empty at some moment. So, we should

  # read it until we get valid data.



  for (my $cur_attempt= 1; $cur_attempt <= $TOTAL_ATTEMPTS; ++$cur_attempt)

  {

    mtr_debug("Reading pid file '$pid_file_path' " .

              "($cur_attempt of $TOTAL_ATTEMPTS)...");



    open(FILE, '<', $pid_file_path)

      or mtr_error("can't open file \"$pid_file_path\": $!");



  open(FILE,"<",$file) or mtr_error("can't open file \"$file\": $!");

    my $pid= <FILE>;

  chomp($pid);



    chomp($pid) if defined $pid;



    close FILE;

  return $pid;



    return $pid if defined $pid && $pid ne '';



    mtr_debug("Pid file '$pid_file_path' is empty. " .

              "Sleeping $timeout second(s)...");



    sleep(1);

  }



  mtr_error("Pid file '$pid_file_path' is corrupted. " .

            "Can not retrieve PID in " .

            ($timeout * $TOTAL_ATTEMPTS) . " seconds.");

}



sub mtr_get_opts_from_file ($) {