Commit graph

13511 commits

Author SHA1 Message Date
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
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
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
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
lenz@mysql.com
6c8641c1cc - typo fix: protocoll -> protocol 2004-07-26 12:32:04 +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
bar@mysql.com
6cad42e3ce Bug #4555 ALTER TABLE crashes mysqld with enum column collated utf8_unicode_ci 2004-07-23 19:10:06 +05:00
mskold@mysql.com
345e1dc42a Fixed merge problems, optimized bulk insert 2004-07-23 15:46:56 +02:00
bar@mysql.com
0f298f02db sql_db.cc:
mysqld crashes on CREATE TABLE in a database with corrupted db.opt file.
  Bug#4646
2004-07-23 17:11:45 +05:00
pekka@mysql.com
156bfa48f5 ha_ndbcluster.cc:
merge
2004-07-23 13:41:38 +02:00
pekka@mysql.com
56fa7bfd90 Merge 2004-07-23 13:27:26 +02:00
pekka@mysql.com
f14d9c672b ha_ndbcluster.cc:
ndb_supported_type, include all types in switch
2004-07-23 13:21:39 +02:00
mskold@mysql.com
0d56d7ffdf Changed bulk insert to only be statement wise 2004-07-23 13:13:50 +02:00
magnus@neptunus.(none)
9d3edfb6b2 Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/magnus/mysql-4.1
2004-07-23 10:40:27 +02:00
mskold@mysql.com
6216a8bf1b Fixes after code review of WL#1791 Handler: support update of primary key 2004-07-23 10:33:51 +02:00
magnus@neptunus.(none)
e93dadd4e7 Add include of signal.h to Emulator.cpp 2004-07-23 10:32:23 +02:00
mskold@mysql.com
f08af1382c Cosmetic fix 2004-07-22 19:14:05 +02:00
mskold@mysql.com
217bd8b6bd WL#1791 Handler: support update of primary key 2004-07-22 18:35:51 +02:00
pekka@mysql.com
9c3dd2fb8b ha_ndb blobs 2 2004-07-22 12:38:09 +02:00
pekka@mysql.com
e38792a638 ha_ndb blobs 2004-07-22 12:33:14 +02:00
pem@mysql.comhem.se
e8b7c9cb1a Added missing error message to estonian/errmsg.txt. 2004-07-22 11:32:12 +02:00
magnus@neptunus.(none)
2a90034204 Adding *.hpp files for testScan and testScanInterpreter to sources
Removing old directories for test/ using bk rmdir
2004-07-22 09:37:55 +02:00
konstantin@mysql.com
cd5359ceda a line left from manual merge removed 2004-07-21 19:20:22 -07:00
konstantin@mysql.com
d2c1f3fc37 First step of implementation of WL#1518 "make bundled zlib
usable for unix builds": zlib 1.2.1 imported
2004-07-21 17:36:26 -07:00
miguel@hegel.(none)
58bdb6221c Export the stmt functions on Embedded Server 2004-07-21 19:29:08 -04:00
bell@sanja.is.com.ua
02614a0247 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2004-07-21 22:48:05 +03:00
bell@sanja.is.com.ua
a1b6f6db0e LEX initialization fixed 2004-07-21 22:44:12 +03:00
serg@serg.mylan
849ab31863 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-07-21 19:17:50 +02:00
serg@serg.mylan
555442bf6a fixed ORDER BY ?
new tests to ensure that prepared statement *really* work
(and that MySQL not picks up some number from arbitrary location
that happens to match the parameter's value)
2004-07-21 19:17:07 +02:00
hf@deer.(none)
cbff743b2d Final patch for WL#1600(warn if max_allowed_packet used) 2004-07-21 21:27:45 +05:00
hf@deer.(none)
5bff13bc72 Merging 2004-07-21 19:10:37 +05:00
mskold@mysql.com
42df1f0686 ndb_lock.test, ndb_lock.result:
new file
2004-07-21 12:06:46 +02:00
mskold@mysql.com
bb61021420 Fix for bug#4669, Scans do not ignore uncommitted inserts (instead hang on lock) 2004-07-21 11:46:14 +02:00