fix erronous assert at scan close, lock abort
ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
Scan is closing. Lock conf is in job buffer.
We have sent lock abort to flush it out.
At execute conf need to RNIL current lock op
to avoid assert fail when abort comes.
Bug seen couple of times, hard to test..
into mysql.com:/space/pekka/ndb/version/my41-tux
ndb/include/kernel/GlobalSignalNumbers.h:
Auto merged
ndb/src/common/debugger/signaldata/SignalNames.cpp:
Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
mysql-test/r/ndb_basic.result:
Added order by to some selects
mysql-test/r/ndb_lock.result:
Added order by to some selects
mysql-test/t/ndb_basic.test:
Added order by to some selects
mysql-test/t/ndb_lock.test:
Added order by to some selects
TIMESTAMP columns should be unsigned to preserve compatibility with 4.0
(Or else InnoDB will return different internal TIMESTAMP values when user upgrades to 4.1).
Altough this fix will introduce problems with early 4.1 -> 4.1 upgrades (tables with
TIMESTAMP field should be reloaded using mysqldump) it will allow easy 4.0 -> 4.1
upgrade (which is more important since 4.1 is still beta).
mysql-test/r/metadata.result:
TIMESTAMP should be UNSIGNED as in 4.0.
mysql-test/r/ps_2myisam.result:
TIMESTAMP should be UNSIGNED as in 4.0.
mysql-test/r/ps_3innodb.result:
TIMESTAMP should be UNSIGNED as in 4.0.
mysql-test/r/ps_4heap.result:
TIMESTAMP should be UNSIGNED as in 4.0.
mysql-test/r/ps_5merge.result:
TIMESTAMP should be UNSIGNED as in 4.0.
sql/field.cc:
TIMESTAMP should be UNSIGNED to preserve compatiblity with 4.0.
(Or else InnoDB will return different internal TIMESTAMP values when user upgrades to 4.1).
- comment for AC_DEFINE(HAVE_COMPRESS) fixed
- build convenience library from zlib: we need to compile it into both
libmysqlclient.a and libmysqlclient.so
- --with-zlib-dir=bundled configure option
acinclude.m4:
- MYSQL_CHECK_ZLIB_WITH_COMPRESS: added support for
--with-zlib-dir=bundled
- AC_DEFINE comment fixed
tools/Makefile.am:
- uncomment bin_PROGRAMS (typo fixed)
zlib/Makefile.am:
- build libtool convenience library, not static one: we need libz objects
to be compiled in libmysqlclient.so shared version
required autotools macro written and deployed in all apropriate Makefile.ams.
Use cases checked:
- linux, standard location of zlib, no ndb
- linux, standard locatoin of zlib, with ndb
- linux, non-standard location of zlib, no ndb
- hpux11, use of bundled zlib, no ndb
The only non-checked case is non-standard location of zlib (or use of bundled
zlib) + ndb. I wasn't able to check it as ndb/ just won't compile on beasts
like AIX52 or HPUX11, where such a check is possible. It didn't compile
there before as these systems dont't have installed zlib, so nothing got broken ;)
Makefile.am:
WL#1518 "make bundled zlib usable for unix builds", part 2:
- zlib dir should be built only if there is no system zlib available;
with introducing of DIST_SUBDIRS goal, os2, BUILD and SSH now only entered
if make dist
acinclude.m4:
WL#1518, "make bundled zlib usable for unix builds":
- actual implementation of the check for various zlib usage options
configure.in:
WL#1518, "make bundled zlib usable for unix builds":
- MYSQL_CHECK_ZLIB_WITH_COMPRESS deployed
libmysql/Makefile.am:
WL#1518, "make bundled zlib usable for unix builds":
- support for non-standard zlib include dir added
libmysql_r/Makefile.am:
WL#1518, "make bundled zlib usable for unix builds":
- support for non-standard zlib include dir added
libmysqld/Makefile.am:
WL#1518, "make bundled zlib usable for unix builds":
- support for non-standard zlib include dir added
myisam/Makefile.am:
WL#1518, "make bundled zlib usable for unix builds":
- support for non-standard zlib binary dir added
mysys/Makefile.am:
WL#1518, "make bundled zlib usable for unix builds":
- support for non-standard zlib include dir added
sql/Makefile.am:
WL#1518, "make bundled zlib usable for unix builds":
- support for non-standard zlib include dir and library dir added
tools/Makefile.am:
WL#1518, "make bundled zlib usable for unix builds":
- support for non-standard zlib include dir added
- copyright added
Use of acconfig.h is deprecated in modern autotools (a cleaner patch).
BitKeeper/deleted/.del-acconfig.h~8d2e3113fc8056da:
Delete: acconfig.h
acinclude.m4:
All templates inlined into AC_DEFINE/AC_DEFINE_UNQUOTED.
Use of acconfig.h is deprecated in modern autotools.
configure.in:
All templates inlined into AC_DEFINE/AC_DEFINE_UNQUOTED.
Use of acconfig.h is deprecated in modern autotools.
mysqld crashes on CREATE TABLE in a database with corrupted db.opt file.
Bug#4646
sql/sql_db.cc:
mysqld crashes on CREATE TABLE in a database with corrupted db.opt file.
Bug#4646
