Commit 5e598cce authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/bug9072 

into neptunus.(none):/home/msvensson/mysql/mysql-4.1
parents 11e01bfa bac06980

include/config-netware.h

+3 −0
Original line number Diff line number Diff line
@@ -79,6 +79,9 @@ extern "C" { 
/* On NetWare, stack grows towards lower address*/

#define STACK_DIRECTION -1



/* On NetWare, to fix the problem with the deletion of open files */

#define CANT_DELETE_OPEN_FILES 1



/* default directory information */

#define	DEFAULT_MYSQL_HOME    "sys:/mysql"

#define PACKAGE               "mysql"

innobase/include/trx0trx.h

+6 −0
Original line number Diff line number Diff line
@@ -346,6 +346,12 @@ struct trx_struct{ 
					in MySQL's binlog write, we will

					flush the log to disk later in

					a separate call */

	ibool		must_flush_log_later;/* this flag is set to TRUE in

					trx_commit_off_kernel() if

					flush_log_later was TRUE, and there

					were modifications by the transaction;

					in that case we must flush the log

					in trx_commit_complete_for_mysql() */

	dulint		commit_lsn;	/* lsn at the time of the commit */

	ibool		dict_operation;	/* TRUE if the trx is used to create

					a table, create an index, or drop a

innobase/trx/trx0trx.c

+9 −1
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ trx_create( 
	trx->check_unique_secondary = TRUE;



	trx->flush_log_later = FALSE;

	trx->must_flush_log_later = FALSE;



	trx->dict_operation = FALSE;
@@ -654,6 +655,8 @@ trx_commit_off_kernel( 
	ut_ad(mutex_own(&kernel_mutex));

#endif /* UNIV_SYNC_DEBUG */



	trx->must_flush_log_later = FALSE;



	rseg = trx->rseg;

	

	if (trx->insert_undo != NULL || trx->update_undo != NULL) {
@@ -821,6 +824,7 @@ trx_commit_off_kernel( 


                if (trx->flush_log_later) {

                        /* Do nothing yet */

			trx->must_flush_log_later = TRUE;

                } else if (srv_flush_log_at_trx_commit == 0) {

                        /* Do nothing */

                } else if (srv_flush_log_at_trx_commit == 1) {
@@ -1539,7 +1543,9 @@ trx_commit_complete_for_mysql( 
	

	trx->op_info = "flushing log";



        if (srv_flush_log_at_trx_commit == 0) {

	if (!trx->must_flush_log_later) {

                /* Do nothing */

        } else if (srv_flush_log_at_trx_commit == 0) {

                /* Do nothing */

        } else if (srv_flush_log_at_trx_commit == 1) {

                if (srv_unix_file_flush_method == SRV_UNIX_NOSYNC) {
@@ -1561,6 +1567,8 @@ trx_commit_complete_for_mysql( 
                ut_error;

        }

	

	trx->must_flush_log_later = FALSE;



	trx->op_info = "";



        return(0);

mysql-test/lib/mtr_cases.pl

+18 −15
Original line number Diff line number Diff line
@@ -63,21 +63,24 @@ sub collect_test_cases ($) { 
  # To speed things up, we sort first in if the test require a restart

  # or not, second in alphanumeric order.



#  @$cases = sort {

#    if ( $a->{'master_restart'} and $b->{'master_restart'} or

#         ! $a->{'master_restart'} and ! $b->{'master_restart'} )

#    {

#      return $a->{'name'} cmp $b->{'name'};

#    }

#    if ( $a->{'master_restart'} )

#    {

#      return 1;                 # Is greater

#    }

#    else

#    {

#      return -1;                # Is less

#    }

#  } @$cases;

  if ( $::opt_reorder )

  {

    @$cases = sort {

      if ( $a->{'master_restart'} and $b->{'master_restart'} or

           ! $a->{'master_restart'} and ! $b->{'master_restart'} )

      {

        return $a->{'name'} cmp $b->{'name'};

      }

      if ( $a->{'master_restart'} )

      {

        return 1;                 # Is greater

      }

      else

      {

        return -1;                # Is less

      }

    } @$cases;

  }



  return $cases;

}

mysql-test/lib/mtr_report.pl

+5 −6
Original line number Diff line number Diff line
@@ -89,12 +89,11 @@ sub mtr_report_test_passed ($) { 
  my $tinfo= shift;



  my $timer=  "";

# FIXME

#  if ( $::opt_timer and -f "$::glob_mysql_test_dir/var/log/timer" )

#  {

#    $timer=  `cat var/log/timer`;

#    $timer=  sprintf "%13s", $timer;

#  }

  if ( $::opt_timer and -f "$::glob_mysql_test_dir/var/log/timer" )

  {

    $timer= mtr_fromfile("$::glob_mysql_test_dir/var/log/timer");

    $timer= sprintf "%12s", $timer;

  }

  $tinfo->{'result'}= 'MTR_RES_PASSED';

  print "[ pass ]   $timer\n";

}