Commit a5edb200 authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

Fixed timing problem with rpl000001 replication test. 

Fixed configure problems with HPUX and openbsd
SHOW SLAVE STATUS returns empty set if slave is not initialized
SHOW MASTER STATUS returns empty set if binary logging is not enabled.
Fixed shutdown problem on Solaris.
parent f7c8bd0e

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -493,3 +493,4 @@ sql-bench/innotest2a 
sql-bench/innotest2b

myisam/test2.MYD

myisam/test2.MYI

libmysqld/set_var.cc

Build-tools/Do-compile

+6 −2
Original line number Diff line number Diff line
@@ -118,8 +118,12 @@ if ($opt_stage == 0 && ! $opt_use_old_distribution) 
  safe_system("gunzip < $opt_distribution | $tar xf -");



  # Fix file times; This is needed because the time for files may be

  # in the future

  system("touch timestamp; find . -newer timestamp -print | xargs touch; rm -f timestamp");

  # in the future.  The following is done this way to ensure that

  # we don't get any errors from xargs touch

  system("touch timestamp");

  sleep(2);

  system("touch timestamp2");

  system("find . -newer timestamp -print | xargs touch; rm -f timestamp");

  sleep(2);

  # Ensure that files we don't want to rebuild are newer than other files

  safe_cd($ver);

Docs/manual.texi

+12 −0
Original line number Diff line number Diff line
@@ -8172,6 +8172,11 @@ Renamed mysqld startup options @code{--skip-locking} to 
@code{--skip-external-locking} and @code{--enable-locking} to

@code{--external-locking}.

@item

@code{SHOW MASTER STATUS} now returns an empty set if binary log is not

enabled.

@item

@code{SHOW SLAVE STATUS} now returns an empty set if slave is not initialized.

@item

mysqld now has the option @code{--temp-pool} enabled by default as this

gives better performance with some OS.

@item
@@ -50261,6 +50266,13 @@ each individual 4.0.x release. 














@itemize @bullet















@item













Fixed shutdown problem (SIGTERM signal handling) on Solaris. (Bug from 4.0.2).













@item













@code{SHOW MASTER STATUS} now returns an empty set if binary log is not













enabled.













@item













@code{SHOW SLAVE STATUS} now returns an empty set if slave is not initialized.













@item















Don't update MyISAM index file on update if not strictly necessary.















@item















Fixed bug in @code{SELECT DISTINCT ... FROM many_tables ORDER BY

























client/mysqltest.c



+46
−25






























Original line number
Diff line number
Diff line








@@ -178,7 +178,7 @@ struct connection* cur_con, *next_con, *cons_end;





























enum enum_commands {















Q_CONNECTION=1,     Q_QUERY,













Q_CONNECT,	    Q_SLEEP,













Q_CONNECT,	    Q_SLEEP, Q_REAL_SLEEP, 















Q_INC,		    Q_DEC,















Q_SOURCE,	    Q_DISCONNECT,















Q_LET,		    Q_ECHO,










@@ -213,25 +213,45 @@ struct st_query













  enum enum_commands type;















};





























const char *command_names[] = {













  "connection",       "query",













  "connect",	      "sleep",













  "inc",	      "dec",













  "source",	      "disconnect",













  "let",	      "echo",













  "while",	      "end",













  "system",	      "result",













  "require",	      "save_master_pos",













  "sync_with_master", "error",













  "send",	      "reap",













  "dirty_close",      "replace_result",













  "ping",	      "eval",













  "rpl_probe",	      "enable_rpl_parse",













  "disable_rpl_parse", "eval_result",













  "enable_query_log", "disable_query_log",













  "enable_result_log", "disable_result_log",













  "server_start", "server_stop",













  "require_manager", "wait_for_slave_to_stop",













const char *command_names[]=













{













  "connection",













  "query",













  "connect",













  "sleep",













  "real_sleep",













  "inc",













  "dec",













  "source",













  "disconnect",













  "let",













  "echo",













  "while",













  "end",













  "system",













  "result",













  "require",













  "save_master_pos",













  "sync_with_master",













  "error",













  "send",













  "reap",













  "dirty_close",













  "replace_result",













  "ping",













  "eval",













  "rpl_probe",













  "enable_rpl_parse",













  "disable_rpl_parse",













  "eval_result",













  "enable_query_log",













  "disable_query_log",













  "enable_result_log",













  "disable_result_log",













  "server_start",













  "server_stop",













  "require_manager",













  "wait_for_slave_to_stop",















  "require_version",















  0















};










@@ -973,7 +993,7 @@ int do_sync_with_master(struct st_query* q)













	mysql_errno(mysql), mysql_error(mysql));































  if (!(last_result = res = mysql_store_result(mysql)))













    die("line %u: mysql_store_result() retuned NULL", start_lineno);













    die("line %u: mysql_store_result() returned NULL", start_lineno);















  if (!(row = mysql_fetch_row(res)))















    die("line %u: empty result in %s", start_lineno, query_buf);















  if (!row[0])










@@ -1052,7 +1072,7 @@ int do_disable_rpl_parse(struct st_query* q __attribute__((unused)))













}













































