Skip to content

Commit 2263e3e

Browse files
author
monty@mashka.mysql.fi
committed
Merge with 4.0.14
2 parents 1279f9b + 6e7a509 commit 2263e3e

File tree

363 files changed

+13808
-2884
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

363 files changed

+13808
-2884
lines changed

‎BUILD/compile-pentium-debug-max

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
path=`dirname $0`
44
. "$path/SETUP.sh"
55

6-
extra_flags="$pentium_cflags $debug_cflags -DBIG_TABLES"
6+
extra_flags="$pentium_cflags $debug_cflags"
77
c_warnings="$c_warnings $debug_extra_warnings"
88
cxx_warnings="$cxx_warnings $debug_extra_warnings"
99
extra_configs="$pentium_configs $debug_configs"

‎BitKeeper/etc/logging_ok

+2
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ miguel@hegel.br
6363
miguel@hegel.local
6464
miguel@light.
6565
miguel@light.local
66+
miguel@sartre.local
6667
mmatthew@markslaptop.
6768
monty@bitch.mysql.fi
6869
monty@butch.
@@ -86,6 +87,7 @@ nick@mysql.com
8687
nick@nick.leippe.com
8788
papa@gbichot.local
8889
paul@central.snake.net
90+
paul@ice.local
8991
paul@ice.snake.net
9092
paul@teton.kitebird.com
9193
pem@mysql.com

‎Build-tools/Bootstrap

+4-1
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,14 @@ $opt_export_only= undef;
3838
$opt_help= $opt_verbose= 0;
3939
$opt_log= undef;
4040
$opt_mail= "";
41+
$opt_revision= undef;
4142
$opt_suffix= "";
4243
$opt_test= undef;
4344
$opt_skip_check= undef;
4445
$opt_skip_manual= undef;
4546
$opt_win_dist= undef;
4647
$version= "unknown";
48+
$major=$minor=$release=0;
4749

