mskold@mysql.com
4dd1fc014f
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
mskold@mysql.com
4623fb9f48
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
pekka@mysql.com
8bd205c8e2
ha_ndbcluster.h, ha_ndbcluster.cc:
...
compile fix for gcc-2.95
2004-07-29 10:44:53 +02:00
ingo@mysql.com
fd1fad4371
Fixed a copy-and-paste error: mysql_create_frm() should have
...
its own enter string.
2004-07-29 10:33:33 +02:00
jan@hundin.mysql.fi
9d615368ac
Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/jan/mysql-4.1
2004-07-29 09:04:50 +03:00
paul@kite-hub.kitebird.com
88f6267b63
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
paul@kite-hub.kitebird.com
a3091294b4
Fix some variable misorderings.
2004-07-28 14:52:04 -05:00
ingo@mysql.com
a34ae3c573
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
ingo@mysql.com
e25126c68a
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
pekka@mysql.com
7874177651
DbtuxScan.cpp:
...
fix erronous assert at scan close, lock abort
2004-07-28 19:54:38 +02:00
konstantin@mysql.com
7eddfc8e9a
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
pekka@mysql.com
b2b5e8715d
MgmtSrvr.hpp:
...
make subclass friend for gcc-2.95 et al [dup push]
2004-07-28 18:55:17 +02:00
konstantin@mysql.com
22b3e25a91
Fixing MYSQL_CHEKC_ZLIB_DIR to take into account user settings (in case there
...
are such)
2004-07-28 09:34:06 -07:00
pekka@mysql.com
9ef1f2f172
MgmtSrvr.hpp:
...
make subclass friend for gcc-2.95 et al
2004-07-28 15:35:02 +02:00
pekka@mysql.com
aa9c8e9ebf
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
...
into mysql.com:/space/pekka/ndb/version/my41-tux
2004-07-28 12:53:23 +02:00
joreland@mysql.com
2db2235512
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
joreland@mysql.com
bac5d8f9b6
Fix 64-bit issue in ConfigValues
2004-07-28 11:05:00 +02:00
magnus@neptunus.(none)
10583f05c9
Added order by to make the test output from ndb_basic and ndb_lock predicatble
2004-07-28 10:28:30 +02:00
dlenev@brandersnatch.localdomain
d39fe2623f
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).
2004-07-28 10:49:21 +04:00
jan@hundin.mysql.fi
8be6dd7d70
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
konstantin@mysql.com
674bbf0825
Order of libs is important when building an optimized library: put ZLIB last
...
in the list.
2004-07-27 21:59:28 -07:00
konstantin@mysql.com
f6f1e1f47b
acinclude.m4:
...
another spelling mistake fixed
2004-07-27 10:05:57 -07:00
konstantin@mysql.com
b14b00249f
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/kostja/mysql/mysql-4.1-zlib
2004-07-27 10:05:56 -07:00
konstantin@mysql.com
d68ed3f0f7
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
2004-07-27 10:05:55 -07:00
bar@mysql.com
fd8b3474b5
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
bar@mysql.com
7f58bb793e
A small fix to understand 4.1.0 format.
2004-07-27 18:43:40 +05:00
pekka@mysql.com
f34debd997
wl-1884 storing NULL in ordered index
2004-07-27 13:20:37 +02:00
mskold@mysql.com
97d1cf9f3a
Merge
2004-07-27 13:02:50 +02:00
magnus@neptunus.(none)
e2cc399991
Merge problem
2004-07-27 12:07:47 +02:00
magnus@neptunus.(none)
8b9d8b4118
Merge
2004-07-27 11:57:04 +02:00
jan@hundin.mysql.fi
9e3111486f
Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/jan/mysql-4.1
2004-07-27 12:44:15 +03:00
pekka@mysql.com
9eb01d3ea3
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
...
into mysql.com:/orca/space/pekka/ndb/version/my41-blobs
2004-07-27 10:32:08 +02:00
pekka@mysql.com
8c0ec12baf
NdbSqlUtil.cpp, NdbSqlUtil.hpp:
...
add NdbSqlUtil::cmp for missing datatypes
2004-07-27 10:31:10 +02:00
mskold@mysql.com
894501a1c9
Merge mskold@build.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1-ndb
2004-07-27 09:59:26 +02:00
joreland@mysql.com
80a7fa715e
testOIBasic
...
Make sure not to fiddle with state, if not waiting for scan
2004-07-27 01:01:16 +02:00
serg@serg.mylan
3de8784b17
safemalloc always resets the free'd memory, not only when PEDANTIC_SAFEMALLOC
2004-07-26 21:33:42 +02:00
jani@rhols221.adsl.netsonic.fi
51fbc5831c
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into rhols221.adsl.netsonic.fi:/home/my/bk/mysql-4.1
2004-07-26 17:42:14 +03:00
jani@rhols221.adsl.netsonic.fi
7c3164577f
Added info about new --log-warnings option.
2004-07-26 17:41:52 +03:00
pekka@mysql.com
43efb3cce8
tux - remove obsolete signals tux->tup
2004-07-26 12:35:05 +02:00
lenz@mysql.com
6c8641c1cc
- typo fix: protocoll -> protocol
2004-07-26 12:32:04 +02:00
jan@hundin.mysql.fi
9268cb0b84
Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/jan/mysql-4.1
2004-07-26 08:37:33 +03:00
joreland@mysql.com
51b94746fe
Merge mysql.com:/home/jonas/src/mysql-4.1
...
into mysql.com:/home/jonas/src/irix
2004-07-26 00:58:23 +02:00
pekka@mysql.com
fcb569f257
tux optim 13 - replace read keys & query th signals tux->tup by methods
2004-07-25 16:41:11 +02:00
konstantin@mysql.com
569d3c8488
WL#1518, "make bundled zlib usable for unix builds":
...
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 ;)
2004-07-24 03:30:11 -07:00
konstantin@mysql.com
cd5ed13e4d
Final touch: add compile-hpux11-parisc2-aCC to source distribution
2004-07-23 23:02:57 -07:00
konstantin@mysql.com
076156cc86
A small fix to let building of debug versions on HP-UX11
2004-07-23 20:28:54 -07:00
konstantin@mysql.com
33bec628a6
BUILD/compile-hpux11-parisc2-aCC: a handy script to compile on HP-UX11
2004-07-23 20:21:49 -07:00
konstantin@mysql.com
9b5e3745d3
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/kostja/mysql/mysql-4.1-warnings
2004-07-23 18:52:42 -07:00
konstantin@mysql.com
4139c359f8
All templates inlined into AC_DEFINE/AC_DEFINE_UNQUOTED.
...
Use of acconfig.h is deprecated in modern autotools (a cleaner patch).
2004-07-23 18:52:25 -07:00
pem@mysql.comhem.se
29662d14ec
Fix for stored procedures BUG#4726: Stored procedure crash when looping over SELECT with complex WHERE's.
2004-07-23 18:42:24 +02:00