Commit graph

13774 commits

Author SHA1 Message Date
unknown
65460480a6 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/mikron/mysql-4.1


ndb/src/ndbapi/Ndblist.cpp:
  Auto merged
ndb/test/include/HugoTransactions.hpp:
  Auto merged
ndb/test/src/HugoTransactions.cpp:
  Auto merged
2004-07-30 12:48:34 +02:00
unknown
d392ff2130 Removed an error check from debug mode that gets executed
n**2 times in closeTransaction where n is number of signals
sent in transaction. n can easily become 250.000 in a large
transaction.
2004-07-30 12:46:27 +02:00
unknown
f0f24adb38 Updated ps_6bdb.results.
mysql-test/r/ps_6bdb.result:
  Updated results.
2004-07-30 12:13:40 +02:00
unknown
274e1bee6b Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-07-30 11:48:56 +02:00
unknown
cfe4c252ac Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-1717
2004-07-30 10:12:02 +02:00
unknown
be536c3a9e syntax fix: superfluous ';' which caused a problem with gcc 2.95
sql-common/my_time.c:
  superfluous ; which caused a problem with gcc 2.95
2004-07-30 10:08:37 +02:00
unknown
7790856f1a Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-07-30 09:50:37 +02:00
unknown
e452548352 auto_value_on_zero bug test
mysql-test/r/auto_increment.result:
  bug test
mysql-test/t/auto_increment.test:
  bug test
sql/sql_base.cc:
  cleanup
2004-07-30 09:47:56 +02:00
unknown
3f636aa379 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-bg4492
2004-07-30 11:01:29 +04:00
unknown
252030e094 Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/jan/mysql-4.1
2004-07-30 08:28:04 +03:00
unknown
6fa88eacfa Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-1717
2004-07-30 01:12:28 +02:00
unknown
9aa4a2d215 rpl_relayrotate.test requires InnoDB (because what we want to test is
if slave resumes at BEGIN).


mysql-test/t/rpl_relayrotate.test:
  require InnoDB (does not make sense without InnoDB)
2004-07-30 01:10:21 +02:00
unknown
04f93abb2d Merge miguel@bk-internal.mysql.com:/home/bk/mysql-4.1
into hegel.txg:/home/miguel/bk/mysql-4.1
2004-07-29 18:37:18 -03:00
unknown
962d942c95 Fix for bug report #4737 and revert fix for bug #4375 (re-opened). 2004-07-29 18:35:54 -03:00
unknown
2be153efbe Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-1717


client/mysqlbinlog.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
2004-07-29 23:28:28 +02:00
unknown
88e3aead85 WL#1580: --start-datetime, --stop-datetime, --start-position (alias for --position) and --stop-position
options for mysqlbinlog, with a test file.
This enables user to say "recover my database to how it was this morning at 10:30"
(mysqlbinlog "--stop-datetime=2003-07-29 10:30:00").
Using time functions into client/ made me move them out of sql/ into sql-common/.
+ (small) fix for BUG#4507 "mysqlbinlog --read-from-remote-server sometimes
cannot accept 2 binlogs" (that is, on command line).


client/client_priv.h:
  new options for mysqlbinlog
client/mysqlbinlog.cc:
  WL#1580: --start-datetime, --stop-datetime, --start-position (alias for --position) and --stop-position.
  (small) fix for BUG#4507 "mysqlbinlog --read-from-remote-server sometimes
   cannot accept 2 binlogs".
include/my_time.h:
  importing time functions so that client/ files can use them.
include/mysql_time.h:
  importing time types so that client/ files can use them.
sql-common/my_time.c:
  importing time functions so that client/ files can use them.
sql/mysql_priv.h:
  moving time functions out of sql/ into sql-common/
sql/time.cc:
  moving time functions out of sql/ into sql-common/
sql/tztime.h:
  moving time functions out of sql/ into sql-common/
