Commit 36421c83 authored by unknown's avatar unknown
Browse files

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 

into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0


sql/item_strfunc.cc:
  Auto merged
parents abe951ab 98a3bae3

VC++Files/sql/mysqld.dsp

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ BSC32=bscmake.exe 
# ADD BSC32 /nologo

LINK32=xilink6.exe

# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Wsock32.lib ..\lib_debug\dbug.lib ..\lib_debug\vio.lib ..\lib_debug\mysys.lib ..\lib_debug\strings.lib ..\lib_debug\regex.lib ..\lib_debug\heap.lib ..\lib_debug\bdb.lib ..\lib_debug\innodb.lib ..\extra\yassl\Release\yassl.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:"../client_debug/mysqld-debug.exe" /pdbtype:sept

# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Wsock32.lib ..\lib_debug\dbug.lib ..\lib_debug\vio.lib ..\lib_debug\mysys.lib ..\lib_debug\strings.lib ..\lib_debug\regex.lib ..\lib_debug\heap.lib ..\lib_debug\bdb.lib ..\lib_debug\innodb.lib ..\extra\yassl\Debug\yassl.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:"../client_debug/mysqld-debug.exe" /pdbtype:sept



!ELSEIF  "$(CFG)" == "mysqld - Win32 nt"

VC++Files/tests/mysql_client_test.dsp

+4 −4
Original line number Diff line number Diff line
@@ -51,8 +51,8 @@ BSC32=bscmake.exe 
# ADD BASE BSC32 /nologo 

# ADD BSC32 /nologo 

LINK32=link.exe

# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib mysys.lib regex.lib ..\extra\yassl\Release\yassl.lib /nologo /out:"..\mysql_client_test.exe" /incremental:yes /libpath:"..\lib_debug\" /debug /pdb:".\Debug\mysql_client_test.pdb" /pdbtype:sept /map:".\Debug\mysql_client_test.map" /subsystem:console 

# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib mysys.lib regex.lib ..\extra\yassl\Release\yassl.lib /nologo /out:"..\mysql_client_test.exe" /incremental:yes /libpath:"..\lib_debug\" /debug /pdb:".\Debug\mysql_client_test.pdb" /pdbtype:sept /map:".\Debug\mysql_client_test.map" /subsystem:console 

# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib mysys.lib regex.lib ..\extra\yassl\Debug\yassl.lib /nologo /out:"..\client_debug\mysql_client_test.exe" /incremental:yes /libpath:"..\lib_debug\" /debug /pdb:".\Debug\mysql_client_test.pdb" /pdbtype:sept /map:".\Debug\mysql_client_test.map" /subsystem:console 

# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib mysys.lib regex.lib ..\extra\yassl\Debug\yassl.lib /nologo /out:"..\client_debug\mysql_client_test.exe" /incremental:yes /libpath:"..\lib_debug\" /debug /pdb:".\Debug\mysql_client_test.pdb" /pdbtype:sept /map:".\Debug\mysql_client_test.map" /subsystem:console 



!ELSEIF  "$(CFG)" == "mysql_client_test - Win32 Release"
@@ -76,8 +76,8 @@ BSC32=bscmake.exe 
# ADD BASE BSC32 /nologo 

# ADD BSC32 /nologo 

LINK32=link.exe

# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib Ws2_32.lib mysqlclient.lib mysys.lib regex.lib ..\extra\yassl\Release\yassl.lib /nologo /out:"..\mysql_client_test.exe" /incremental:no /pdb:".\Release\mysql_client_test.pdb" /pdbtype:sept /subsystem:console 

# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib Ws2_32.lib mysqlclient.lib mysys.lib regex.lib ..\extra\yassl\Release\yassl.lib /nologo /out:"..\mysql_client_test.exe" /incremental:no /pdb:".\Release\mysql_client_test.pdb" /pdbtype:sept /subsystem:console 

# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib Ws2_32.lib mysqlclient.lib mysys.lib regex.lib ..\extra\yassl\Release\yassl.lib /nologo /out:"..\client_release\mysql_client_test.exe" /incremental:no /pdb:".\Release\mysql_client_test.pdb" /pdbtype:sept /subsystem:console 

# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib Ws2_32.lib mysqlclient.lib mysys.lib regex.lib ..\extra\yassl\Release\yassl.lib /nologo /out:"..\client_release\mysql_client_test.exe" /incremental:no /pdb:".\Release\mysql_client_test.pdb" /pdbtype:sept /subsystem:console 



!ENDIF

mysql-test/lib/mtr_misc.pl

+6 −5
Original line number Diff line number Diff line
@@ -83,18 +83,19 @@ sub mtr_script_exists (@) { 
}



sub mtr_exe_exists (@) {

  foreach my $path ( @_ )

  my @path= @_;

  map {$_.= ".exe"} @path if $::glob_win32;

  foreach my $path ( @path )

  {

    $path.= ".exe" if $::opt_win32;

    return $path if -x $path;

  }

  if ( @_ == 1 )

  if ( @path == 1 )

  {

    mtr_error("Could not find $_[0]");

    mtr_error("Could not find $path[0]");

  }

  else

  {

    mtr_error("Could not find any of " . join(" ", @_));

    mtr_error("Could not find any of " . join(" ", @path));

  }

}

mysql-test/mysql-test-run.pl

+20 −12
Original line number Diff line number Diff line
@@ -419,7 +419,8 @@ sub initial_setup () { 
  {

    # Windows programs like 'mysqld' needs Windows paths

    $glob_mysql_test_dir= `cygpath -m $glob_mysql_test_dir`;

    $glob_cygwin_shell=   `cygpath -w $ENV{'SHELL'}`; # The Windows path c:\...

    my $shell= $ENV{'SHELL'} || "/bin/bash";

    $glob_cygwin_shell=   `cygpath -w $shell`; # The Windows path c:\...

    chomp($glob_mysql_test_dir);

    chomp($glob_cygwin_shell);

  }
@@ -791,13 +792,15 @@ sub executable_setup () { 
      my $path_examples= "$glob_basedir/libmysqld/examples";

      $exe_mysqltest=    mtr_exe_exists("$path_examples/mysqltest");

      $exe_mysql_client_test=

        mtr_exe_exists("$path_examples/mysql_client_test_embedded");

        mtr_exe_exists("$path_examples/mysql_client_test_embedded",

		       "/usr/bin/false");

    }

    else

    {

      $exe_mysqltest=  mtr_exe_exists("$path_client_bindir/mysqltest");

      $exe_mysql_client_test=

        mtr_exe_exists("$glob_basedir/tests/mysql_client_test");

        mtr_exe_exists("$glob_basedir/tests/mysql_client_test",

		       "/usr/bin/false");

    }

    $exe_mysqldump=      mtr_exe_exists("$path_client_bindir/mysqldump");

    $exe_mysqlshow=      mtr_exe_exists("$path_client_bindir/mysqlshow");
@@ -819,7 +822,8 @@ sub executable_setup () { 
    $exe_mysqladmin=     mtr_exe_exists("$path_client_bindir/mysqladmin");

    $exe_mysql=          mtr_exe_exists("$path_client_bindir/mysql");

    $exe_mysql_fix_system_tables=

      mtr_script_exists("$path_client_bindir/mysql_fix_privilege_tables");

      mtr_script_exists("$path_client_bindir/mysql_fix_privilege_tables",

			"$glob_basedir/scripts/mysql_fix_privilege_tables");



    $path_language=      mtr_path_exists("$glob_basedir/share/mysql/english/",

                                         "$glob_basedir/share/english/");
@@ -833,13 +837,15 @@ sub executable_setup () { 
      $exe_mysqltest= mtr_exe_exists("$path_client_bindir/mysqltest_embedded");

      $exe_mysql_client_test=

        mtr_exe_exists("$glob_basedir/tests/mysql_client_test_embedded",

                       "$path_client_bindir/mysql_client_test_embedded");

                       "$path_client_bindir/mysql_client_test_embedded",

		       "/usr/bin/false");

    }

    else

    {

      $exe_mysqltest= mtr_exe_exists("$path_client_bindir/mysqltest");

      $exe_mysql_client_test=

        mtr_exe_exists("$path_client_bindir/mysql_client_test");

        mtr_exe_exists("$path_client_bindir/mysql_client_test",

		       "/usr/bin/false"); # FIXME temporary

    }



    $path_ndb_tools_dir=  "$glob_basedir/bin";
@@ -1548,7 +1554,7 @@ sub do_before_start_master ($$) { 
       $tname ne "rpl_crash_binlog_ib_3b")

  {

    # FIXME we really want separate dir for binlogs

    foreach my $bin ( glob("$opt_vardir/log/master*-bin.*") )

    foreach my $bin ( glob("$opt_vardir/log/master*-bin*") )

    {

      unlink($bin);

    }
@@ -1586,13 +1592,13 @@ sub do_before_start_slave ($$) { 
       $tname ne "rpl_crash_binlog_ib_3b" )

  {

    # FIXME we really want separate dir for binlogs

    foreach my $bin ( glob("$opt_vardir/log/slave*-bin.*") )

    foreach my $bin ( glob("$opt_vardir/log/slave*-bin*") )

    {

      unlink($bin);

    }

    # FIXME really master?!

    unlink("$opt_vardir/slave-data/master.info");

    unlink("$opt_vardir/slave-data/relay-log.info");

    unlink("$slave->[0]->{'path_myddir'}/master.info");

    unlink("$slave->[0]->{'path_myddir'}/relay-log.info");

  }



  # Run slave initialization shell script if one exists
@@ -1606,8 +1612,10 @@ sub do_before_start_slave ($$) { 
    }

  }



  `rm -f $opt_vardir/slave-data/log.*`;

#  unlink("$opt_vardir/slave-data/log.*");

  foreach my $bin ( glob("$slave->[0]->{'path_myddir'}/log.*") )

  {

    unlink($bin);

  }

}