int do_sleep(struct st_query* q)













int do_sleep(struct st_query* q, my_bool real_sleep)















{















  char* p=q->first_argument;















  struct timeval t;









@@ -1064,7 +1084,7 @@ int do_sleep(struct st_query* q)





























#ifdef OS2





























  if (opt_sleep)













  if (opt_sleep && !real_sleep)















    DosSleep( opt_sleep * 1000);















  else















    DosSleep( atof( p) * 1000);









@@ -1072,7 +1092,7 @@ int do_sleep(struct st_query* q)













  return 0;































#else













  if (opt_sleep)













  if (opt_sleep && !real_sleep)















    t.tv_sec = opt_sleep;















  else















  {










@@ -2394,7 +2414,8 @@ int main(int argc, char** argv)













      case Q_ENABLE_RESULT_LOG:  disable_result_log=0; break;















      case Q_DISABLE_RESULT_LOG: disable_result_log=1; break;















      case Q_SOURCE: do_source(q); break;













      case Q_SLEEP: do_sleep(q); break;













      case Q_SLEEP: do_sleep(q, 0); break;













      case Q_REAL_SLEEP: do_sleep(q, 1); break;















      case Q_REQUIRE_VERSION: do_require_version(q); break;















      case Q_WAIT_FOR_SLAVE_TO_STOP: do_wait_for_slave_to_stop(q); break;















      case Q_REQUIRE_MANAGER: do_require_manager(q); break;

































configure.in



+1
−1






























Original line number
Diff line number
Diff line








@@ -893,7 +893,7 @@ case $SYSTEM_TYPE in













  *hpux10.20*)















    echo "Enabling workarounds for hpux 10.20"















    CFLAGS="$CFLAGS -DHAVE_BROKEN_SNPRINTF -DSIGNALS_DONT_BREAK_READ -DDO_NOT_REMOVE_THREAD_WRAPPERS -DHPUX -DSIGNAL_WITH_VIO_CLOSE -DHAVE_BROKEN_PTHREAD_COND_TIMEDWAIT -DHAVE_POSIX1003_4a_MUTEX"













    CXXFLAGS="$CXXFLAGS -DHAVE_BROKEN_SNPRINTF -D_INCLUDE_LONGLONG -DSIGNALS_DONT_BREAK_READ -DDO_NOT_REMOVE_THREAD_WRAPPERS -DHPUX -DSIGNAL_WITH_VIO_CLOSE -DHAVE_BROKEN_PTHREAD_COND_TIMEDWAIT HAVE_POSIX1003_4a_MUTEX"













    CXXFLAGS="$CXXFLAGS -DHAVE_BROKEN_SNPRINTF -D_INCLUDE_LONGLONG -DSIGNALS_DONT_BREAK_READ -DDO_NOT_REMOVE_THREAD_WRAPPERS -DHPUX -DSIGNAL_WITH_VIO_CLOSE -DHAVE_BROKEN_PTHREAD_COND_TIMEDWAIT -DHAVE_POSIX1003_4a_MUTEX"















    if test "$with_named_thread" = "no"















    then 















      echo "Using --with-named-thread=-lpthread"