4850
GetOptions(
4951
"build-command|b=s",
@@ -151,6 +153,7 @@ if (!$opt_dry_run)
151153
{
152154
m/^AM_INIT_AUTOMAKE\(mysql, ([1-9]\.[0-9]{1,2}\.[0-9]{1,2}.*)\)/;
153155
$version= $1;
156+
($major, $minor, $release) = split(/\./,$version);
154157
}
155158
&logger("Found version string: $version");
156159

@@ -220,7 +223,7 @@ if (defined $opt_changelog)
220223
{
221224
if (!$opt_revision)
222225
{
223-
$revision= `bk changes -t -d':REV:' -n $REPO | head -1`;
226+
$revision= `bk changes -t -d':REV:::TAG:' -n $REPO | grep mysql-$major.$minor | head -1 | cut -f1 -d ":"`;
224227
}
225228
else
226229
{

‎Build-tools/Do-compile

+2-1
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,8 @@ if ($opt_stage <= 1)
248248
$opt_config_options.= $opt_with_other_libc;
249249
}
250250

251-
check_system("$opt_config_env ./configure --prefix=/usr/local/mysql --with-comment=\"Official MySQL$opt_version_suffix binary\" --with-extra-charsets=complex --with-server-suffix=\"$opt_version_suffix\" --enable-thread-safe-client --enable-local-infile $opt_config_options","Thank you for choosing MySQL");
251+
$prefix="/usr/local/mysql";
252+
check_system("$opt_config_env ./configure --prefix=$prefix --localstatedir=$prefix/data --libexecdir=$prefix/bin --with-comment=\"Official MySQL$opt_version_suffix binary\" --with-extra-charsets=complex --with-server-suffix=\"$opt_version_suffix\" --enable-thread-safe-client --enable-local-infile $opt_config_options","Thank you for choosing MySQL");
252253
if (-d "$pwd/$host/include-mysql")
253254
{
254255
safe_system("cp -r $pwd/$host/include-mysql/* $pwd/$host/$ver/include");

‎Docs/Makefile.am

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ paper: manual_a4.ps manual_letter.ps $(PDFMANUAL)
4141
# The Makefile contains the previous version so we can not use that
4242
include.texi: ../configure.in
4343
echo "@c This file is autogenerated by the Makefile" > $@
44-
echo -n "@set mysql_version " >> $@
44+
echo -n "@set mysqlversion " >> $@
4545
grep "AM_INIT_AUTOMAKE(mysql, " ../configure.in | \
4646
sed -e 's;AM_INIT_AUTOMAKE(mysql, ;;' -e 's;);;' >> $@
47-
echo -n "@set default_port " >> $@
47+
echo -n "@set defaultport " >> $@
4848
grep "MYSQL_TCP_PORT_DEFAULT=" ../configure.in | \
4949
sed -e 's;MYSQL_TCP_PORT_DEFAULT=;;' >> $@
5050

@@ -207,7 +207,7 @@ INSTALL-BINARY: mysql.info $(GT)
207207
perl -w $(GT) mysql.info "LGPL license" "Function Index" > $@
208208

209209
../support-files/MacOSX/ReadMe.txt: mysql.info $(GT)
210-
perl -w $(GT) mysql.info "Mac OS X installation" "Netware installation" > $@
210+
perl -w $(GT) mysql.info "Mac OS X installation" "NetWare installation" > $@
211211

212212
# Don't update the files from bitkeeper
213213
%::SCCS/s.%

‎Docs/Support/generate-text-files.pl

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
#!/my/gnu/bin/perl -w -*- perl -*-
1+
#!/usr/bin/perl -w -*- perl -*-
22
# Generate text files from top directory from the manual.
33

44
$from = shift(@ARGV);
55
$fnode = shift(@ARGV);
66
$tnode = shift(@ARGV);
77

8-
open(IN, "$from") || die;
8+
open(IN, "$from") || die "Cannot open $from: $!";
99

1010
$in = 0;
1111

@@ -19,7 +19,7 @@
1919
}
2020
elsif (/^File: mysql.info/ || (/^/))
2121
{
22-
# Just Skip node begginigs
22+
# Just Skip node beginnings
2323
}
2424
else
2525
{
@@ -38,3 +38,6 @@
3838
}
3939

4040
close(IN);
41+
42+
die "Could not find node \"$tnode\"" if ($in == 1);
43+
exit 0;

‎VC++Files/InstallShield/3.23.XX-gpl/Component Definitions/.fgl

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
[General]
2+
Type=FILELIST
3+
Version=1.00.000
4+
5+
[topdir]
6+
subdir0=<WINDIR>
7+
subdir1=<PROGRAMFILES>
8+
subdir2=<TARGETDIR>
9+
subdir3=USERDEFINED
10+
11+
[<WINDIR>]
12+
DISPLAYTEXT=Windows Operating System
13+
TYPE=TEXTSUBFIXED
14+
subdir0=<WINDIR>\<WINSYSDIR>
15+
16+
[<WINDIR>\<WINSYSDIR>]
17+
DISPLAYTEXT=Windows System Folder
18+
TYPE=TEXTSUBFIXED
19+
20+
[<PROGRAMFILES>]
21+
DISPLAYTEXT=Program Files Folder
22+
TYPE=TEXTSUBFIXED
23+
subdir0=<PROGRAMFILES>\<COMMONFILES>
24+
25+
[<PROGRAMFILES>\<COMMONFILES>]
26+
DISPLAYTEXT=Common Files Folder
27+
TYPE=TEXTSUBFIXED
28+
29+
[<TARGETDIR>]
30+
DISPLAYTEXT=General Application Destination
31+
TYPE=TEXTSUBFIXED
32+
33+
[USERDEFINED]
34+
DISPLAYTEXT=Script-defined Folders
35+
TYPE=USERSTART
36+
37+

‎VC++Files/InstallShield/3.23.XX-gpl/Component Definitions/Default.cdf

+192
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,192 @@
1+
[Development]
2+
required0=Servers
3+
SELECTED=Yes
4+
FILENEED=STANDARD
5+
required1=Grant Tables
6+
HTTPLOCATION=
7+
STATUS=Examples, Libraries, Includes and Script files
8+
UNINSTALLABLE=Yes
9+
TARGET=<TARGETDIR>
10+
FTPLOCATION=
11+
VISIBLE=Yes
12+
DESCRIPTION=Examples, Libraries, Includes and Script files
13+
DISPLAYTEXT=Examples, Libraries, Includes and Script files
14+
IMAGE=
15+
DEFSELECTION=Yes
16+
filegroup0=Development
17+
COMMENT=
18+
INCLUDEINBUILD=Yes
19+
INSTALLATION=ALWAYSOVERWRITE
20+
COMPRESSIFSEPARATE=No
21+
MISC=
22+
ENCRYPT=No
23+
DISK=ANYDISK
24+
TARGETDIRCDROM=
25+
PASSWORD=
26+
TARGETHIDDEN=General Application Destination
27+
28+
[Grant Tables]
29+
required0=Servers
30+
SELECTED=Yes
31+
FILENEED=CRITICAL
32+
HTTPLOCATION=
33+
STATUS=The Grant Tables and Core Files
34+
UNINSTALLABLE=Yes
35+
TARGET=<TARGETDIR>
36+
FTPLOCATION=
37+
VISIBLE=Yes
38+
DESCRIPTION=The Grant Tables and Core Files
39+
DISPLAYTEXT=The Grant Tables and Core Files
40+
IMAGE=
41+
DEFSELECTION=Yes
42+
filegroup0=Grant Tables
43+
requiredby0=Development
44+
COMMENT=
45+
INCLUDEINBUILD=Yes
46+
requiredby1=Clients and Tools
47+
INSTALLATION=NEVEROVERWRITE
48+
requiredby2=Documentation
49+
COMPRESSIFSEPARATE=No
50+
MISC=
51+
ENCRYPT=No
52+
DISK=ANYDISK
53+
TARGETDIRCDROM=
54+
PASSWORD=
55+
TARGETHIDDEN=General Application Destination
56+
57+
[Components]
58+
component0=Development
59+
component1=Grant Tables
60+
component2=Servers
61+
component3=Clients and Tools
62+
component4=Documentation
63+
64+
[TopComponents]
65+
component0=Servers
66+
component1=Clients and Tools
67+
component2=Documentation
68+
component3=Development
69+
component4=Grant Tables
70+
71+
[SetupType]
72+
setuptype0=Compact
73+
setuptype1=Typical
74+
setuptype2=Custom
75+
76+
[Clients and Tools]
77+
required0=Servers
78+
SELECTED=Yes
79+
FILENEED=HIGHLYRECOMMENDED
80+
required1=Grant Tables
81+
HTTPLOCATION=
82+
STATUS=The MySQL clients and Maintenance Tools
83+
UNINSTALLABLE=Yes
84+
TARGET=<TARGETDIR>
85+
FTPLOCATION=
86+
VISIBLE=Yes
87+
DESCRIPTION=The MySQL clients and Maintenance Tools
88+
DISPLAYTEXT=The MySQL clients and Maintenance Tools
89+
IMAGE=
90+
DEFSELECTION=Yes
91+
filegroup0=Clients and Tools
92+
COMMENT=
93+
INCLUDEINBUILD=Yes
94+
INSTALLATION=NEWERDATE
95+
COMPRESSIFSEPARATE=No
96+
MISC=
97+
ENCRYPT=No
98+
DISK=ANYDISK
99+
TARGETDIRCDROM=
100+
PASSWORD=
101+
TARGETHIDDEN=General Application Destination
102+
103+
[Servers]
104+
SELECTED=Yes
105+
FILENEED=CRITICAL
106+
HTTPLOCATION=
107+
STATUS=The MySQL Servers
108+
UNINSTALLABLE=Yes
109+
TARGET=<TARGETDIR>
110+
FTPLOCATION=
111+
VISIBLE=Yes
112+
DESCRIPTION=The MySQL Servers
113+
DISPLAYTEXT=The MySQL Servers
114+
IMAGE=
115+
DEFSELECTION=Yes
116+
filegroup0=Servers
117+
requiredby0=Development
118+
COMMENT=
119+
INCLUDEINBUILD=Yes
120+
requiredby1=Grant Tables
121+
INSTALLATION=ALWAYSOVERWRITE
122+
requiredby2=Clients and Tools
123+
requiredby3=Documentation
124+
COMPRESSIFSEPARATE=No
125+
MISC=
126+
ENCRYPT=No
127+
DISK=ANYDISK
128+
TARGETDIRCDROM=
129+
PASSWORD=
130+
TARGETHIDDEN=General Application Destination
131+
132+
[SetupTypeItem-Compact]
133+
Comment=
134+
item0=Grant Tables
135+
item1=Servers
136+
item2=Clients and Tools
137+
item3=Documentation
138+
Descrip=
139+
DisplayText=
140+
141+
[SetupTypeItem-Custom]
142+
Comment=
143+
item0=Development
144+
item1=Grant Tables
145+
item2=Servers
146+
item3=Clients and Tools
147+
Descrip=
148+
item4=Documentation
149+
DisplayText=
150+
151+
[Info]
152+
Type=CompDef
153+
Version=1.00.000
154+
Name=
155+
156+
[SetupTypeItem-Typical]
157+
Comment=
158+
item0=Development
159+
item1=Grant Tables
160+
item2=Servers
161+
item3=Clients and Tools
162+
Descrip=
163+
item4=Documentation
164+
DisplayText=
165+
166+
[Documentation]
167+
required0=Servers
168+
SELECTED=Yes
169+
FILENEED=HIGHLYRECOMMENDED
170+
required1=Grant Tables
171+
HTTPLOCATION=
172+
STATUS=The MySQL Documentation with different formats
173+
UNINSTALLABLE=Yes
174+
TARGET=<TARGETDIR>
175+
FTPLOCATION=
176+
VISIBLE=Yes
177+
DESCRIPTION=The MySQL Documentation with different formats
178+
DISPLAYTEXT=The MySQL Documentation with different formats
179+
IMAGE=
180+
DEFSELECTION=Yes
181+
filegroup0=Documentation
182+
COMMENT=
183+
INCLUDEINBUILD=Yes
184+
INSTALLATION=ALWAYSOVERWRITE
185+
COMPRESSIFSEPARATE=No
186+
MISC=
187+
ENCRYPT=No
188+
DISK=ANYDISK
189+
TARGETDIRCDROM=
190+
PASSWORD=
191+
TARGETHIDDEN=General Application Destination
192+

‎VC++Files/InstallShield/3.23.XX-gpl/Component Definitions/Default.fgl

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
[<PROGRAMFILES>\<COMMONFILES>]
2+
DISPLAYTEXT=Common Files Folder
3+
TYPE=TEXTSUBFIXED
4+
fulldirectory=
5+
6+
[<WINDIR>\<WINSYSDIR>]
7+
DISPLAYTEXT=Windows System Folder
8+
TYPE=TEXTSUBFIXED
9+
fulldirectory=
10+
11+
[USERDEFINED]
12+
DISPLAYTEXT=Script-defined Folders
13+
TYPE=USERSTART
14+
fulldirectory=
15+
16+
[<PROGRAMFILES>]
17+
DISPLAYTEXT=Program Files Folder
18+
SubDir0=<PROGRAMFILES>\<COMMONFILES>
19+
TYPE=TEXTSUBFIXED
20+
fulldirectory=
21+
22+
[<TARGETDIR>]
23+
DISPLAYTEXT=General Application Destination
24+
TYPE=TEXTSUBFIXED
25+
fulldirectory=
26+
27+
[<WINDIR>]
28+
DISPLAYTEXT=Windows Operating System
29+
SubDir0=<WINDIR>\<WINSYSDIR>
30+
TYPE=TEXTSUBFIXED
31+
fulldirectory=
32+
33+
[TopDir]
34+
SubDir0=<WINDIR>
35+
SubDir1=<PROGRAMFILES>
36+
SubDir2=<TARGETDIR>
37+
SubDir3=USERDEFINED
38+
39+
[General]
40+
Type=FILELIST
41+
Version=1.00.000
42+

0 commit comments

Comments
 (0)