Commit 90c926d9 authored by unknown's avatar unknown
Browse files

Merge shellback.(none):/home/msvensson/mysql/mysql-5.0 

into  shellback.(none):/home/msvensson/mysql/mysql-5.1


client/mysqltest.c:
  Auto merged
include/config-win.h:
  Auto merged
include/m_ctype.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
strings/ctype-bin.c:
  Auto merged
strings/ctype-euc_kr.c:
  Auto merged
strings/ctype-gb2312.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
parents 045d42e5 a1c46189

client/mysqltest.c

+9 −2
Original line number Diff line number Diff line
@@ -463,6 +463,7 @@ static VAR* var_init(VAR* v, const char *name, int name_len, const char *val, 
static void var_free(void* v);



void dump_result_to_reject_file(const char *record_file, char *buf, int size);

void dump_result_to_log_file(const char *record_file, char *buf, int size);



int close_connection(struct st_query*);

static void set_charset(struct st_query*);
@@ -671,9 +672,9 @@ static void die(const char *fmt, ...) 
  }

  va_end(args);



  /* Dump the result that has been accumulated so far to reject file */

  /* Dump the result that has been accumulated so far to .log file */

  if (result_file && ds_res.length)

    dump_result_to_reject_file(result_file, ds_res.str, ds_res.length);

    dump_result_to_log_file(result_file, ds_res.str, ds_res.length);



  /* Clean up and exit */

  free_used_memory();
@@ -3500,6 +3501,12 @@ void dump_result_to_reject_file(const char *record_file, char *buf, int size) 
  str_to_file(fn_format(reject_file, record_file,"",".reject",2), buf, size);

}



void dump_result_to_log_file(const char *record_file, char *buf, int size)

{

  char log_file[FN_REFLEN];

  str_to_file(fn_format(log_file, record_file,"",".log",2), buf, size);

}



static void check_regerr(my_regex_t* r, int err)

