into mysql.com:/home/mydev/mysql-5.0-ateam
myisam/mi_create.c:
Auto merged
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/r/key.result:
Auto merged
mysql-test/r/myisam.result:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
mysql-test/t/key.test:
Auto merged
mysql-test/t/myisam.test:
Auto merged
sql/opt_sum.cc:
Auto merged
sql/table.cc:
Auto merged
support-files/mysql.spec.sh:
Auto merged
sql/field.cc:
Manual merge
Disable the simplistic auto dependency scan for test/bench (bug#20078)
support-files/mysql.spec.sh:
Disable the simplistic auto dependency scan for test/bench (bug#20078)
support-files/mysql.server.sh:
Ensure that some necessary / useful system services have been started already,
when the MySQL server is started.
This fixes bug#18810 and bug#20118
Use "./libtool --mode=execute" to find real path to executables
support-files/mysql.spec.sh:
Use "./libtool --mode=execute" to find real path to executables
into perch.ndb.mysql.com:/home/jonas/src/50-work
ndb/include/util/SocketServer.hpp:
Auto merged
ndb/src/common/transporter/Transporter.cpp:
Auto merged
ndb/src/common/util/SocketServer.cpp:
Auto merged
ndb/src/mgmsrv/Services.cpp:
Auto merged
support-files/mysql.spec.sh:
Auto merged
Let "make install" install mysql-test-run.pl
mysql.spec.sh:
Set $LDFLAGS from $MYSQL_BUILD_LDFLAGS (bug#16662)
support-files/mysql.spec.sh:
Set $LDFLAGS from $MYSQL_BUILD_LDFLAGS (bug#16662)
mysql-test/Makefile.am:
Let "make install" install mysql-test-run.pl
Use installed libz.a to avoid hard to solve static linking problems
support-files/mysql.spec.sh:
Use installed libz.a to avoid hard to solve static linking problems
support-files/mysql.spec.sh:
Use "-i" on "make test-force";
this will prevent "make" from writing "***" which in turn was treated as a _build_ error
by the log evaluation tool, causing it not to list the failing tests.
support-files/MySQL-shared-compat.spec.sh:
Prevent "libndbclient" (which is not included in the "shared compat" RPM)
from breaking the RPM packaging.
Also, adapt the specification to the newer versions of the older release families.
This needs to be repeated periodically.
Take care of the RPM build version: For 4.1.16, it is 4.1.16-1 !
* made the following changes for the generic 5.0 RPM spec file
- Added zlib to the list of (static) libraries installed
- Added check against libtool wierdness (WRT: sql/mysqld || sql/.libs/mysqld)
- Compile MySQL with bundled zlib
- Fixed %packager name to "MySQL Production Engineering Team"
support-files/mysql.spec.sh:
* made the following changes for the generic 5.0 RPM spec file
- Added zlib to the list of (static) libraries installed
- Added check against libtool wierdness (WRT: sql/mysqld || sql/.libs/mysqld)
- Compile MySQL with bundled zlib
- Fixed %packager name to "MySQL Production Engineering Team"
(Backport of an identical change from 5.0)
support-files/mysql.spec.sh:
We cannot always use the bundled zlib, as this conflicts with the "shared" build of the "max" binary.
The fully static RPM build on "build" also does not work with the bundled zlib.
With this change, we use the bundled zlib for "standard" RPMs (unless fully static, "build")
and the one already installed on the system for the "max" build which is also labeled "experimental".
(Backport of an identical change from 5.0)
Fix a possible problem on RPM un-install. bug#15145
support-files/mysql.spec.sh:
Extend the file existence check for "init.d/mysql" on un-install
to also guard the call to "insserv"/"chkconfig".
bug#15145, br#5369 / 5586, csc#7129
support-files/mysql.spec.sh:
We cannot always use the bundled zlib, as this conflicts with the "shared" build of the "max" binary.
The fully static RPM build on "build" also does not work with the bundled zlib.
With this change, we use the bundled zlib for "standard" RPMs (unless fully stytic, "build")
and the one already installed onm the system for the "max" build which is also labeled "experimental".
Makefile.am:
Auto merged
client/Makefile.am:
Auto merged
libmysql/Makefile.am:
Auto merged
libmysql_r/Makefile.am:
Auto merged
libmysqld/Makefile.am:
Auto merged
mysql-test/Makefile.am:
Auto merged
netware/Makefile.am:
Auto merged
support-files/Makefile.am:
Auto merged
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
client/mysqlimport.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/gis.result:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
sql/field.cc:
Auto merged
sql/item_geofunc.cc:
Auto merged
sql/spatial.cc:
Auto merged
sql/spatial.h:
Auto merged
support-files/my-huge.cnf.sh:
Auto merged
support-files/my-innodb-heavy-4G.cnf.sh:
Auto merged
support-files/my-large.cnf.sh:
Auto merged
mysql-test/mysql-test-run.sh:
Merged from 4.1.
mysql-test/r/mysqldump.result:
Merged from 4.1.
mysql-test/t/gis.test:
Merged from 4.1.
