Commit 94cbe6fd authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/home/stewart/Documents/MySQL/5.1/new


client/mysqltest.c:
  Auto merged
sql/item.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
storage/myisam/mi_create.c:
  Auto merged
storage/myisam/mi_delete.c:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
strings/decimal.c:
  Auto merged
configure.in:
  remove 5.0 version increement
sql/ha_archive.cc:
  merge
sql/handler.cc:
  merge
sql/mysqld.cc:
  merge
parents 58175033 6706115c

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."},

configure.in

+2 −1
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ AC_PREREQ(2.52)dnl Minimum Autoconf version required. 
AC_INIT(sql/mysqld.cc)

AC_CANONICAL_SYSTEM

# The Docs Makefile.am parses this line!

# remember to also change ndb version below and update version.c in ndb

AM_INIT_AUTOMAKE(mysql, 5.1.5-alpha)

AM_CONFIG_HEADER(config.h)
@@ -17,7 +18,7 @@ SHARED_LIB_VERSION=15:0:0 
# ndb version

NDB_VERSION_MAJOR=5

NDB_VERSION_MINOR=0

NDB_VERSION_BUILD=18

NDB_VERSION_BUILD=19

NDB_VERSION_STATUS=""



# Set all version vars based on $VERSION. How do we do this more elegant ?

include/config-netware.h

+2 −1
Original line number Diff line number Diff line
@@ -72,9 +72,10 @@ extern "C" { 
  #undef HAVE_CRYPT

#endif /* HAVE_OPENSSL */



/* Configure can't detect this because it uses AC_TRY_RUN */

/* Netware has an ancient zlib */

#undef HAVE_COMPRESS

#define HAVE_COMPRESS

#undef HAVE_ARCHIVE_DB



/* include the old function apis */

#define USE_OLD_FUNCTIONS 1

mysql-test/r/ctype_uca.result

+106 −0
Original line number Diff line number Diff line
@@ -2015,6 +2015,112 @@ Z,z,Ź,ź,Ż,ż,Ž,ž 
ǁ

ǂ

ǃ

select group_concat(c1 order by c1) from t1 group by c1 collate utf8_hungarian_ci;

group_concat(c1 order by c1)

÷

×

A,a,À,Á,Â,Ã,Ä,Å,à,á,â,ã,ä,å,Ā,ā,Ă,ă,Ą,ą,Ǎ,ǎ,Ǟ,ǟ,Ǡ,ǡ,Ǻ,ǻ

AA,Aa,aA,aa

Æ,æ,Ǣ,ǣ,Ǽ,ǽ

B,b

ƀ

Ɓ

Ƃ,ƃ

C,c,Ç,ç,Ć,ć,Ĉ,ĉ,Ċ,ċ,Č,č

CH,Ch,cH,ch

Ƈ,ƈ

D,d,Ď,ď

DZ,Dz,dZ,dz,DŽ,Dž,dž,DZ,Dz,dz

Đ,đ

Ɖ

Ɗ

Ƌ,ƌ

Ð,ð

E,e,È,É,Ê,Ë,è,é,ê,ë,Ē,ē,Ĕ,ĕ,Ė,ė,Ę,ę,Ě,ě

Ǝ,ǝ

Ə

Ɛ

F,f

Ƒ,ƒ

G,g,Ĝ,ĝ,Ğ,ğ,Ġ,ġ,Ģ,ģ,Ǧ,ǧ,Ǵ,ǵ

Ǥ,ǥ

Ɠ

Ɣ

Ƣ,ƣ

H,h,Ĥ,ĥ

ƕ,Ƕ

Ħ,ħ

I,i,Ì,Í,Î,Ï,ì,í,î,ï,Ĩ,ĩ,Ī,ī,Ĭ,ĭ,Į,į,İ,Ǐ,ǐ

IJ,Ij,iJ,ij,IJ,ij

ı

Ɨ

Ɩ

J,j,Ĵ,ĵ,ǰ

K,k,Ķ,ķ,Ǩ,ǩ

Ƙ,ƙ

L,l,Ĺ,ĺ,Ļ,ļ,Ľ,ľ

Ŀ,ŀ

LJ,Lj,lJ,lj,LJ,Lj,lj

LL,Ll,lL,ll

Ł,ł

ƚ

ƛ

M,m

N,n,Ñ,ñ,Ń,ń,Ņ,ņ,Ň,ň,Ǹ,ǹ

NJ,Nj,nJ,nj,NJ,Nj,nj

Ɲ

ƞ

Ŋ,ŋ

O,o,Ò,Ó,Ô,Õ,ò,ó,ô,õ,Ō,ō,Ŏ,ŏ,Ơ,ơ,Ǒ,ǒ,Ǫ,ǫ,Ǭ,ǭ

OE,Oe,oE,oe,Œ,œ

Ö,ö,Ő,ő

Ø,ø,Ǿ,ǿ

Ɔ

Ɵ

P,p

Ƥ,ƥ

Q,q

ĸ

R,r,Ŕ,ŕ,Ŗ,ŗ,Ř,ř

RR,Rr,rR,rr

Ʀ

S,s,Ś,ś,Ŝ,ŝ,Ş,ş,Š,š,ſ

SS,Ss,sS,ss,ß

Ʃ

ƪ

T,t,Ţ,ţ,Ť,ť

ƾ

Ŧ,ŧ

ƫ

Ƭ,ƭ

Ʈ

U,u,Ù,Ú,Û,ù,ú,û,Ũ,ũ,Ū,ū,Ŭ,ŭ,Ů,ů,Ų,ų,Ư,ư,Ǔ,ǔ,Ǖ,ǖ,Ǘ,ǘ,Ǚ,ǚ,Ǜ,ǜ

Ü,ü,Ű,ű

Ɯ

Ʊ

V,v

Ʋ

W,w,Ŵ,ŵ

X,x

Y,y,Ý,ý,ÿ,Ŷ,ŷ,Ÿ

Ƴ,ƴ

Z,z,Ź,ź,Ż,ż,Ž,ž

ƍ

Ƶ,ƶ

Ʒ,Ǯ,ǯ

Ƹ,ƹ

ƺ

Þ,þ

ƿ,Ƿ

ƻ

Ƨ,ƨ

Ƽ,ƽ

Ƅ,ƅ

ʼn

ǀ

ǁ

ǂ

ǃ

drop table t1;

SET NAMES utf8;

CREATE TABLE t1 (c varchar(255) NOT NULL COLLATE utf8_general_ci, INDEX (c));

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;