{

  char err_buf[1024];

include/config-win.h

+15 −0
Original line number Diff line number Diff line
@@ -422,8 +422,15 @@ inline double ulonglong2double(ulonglong value) 


#define shared_memory_buffer_length 16000

#define default_shared_memory_base_name "MYSQL"



#ifdef CYBOZU

#define MYSQL_DEFAULT_CHARSET_NAME "utf8"

#define MYSQL_DEFAULT_COLLATION_NAME "utf8_general_cs"

#define HAVE_UTF8_GENERAL_CS 1

#else

#define MYSQL_DEFAULT_CHARSET_NAME "latin1"

#define MYSQL_DEFAULT_COLLATION_NAME "latin1_swedish_ci"

#endif



#define HAVE_SPATIAL 1

#define HAVE_RTREE_KEYS 1
@@ -435,8 +442,10 @@ inline double ulonglong2double(ulonglong value) 
/* Define charsets you want */

/* #undef HAVE_CHARSET_armscii8 */

/* #undef HAVE_CHARSET_ascii */

#ifndef CYBOZU

#define HAVE_CHARSET_big5 1

#define HAVE_CHARSET_cp1250 1

#endif

/* #undef HAVE_CHARSET_cp1251 */

/* #undef HAVE_CHARSET_cp1256 */

/* #undef HAVE_CHARSET_cp1257 */
@@ -445,27 +454,33 @@ inline double ulonglong2double(ulonglong value) 
/* #undef HAVE_CHARSET_cp866 */

#define HAVE_CHARSET_cp932 1

/* #undef HAVE_CHARSET_dec8 */

#ifndef CYBOZU

#define HAVE_CHARSET_eucjpms 1

#define HAVE_CHARSET_euckr 1

#define HAVE_CHARSET_gb2312 1

#define HAVE_CHARSET_gbk 1

#endif

/* #undef HAVE_CHARSET_greek */

/* #undef HAVE_CHARSET_hebrew */

/* #undef HAVE_CHARSET_hp8 */

/* #undef HAVE_CHARSET_keybcs2 */

/* #undef HAVE_CHARSET_koi8r */

/* #undef HAVE_CHARSET_koi8u */

#ifndef CYBOZU

#define HAVE_CHARSET_latin1 1

#define HAVE_CHARSET_latin2 1

#endif

/* #undef HAVE_CHARSET_latin5 */

/* #undef HAVE_CHARSET_latin7 */

/* #undef HAVE_CHARSET_macce */

/* #undef HAVE_CHARSET_macroman */

#define HAVE_CHARSET_sjis 1

/* #undef HAVE_CHARSET_swe7 */

#ifndef CYBOZU

#define HAVE_CHARSET_tis620 1

#define HAVE_CHARSET_ucs2 1

#define HAVE_CHARSET_ujis 1

#endif

#define HAVE_CHARSET_utf8 1

#define HAVE_UCA_COLLATIONS 1

mysql-test/lib/mtr_report.pl

+9 −1
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ sub mtr_show_failed_diff ($) { 


  my $reject_file=  "r/$tname.reject";

  my $result_file=  "r/$tname.result";

  my $log_file=  "r/$tname.log";

  my $eval_file=    "r/$tname.eval";



  if ( $::opt_suite ne "main" )
@@ -43,6 +44,7 @@ sub mtr_show_failed_diff ($) { 
    $reject_file= "$::glob_mysql_test_dir/suite/$::opt_suite/$reject_file";

    $result_file= "$::glob_mysql_test_dir/suite/$::opt_suite/$result_file";

    $eval_file=   "$::glob_mysql_test_dir/suite/$::opt_suite/$eval_file";

    $log_file=   "$::glob_mysql_test_dir/suite/$::opt_suite/$log_file";

  }



  if ( -f $eval_file )
@@ -70,6 +72,12 @@ sub mtr_show_failed_diff ($) { 
    print "http://www.mysql.com/doc/en/Reporting_mysqltest_bugs.html\n";

    print "to find the reason to this problem and how to report this.\n\n";

  }



  if ( -f $log_file )

  {

    print "Result from queries before failure can be found in $log_file\n";

    # FIXME Maybe a tail -f -n 10 $log_file here

  }

}



sub mtr_report_test_name ($) {

mysql-test/mysql-test-run.pl

+65 −7
Original line number Diff line number Diff line
@@ -232,6 +232,8 @@ our $opt_client_ddd; 
our $opt_manual_gdb;

our $opt_manual_ddd;

our $opt_manual_debug;

our $opt_debugger;

our $opt_client_debugger;



our $opt_gprof;

our $opt_gprof_dir;
@@ -622,6 +624,8 @@ sub command_line_setup () { 
             'manual-debug'             => \$opt_manual_debug,

             'ddd'                      => \$opt_ddd,

             'client-ddd'               => \$opt_client_ddd,

	     'debugger=s'               => \$opt_debugger,

	     'client-debugger=s'        => \$opt_client_debugger,

             'strace-client'            => \$opt_strace_client,

             'master-binary=s'          => \$exe_master_mysqld,

             'slave-binary=s'           => \$exe_slave_mysqld,
@@ -812,7 +816,8 @@ sub command_line_setup () { 


  # Check debug related options

  if ( $opt_gdb || $opt_client_gdb || $opt_ddd || $opt_client_ddd ||

       $opt_manual_gdb || $opt_manual_ddd || $opt_manual_debug)

       $opt_manual_gdb || $opt_manual_ddd || $opt_manual_debug ||

       $opt_debugger || $opt_client_debugger )

  {

    # Indicate that we are using debugger

    $glob_debugger= 1;
@@ -2786,11 +2791,15 @@ sub mysqld_start ($$$$$) { 


  if ( $opt_gdb || $opt_manual_gdb)

  {

    gdb_arguments(\$args, \$exe, $type);

    gdb_arguments(\$args, \$exe, "$type"."_$idx");

  }

  elsif ( $opt_ddd || $opt_manual_ddd )

  {

    ddd_arguments(\$args, \$exe, $type);

    ddd_arguments(\$args, \$exe, "$type"."_$idx");

  }

  elsif ( $opt_debugger )

  {

    debugger_arguments(\$args, \$exe, "$type"."_$idx");

  }

  elsif ( $opt_manual_debug )

  {
@@ -3324,10 +3333,15 @@ sub run_mysqltest ($) { 
  {

    ddd_arguments(\$args, \$exe, "client");

  }

  elsif ( $opt_client_debugger )

  {

    debugger_arguments(\$args, \$exe, "client");

  }



  if ($glob_use_libtool)

  if ($glob_use_libtool and $opt_valgrind)

  {

    # Add "libtool --mode-execute" before the test to execute

    # if running in valgrind(to avoid valgrinding bash)

    unshift(@$args, "--mode=execute", $exe);

    $exe= "libtool";

  }
@@ -3361,6 +3375,9 @@ sub gdb_arguments { 
  my $str= join(" ", @$$args);

  my $gdb_init_file= "$opt_tmpdir/gdbinit.$type";



  # Remove the old gdbinit file

  unlink($gdb_init_file);



  if ( $type eq "client" )

  {

    # write init file for client
@@ -3422,6 +3439,9 @@ sub ddd_arguments { 
  my $str= join(" ", @$$args);

  my $gdb_init_file= "$opt_tmpdir/gdbinit.$type";



  # Remove the old gdbinit file

  unlink($gdb_init_file);



  if ( $type eq "client" )

  {

    # write init file for client
@@ -3469,6 +3489,42 @@ sub ddd_arguments { 
  mtr_add_arg($$args, "$save_exe");

}





#

# Modify the exe and args so that program is run in the selected debugger

#

sub debugger_arguments {

  my $args= shift;

  my $exe=  shift;

  my $debugger= $opt_debugger || $opt_client_debugger;



  if ( $debugger eq "vcexpress" or $debugger eq "vc")

  {

    # vc[express] /debugexe exe arg1 .. argn



    # Add /debugexe and name of the exe before args

    unshift(@$$args, "/debugexe");

    unshift(@$$args, "$$exe");



  }

  elsif ( $debugger eq "windbg" )

  {

    # windbg exe arg1 .. argn



    # Add name of the exe before args

    unshift(@$$args, "$$exe");



  }

  else

  {

    mtr_error("Unknown argument \"$debugger\" passed to --debugger");

  }



  # Set exe to debuggername

  $$exe= $debugger;

}





#

# Modify the exe and args so that program is run in valgrind

#
@@ -3578,6 +3634,8 @@ Options for debugging the product 
  client-gdb            Start mysqltest client in gdb

  ddd                   Start mysqld in ddd

  client-ddd            Start mysqltest client in ddd

  debugger=NAME         Start mysqld in the selected debugger

  client-debugger=NAME  Start mysqltest in the selected debugger

  strace-client         FIXME

  master-binary=PATH    Specify the master "mysqld" to use

  slave-binary=PATH     Specify the slave "mysqld" to use

mysql-test/r/subselect.result

+6 −0
Original line number Diff line number Diff line
@@ -3163,3 +3163,9 @@ t 
crash1

crash1

drop table t1;

create table t1 (c int, key(c));

insert into t1 values (1142477582), (1142455969);

create table t2 (a int, b int);

insert into t2 values (2, 1), (1, 0);

delete from t1 where c <= 1140006215 and (select b from t2 where a = 2) = 1;

drop table t1, t2;