sub mysqld_arguments ($$$$$) {

sql/examples/ha_archive.cc

+5 −5
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ int ha_archive::write_data_header(gzFile file_to_write) 
  This method reads the header of a meta file and returns whether or not it was successful.

  *rows will contain the current number of rows in the data file upon success.

*/

int ha_archive::read_meta_file(File meta_file, ulonglong *rows)

int ha_archive::read_meta_file(File meta_file, ha_rows *rows)

{

  uchar meta_buffer[META_BUFFER_SIZE];

  ulonglong check_point;
@@ -273,7 +273,7 @@ int ha_archive::read_meta_file(File meta_file, ulonglong *rows) 
  /*

    Parse out the meta data, we ignore version at the moment

  */

  *rows= uint8korr(meta_buffer + 2);

  *rows= (ha_rows)uint8korr(meta_buffer + 2);

  check_point= uint8korr(meta_buffer + 10);



  DBUG_PRINT("ha_archive::read_meta_file", ("Check %d", (uint)meta_buffer[0]));
@@ -296,7 +296,7 @@ int ha_archive::read_meta_file(File meta_file, ulonglong *rows) 
  By setting dirty you say whether or not the file represents the actual state of the data file.

  Upon ::open() we set to dirty, and upon ::close() we set to clean.

*/

int ha_archive::write_meta_file(File meta_file, ulonglong rows, bool dirty)

int ha_archive::write_meta_file(File meta_file, ha_rows rows, bool dirty)

{

  uchar meta_buffer[META_BUFFER_SIZE];

  ulonglong check_point= 0; //Reserved for the future
@@ -787,7 +787,7 @@ int ha_archive::rnd_pos(byte * buf, byte *pos) 
  DBUG_ENTER("ha_archive::rnd_pos");

  statistic_increment(table->in_use->status_var.ha_read_rnd_next_count,

		      &LOCK_status);

  current_position= my_get_ptr(pos, ref_length);

  current_position= (z_off_t)my_get_ptr(pos, ref_length);

  (void)gzseek(archive, current_position, SEEK_SET);



  DBUG_RETURN(get_row(archive, buf));
@@ -801,7 +801,7 @@ int ha_archive::repair(THD* thd, HA_CHECK_OPT* check_opt) 
{

  int rc;

  byte *buf; 

  ulonglong rows_recorded= 0;

  ha_rows rows_recorded= 0;

  gzFile rebuild_file; // Archive file we are working with 

  File meta_file; // Meta file we use 

  char data_file_name[FN_REFLEN];