Commit 1c74210e authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/home/mydev/mysql-5.0-bug5390
parents d03d5a30 f6910883

client/mysql.cc

+1 −1
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ static COMMANDS commands[] = { 
  { "quit",   'q', com_quit,   0, "Quit mysql." },

  { "rehash", '#', com_rehash, 0, "Rebuild completion hash." },

  { "source", '.', com_source, 1,

    "Execute a SQL script file. Takes a file name as an argument."},

    "Execute an SQL script file. Takes a file name as an argument."},

  { "status", 's', com_status, 0, "Get status information from the server."},

#ifdef USE_POPEN

  { "system", '!', com_shell,  1, "Execute a system shell command."},

myisam/mi_delete.c

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ static int _mi_ck_real_delete(register MI_INFO *info, MI_KEYDEF *keyinfo, 
    goto err;

  }

  if ((error=d_search(info,keyinfo,

                      (keyinfo->flag & HA_FULLTEXT ? SEARCH_FIND

                      (keyinfo->flag & HA_FULLTEXT ? SEARCH_FIND | SEARCH_UPDATE

                                                   : SEARCH_SAME),

                       key,key_length,old_root,root_buff)) >0)

  {

mysql-test/r/fulltext2.result

+21 −0
Original line number Diff line number Diff line
@@ -215,3 +215,24 @@ select count(*) from t1 where match a against ('aaazzz' in boolean mode); 
count(*)

262

drop table t1;

set names utf8;

create table t1(a text,fulltext(a)) collate=utf8_swedish_ci;

insert into t1 values('test test '),('test'),('test'),('test'),

('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),

('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),

('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),

('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),

('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),

('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),

('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),

('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),

('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),

('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),

('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),

('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),

('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),

('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),

('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test');

delete from t1 limit 1;

drop table t1;

set names latin1;

mysql-test/t/fulltext2.test

+30 −0
Original line number Diff line number Diff line
@@ -179,7 +179,37 @@ update t1 set a='aaaxxx' where a = 'aaayyy'; 
select count(*) from t1 where match a against ('aaaxxx' in boolean mode);

select count(*) from t1 where match a against ('aaayyy' in boolean mode);

select count(*) from t1 where match a against ('aaazzz' in boolean mode);

drop table t1;



#

# BUG#11336

#

# for uca collation isalnum and strnncollsp don't agree on whether

# 0xC2A0 is a space (strnncollsp is right, isalnum is wrong).

#

# they still don't, the bug was fixed by avoiding strnncollsp

#



set names utf8;

create table t1(a text,fulltext(a)) collate=utf8_swedish_ci;

insert into t1 values('test test '),('test'),('test'),('test'),

('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),

('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),

('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),

('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),

('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),

('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),

('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),

('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),

('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),

('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),

('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),

('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),

('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),

('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),

('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test');

delete from t1 limit 1;

drop table t1;

set names latin1;



# End of 4.1 tests

ndb/tools/ndb_error_reporter

0 → 100755
+88 −0
Original line number Diff line number Diff line 
#!/usr/bin/perl -w



use strict;



if(@ARGV < 1)

{

    print STDERR "Usage:\n";

    print STDERR "\tndb_error_reporter config.ini [username] [--fs]\n\n";

    print STDERR "\tusername is a user that you can use to ssh into\n";

    print STDERR "\t  all of your nodes with.\n\n";

    print STDERR "\t--fs means include the filesystems in the report\n";

    print STDERR "\t WARNING: This may require a lot of disk space.\n";

    print STDERR "\t          Only use this option when asked to.\n\n";

    exit(1);

}



my $config_file= $ARGV[0];

my $config_get_fs= 0;

my $config_username= '';

if(defined($ARGV[1]))

{

    $config_get_fs= 1 if $ARGV[1] eq '--fs';

    $config_username= $ARGV[1].'@' if $ARGV[1] ne '--fs';

    $config_get_fs= (defined $ARGV[2] && $ARGV[2] eq '--fs')?1:$config_get_fs;

}



if(!stat($config_file))

{

    print STDERR "Cannot open configuration file.\n\n";

    exit(1);

}



my @nodes= split ' ',`ndb_config --config-file=$ARGV[0] --nodes --query=id --type=ndbd`;



push @nodes, split ' ',`ndb_config --config-file=$ARGV[0] --nodes --query=id --type=ndb_mgmd`;



sub config {

    my $nodeid= shift;

    my $query= shift;

    my $res= `ndb_config --config-file=$ARGV[0] --id=$nodeid --query=$query`;

    chomp $res;

    $res;

}



my @t= localtime();

my $reportdir= sprintf('ndb_error_report_%u%02u%02u%02u%02u%02u',

		       ($t[5]+1900),($t[4]+1),$t[3],$t[2],$t[1],$t[0]);



if(stat($reportdir) || stat($reportdir.'tar.bz2'))

{

    print STDERR "It looks like another ndb_error_report process is running.\n";

    print STDERR "If that is not the case, remove the ndb_error_report directory";

    print STDERR " and run ndb_error_report again.\n\n";

    exit(1);

}



mkdir($reportdir);



foreach my $node (@nodes)

{

    print "\n\n Copying data from node $node".

	(($config_get_fs)?" with filesystem":"").

	"\n\n";

    my $recurse= ($config_get_fs)?'-r ':'';

    system 'scp '.$recurse.$config_username.config($node,'host').

	':'.config($node,'datadir')."/ndb_".$node."* ".

	"$reportdir/\n";

}



print "\n\n Copying configuration file...\n\n\t$config_file\n\n";

system "cp $config_file $reportdir/";



my $r = system 'bzip2 2>&1 > /dev/null  < /dev/null';

my $outfile;

if($r==0)

{

    $outfile= "$reportdir.tar.bz2";

    system "tar c $reportdir|bzip2 > $outfile";

}

else

{

    $outfile= "$reportdir.tar.gz";

    system "tar c $reportdir|gzip > $outfile";

}



system "rm -rf $reportdir";



print "\n\nPlease attach $outfile to your error report\n\n";