2004-07-29 23:25:58 +02:00
unknown
2d2cf95ee3 Added --with-ndbcluster config option to compile-pentium-valgrind-max
(since it's in the other -max builds already).


BUILD/compile-pentium-max:
  Removed obviously obsolete comment.
BUILD/compile-pentium-valgrind-max:
  Added same --with* options as for other -max builds (e.g. ndbcluster).
2004-07-29 15:28:40 +02:00
unknown
eab01edf4f Added test for fix of bug#3912 Auto increment not correctly initialised when table is altered 2004-07-29 14:02:40 +02:00
unknown
785a2eea8e Added ORDER BY to ensure same result on all setups/platforms 2004-07-29 13:32:50 +02:00
unknown
3f4e7a910d Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-4100
2004-07-29 13:15:25 +02:00
unknown
744696b066 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1-ndb
2004-07-29 11:39:35 +02:00
unknown
66e46aeb56 Fix for bug#3912 Auto increment not correctly initialised when table is altered, completes WL#1911 Extended AUTO_INCREMENT support in NDB 2004-07-29 11:35:38 +02:00
unknown
9778a2c98d ha_ndbcluster.h, ha_ndbcluster.cc:
compile fix for gcc-2.95


sql/ha_ndbcluster.cc:
  compile fix for gcc-2.95
sql/ha_ndbcluster.h:
  compile fix for gcc-2.95
2004-07-29 10:44:53 +02:00
unknown
96d0e46bcb Fixed a copy-and-paste error: mysql_create_frm() should have
its own enter string.
2004-07-29 10:33:33 +02:00
unknown
b2f54294c5 Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/jan/mysql-4.1


sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
2004-07-29 09:04:50 +03:00
unknown
805f5aa186 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
2004-07-28 14:52:31 -05:00
unknown
a58f826acf Fix some variable misorderings. 2004-07-28 14:52:04 -05:00
unknown
e194353980 Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-4100
2004-07-28 21:47:51 +02:00
unknown
ce838346d8 Casted all macro arguments,
used a common style with array subscripts,
improved the line-up, wrapped long lines.
2004-07-28 21:46:22 +02:00
unknown
ed85156cd8 DbtuxScan.cpp:
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..
2004-07-28 19:54:38 +02:00
unknown
2137dff8e7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/mysql/mysql-4.1-root
2004-07-28 10:02:38 -07:00
unknown
b620ae298a MgmtSrvr.hpp:
make subclass friend for gcc-2.95 et al [dup push]


ndb/src/mgmsrv/MgmtSrvr.hpp:
  make subclass friend for gcc-2.95 et al
2004-07-28 18:55:17 +02:00
unknown
9aa6d52a94 Fixing MYSQL_CHEKC_ZLIB_DIR to take into account user settings (in case there
are such)
2004-07-28 09:34:06 -07:00
unknown
4456a78995 MgmtSrvr.hpp:
make subclass friend for gcc-2.95 et al


ndb/src/mgmsrv/MgmtSrvr.hpp:
  make subclass friend for gcc-2.95 et al
2004-07-28 15:35:02 +02:00
unknown
ce0abdede7 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
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
2004-07-28 12:53:23 +02:00
unknown
8269f8acff Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-07-28 11:05:27 +02:00
unknown
99dfeddbef Fix 64-bit issue in ConfigValues 2004-07-28 11:05:00 +02:00
unknown
0cf30d26c2 Added order by to make the test output from ndb_basic and ndb_lock predicatble
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
2004-07-28 10:28:30 +02:00
unknown
a5e453e608 Fix for bug #4492.
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).
2004-07-28 10:49:21 +04:00
unknown
54d12591a8 Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/jan/mysql-4.1
2004-07-28 09:00:59 +03:00
unknown
52d3dbd091 Order of libs is important when building an optimized library: put ZLIB last
in the list.
2004-07-27 21:59:28 -07:00
unknown
ddb6fe7ef5 acinclude.m4:
another spelling mistake fixed


acinclude.m4:
  another spelling mistake fixed
2004-07-27 10:05:57 -07:00
unknown
5217955d1a Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/mysql/mysql-4.1-zlib


configure.in:
  Auto merged
2004-07-27 10:05:56 -07:00
unknown
6a371e242b WL#1518 "make bundled zlib usable for unix builds", post review fixes:
- 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
2004-07-27 10:05:55 -07:00
unknown
906ad26dc5 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/bar/mysql-4.1
2004-07-27 18:46:58 +05:00
unknown
ac43db9c7d A small fix to understand 4.1.0 format. 2004-07-27 18:43:40 +05:00
unknown
2f4d0e1e1d wl-1884 storing NULL in ordered index 2004-07-27 13:20:37 +02:00
unknown
cc8920c8ff Merge
ndb/test/ndbapi/Makefile.am:
  SCCS merged
2004-07-27 13:02:50 +02:00
unknown
1325c4678e Merge problem
ndb/src/common/mgmcommon/ConfigInfo.cpp:
  Remove comma
2004-07-27 12:07:47 +02:00
unknown
41f3a2dcf2 Merge
mysql-test/mysql-test-run.sh:
  Auto merged
ndb/src/ndbapi/Ndbif.cpp:
  Auto merged
ndb/src/common/mgmcommon/ConfigInfo.cpp:
  SCCS merged
2004-07-27 11:57:04 +02:00