Commit e6145414 authored by unknown's avatar unknown
Browse files

Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge


ndb/src/ndbapi/Ndb.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
parents 1d7406c6 12bef7a8

BitKeeper/etc/logging_ok

+2 −0
Original line number Diff line number Diff line
@@ -66,7 +66,9 @@ igor@hundin.mysql.fi 
igor@rurik.mysql.com

ingo@mysql.com

jan@hundin.mysql.fi

jani@a193-229-222-2.elisa-laajakaista.fi

jani@a80-186-24-72.elisa-laajakaista.fi

jani@a80-186-41-201.elisa-laajakaista.fi

jani@dsl-jkl1657.dial.inet.fi

jani@dsl-kpogw4gb5.dial.inet.fi

jani@hynda.(none)

Docs/Flags/argentina.eps

deleted100644 → 0
+0 −98
Original line number Diff line number Diff line 
%!PS-Adobe-2.0 EPSF-2.0

%%Creator: pnmtops

%%Title: argentina.ps

%%Pages: 1

%%BoundingBox: 290 385 321 407

%%EndComments

/readstring {

  currentfile exch readhexstring pop

} bind def

/rpicstr 32 string def

/gpicstr 32 string def

/bpicstr 32 string def

%%EndProlog

%%Page: 1 1

gsave

290.64 385.44 translate

30.72 21.12 scale

32 22 8

[ 32 0 0 -22 0 22 ]

{ rpicstr readstring }

{ gpicstr readstring }

{ bpicstr readstring }

true 3

colorimage

000000000000000000000000000000000000000000000000000000000000

000000000000000000000000000000000000000000000000000000000000

000000000000000000000000000000000000000000000000000000000000

000000000000001818181818181818181818181818181818181818181818

181818181818180000b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5

b5b5b5b5b5b5b5b5b50000efefefefefefefefefefefefefefefefefefef

efefefefefefefefefefef00001818181818181818181818181818181818

181818181818181818181818180000b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5

b5b5b5b5b5b5b5b5b5b5b5b5b5b5b50000efefefefefefefefefefefefef

efefefefefefefefefefefefefefefefef00001818181818181818181818

181818181818181818181818181818181818180000b5b5b5b5b5b5b5b5b5

b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b50000efefefefefefef

efefefefefefefefefefefefefefefefefefefefefefef00001818181818

181818181818181818181818181818181818181818181818180000b5b5b5

b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b50000ef

efefefefefefefefefefefefefefefefefefefefefefefefefefefefef00

001818181818181818181818181818181818181818181818181818181818

180000b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5

b5b5b50000efefefefefefefefefefefefefefefefefefefefefefefefef

efefefefef00001818181818181818181818181818181818181818181818

181818181818180000b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5

b5b5b5b5b5b5b5b5b50000efefefefefefefefefefefefefefefefefefef

efefefefefefefefefefef00006161616161616161616161616161616161

616161616161616161616161610000cacacacacacacacacacacacacacaca

cacacacacacacacacacacacacacaca0000f2f2f2f2f2f2f2f2f2f2f2f2f2

f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f20000f7f7f7f7f7f7f7f7f7f7f7

f7f7f7f9f9f7f7f7f7f7f7f7f7f7f7f7f7f7f70000f7f7f7f7f7f7f7f7f7

f7f7f7f7f6f3f3f6f7f7f7f7f7f7f7f7f7f7f7f7f70000f7f7f7f7f7f7f7

f7f7f7f7f7f7eccbccecf7f7f7f7f7f7f7f7f7f7f7f7f70000f7f7f7f7f7

f7f7f7f7f7f7f7f7fafdfdfaf7f7f7f7f7f7f7f7f7f7f7f7f70000f7f7f7

f7f7f7f7f7f7f7f7f7f6f0f2f2f0f6f7f7f7f7f7f7f7f7f7f7f7f70000f7

f7f7f7f7f7f7f7f7f7f7f7ec9b45459becf7f7f7f7f7f7f7f7f7f7f7f700

00f7f7f7f7f7f7f7f7f7f7f7f7f9fdf2eefdf9f7f7f7f7f7f7f7f7f7f7f7

f70000f7f7f7f7f7f7f7f7f7f7f7f7f3f2ede9f2f3f7f7f7f7f7f7f7f7f7

f7f7f70000f7f7f7f7f7f7f7f7f7f7f7f7cb45000045cbf7f7f7f7f7f7f7

f7f7f7f7f70000f7f7f7f7f7f7f7f7f7f7f7f7f9fdebeafdf9f7f7f7f7f7

f7f7f7f7f7f7f70000f7f7f7f7f7f7f7f7f7f7f7f7f3f2e7e7f2f3f7f7f7

f7f7f7f7f7f7f7f7f70000f7f7f7f7f7f7f7f7f7f7f7f7cb45000045cbf7

f7f7f7f7f7f7f7f7f7f7f70000f7f7f7f7f7f7f7f7f7f7f7f7f7fafdfdfa

f7f7f7f7f7f7f7f7f7f7f7f7f70000f7f7f7f7f7f7f7f7f7f7f7f7f6f1f2

f2f1f6f7f7f7f7f7f7f7f7f7f7f7f70000f7f7f7f7f7f7f7f7f7f7f7f7ec

9b45459becf7f7f7f7f7f7f7f7f7f7f7f70000f7f7f7f7f7f7f7f7f7f7f7

f7f7f7f9f9f7f7f7f7f7f7f7f7f7f7f7f7f7f70000f7f7f7f7f7f7f7f7f7

f7f7f7f7f6f3f3f6f7f7f7f7f7f7f7f7f7f7f7f7f70000f7f7f7f7f7f7f7

f7f7f7f7f7f7eccbcbecf7f7f7f7f7f7f7f7f7f7f7f7f700006363636363

636363636363636363636363636363636363636363636363630000cbcbcb

cbcbcbcbcbcbcbcbcbcbcbcbcbcbcbcbcbcbcbcbcbcbcbcbcbcbcb0000f2

f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f200

001818181818181818181818181818181818181818181818181818181818

180000b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5

b5b5b50000efefefefefefefefefefefefefefefefefefefefefefefefef

efefefefef00001818181818181818181818181818181818181818181818

181818181818180000b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5

b5b5b5b5b5b5b5b5b50000efefefefefefefefefefefefefefefefefefef

efefefefefefefefefefef00001818181818181818181818181818181818

181818181818181818181818180000b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5

b5b5b5b5b5b5b5b5b5b5b5b5b5b5b50000efefefefefefefefefefefefef

efefefefefefefefefefefefefefefefef00001818181818181818181818

181818181818181818181818181818181818180000b5b5b5b5b5b5b5b5b5

b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b50000efefefefefefef

efefefefefefefefefefefefefefefefefefefefefefef00001818181818

181818181818181818181818181818181818181818181818180000b5b5b5

b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b50000ef

efefefefefefefefefefefefefefefefefefefefefefefefefefefefef00

001818181818181818181818181818181818181818181818181818181818

180000b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5

b5b5b50000efefefefefefefefefefefefefefefefefefefefefefefefef

efefefefef00000000000000000000000000000000000000000000000000

000000000000000000000000000000000000000000000000000000000000

000000000000000000000000000000000000000000000000000000000000

000000000000000000000000

grestore

showpage

%%Trailer

Docs/Flags/argentina.gif

deleted100644 → 0
−187 B
Loading image diff...

Docs/Flags/argentina.pdf

deleted100644 → 0
−923 B

File deleted.

View file

Docs/Flags/argentina.txt

deleted100644 → 0
+0 −0

Empty file deleted.