Commit 88ef95ff authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main 

into  mysql.com:/home/stewart/Documents/MySQL/5.0/main


client/mysql.cc:
  Auto merged
myisam/mi_delete.c:
  Auto merged
mysql-test/r/fulltext2.result:
  Auto merged
ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
sql/mysqld.cc:
  Auto merged
parents 6759bbce c2ac0891

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/src/kernel/blocks/dbdih/DbdihMain.cpp

+1 −1
Original line number Diff line number Diff line
@@ -11137,7 +11137,7 @@ void Dbdih::initCommonData() 
  ndb_mgm_get_int_parameter(p, CFG_DB_NO_REPLICAS, &cnoReplicas);

  if (cnoReplicas > 4)

  {

    progError(__LINE__, NDBD_EXIT_INVALID_CONFIG,

    progError(__LINE__, ERR_INVALID_CONFIG,

	      "Only up to four replicas are supported. Check NoOfReplicas.");

  }