summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix some variable misorderings.paul@kite-hub.kitebird.com2004-07-282-11/+11
|
* Merge bk-internal.mysql.com:/home/bk/mysql-4.1konstantin@mysql.com2004-07-281-2/+2
|\ | | | | | | into mysql.com:/home/kostja/mysql/mysql-4.1-root
| * Fixing MYSQL_CHEKC_ZLIB_DIR to take into account user settings (in case therekonstantin@mysql.com2004-07-281-2/+2
| | | | | | | | are such)
* | MgmtSrvr.hpp:pekka@mysql.com2004-07-281-0/+3
| | | | | | | | make subclass friend for gcc-2.95 et al [dup push]
* | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1joreland@mysql.com2004-07-281-3/+5
|\ \ | | | | | | | | | into mysql.com:/home/jonas/src/mysql-4.1
| * | Fix 64-bit issue in ConfigValuesjoreland@mysql.com2004-07-281-3/+5
| |/
* | Added order by to make the test output from ndb_basic and ndb_lock predicatblemagnus@neptunus.(none)2004-07-284-17/+17
|/
* Order of libs is important when building an optimized library: put ZLIB lastkonstantin@mysql.com2004-07-271-2/+2
| | | | in the list.
* acinclude.m4:konstantin@mysql.com2004-07-271-1/+1
| | | | another spelling mistake fixed
* Merge bk-internal.mysql.com:/home/bk/mysql-4.1konstantin@mysql.com2004-07-2711-61/+188
|\ | | | | | | into mysql.com:/home/kostja/mysql/mysql-4.1-zlib
| * WL#1518 "make bundled zlib usable for unix builds", post review fixes:konstantin@mysql.com2004-07-273-56/+78
| | | | | | | | | | | | | | - 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
| * WL#1518, "make bundled zlib usable for unix builds": konstantin@mysql.com2004-07-2411-62/+167
| | | | | | | | | | | | | | | | | | | | | | | | | | 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 ;)
* | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1bar@mysql.com2004-07-271-3/+10
|\ \ | | | | | | | | | into mysql.com:/usr/home/bar/mysql-4.1
| * | A small fix to understand 4.1.0 format.bar@mysql.com2004-07-271-3/+10
| | |
* | | Mergemskold@mysql.com2004-07-2720-166/+220
|\ \ \
| * | | Merge problemmagnus@neptunus.(none)2004-07-271-1/+1
| | | |
| * | | Mergemagnus@neptunus.(none)2004-07-2718-144/+111
| |\ \ \
| | * | | Added new test/result file ndb_types to test creating tables with different ↵magnus@neptunus.(none)2004-07-192-0/+83
| | | | | | | | | | | | | | | | | | | | column types in NDB
| | * | | BUG#4511 Made Discless deprecatedmagnus@neptunus.(none)2004-07-194-7/+23
| | | | |
| | * | | BUG#4511magnus@neptunus.(none)2004-07-162-2/+2
| | | | |
| | * | | Moved testScanPerf to ndb/test/ndbapi/ and added it to Makefilemagnus@neptunus.(none)2004-07-153-9/+2
| | | | |
| | * | | Remove the remains of SCAN_TABINFO signalmagnus@neptunus.(none)2004-07-158-126/+1
| | | | |
| * | | | Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1-ndbpekka@mysql.com2004-07-272-22/+109
| |\ \ \ \ | | | | | | | | | | | | | | | | | | into mysql.com:/orca/space/pekka/ndb/version/my41-blobs
| | * | | | NdbSqlUtil.cpp, NdbSqlUtil.hpp:pekka@mysql.com2004-07-272-22/+109
| | | | | | | | | | | | | | | | | | | | | | | | add NdbSqlUtil::cmp for missing datatypes
* | | | | | Merge mskold@build.mysql.com:/home/bk/mysql-4.1mskold@mysql.com2004-07-27198-17415/+6601
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | | into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1-ndb
| * | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1jani@rhols221.adsl.netsonic.fi2004-07-261-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | into rhols221.adsl.netsonic.fi:/home/my/bk/mysql-4.1
| | * | | | Added info about new --log-warnings option.jani@rhols221.adsl.netsonic.fi2004-07-261-1/+1
| | | |_|/ | | |/| |
| * | | | - typo fix: protocoll -> protocollenz@mysql.com2004-07-261-1/+1
| |/ / /
| * | | Final touch: add compile-hpux11-parisc2-aCC to source distributionkonstantin@mysql.com2004-07-231-0/+1
| | | |
| * | | A small fix to let building of debug versions on HP-UX11konstantin@mysql.com2004-07-231-1/+2
| | | |
| * | | BUILD/compile-hpux11-parisc2-aCC: a handy script to compile on HP-UX11konstantin@mysql.com2004-07-231-0/+80
| | | |
| * | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1konstantin@mysql.com2004-07-233-522/+204
| |\ \ \ | | | | | | | | | | | | | | | into mysql.com:/home/kostja/mysql/mysql-4.1-warnings
| | * | | All templates inlined into AC_DEFINE/AC_DEFINE_UNQUOTED.konstantin@mysql.com2004-07-233-522/+204
| | | | | | | | | | | | | | | | | | | | Use of acconfig.h is deprecated in modern autotools (a cleaner patch).
| * | | | Fix for stored procedures BUG#4726: Stored procedure crash when looping over ↵pem@mysql.comhem.se2004-07-231-0/+3
| | | | | | | | | | | | | | | | | | | | SELECT with complex WHERE's.
| * | | | Bug #4555 ALTER TABLE crashes mysqld with enum column collated utf8_unicode_cibar@mysql.com2004-07-233-2/+16
| | | | |
| * | | | sql_db.cc:bar@mysql.com2004-07-231-0/+2
| |/ / / | | | | | | | | | | | | | | | | mysqld crashes on CREATE TABLE in a database with corrupted db.opt file. Bug#4646
| * | | Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1magnus@neptunus.(none)2004-07-231-0/+2
| |\ \ \ | | | | | | | | | | | | | | | into neptunus.(none):/home/magnus/mysql-4.1
| | * | | Add include of signal.h to Emulator.cppmagnus@neptunus.(none)2004-07-231-0/+2
| | | | |
| * | | | Added missing error message to estonian/errmsg.txt.pem@mysql.comhem.se2004-07-221-0/+1
| |/ / /
| * | | Adding *.hpp files for testScan and testScanInterpreter to sources magnus@neptunus.(none)2004-07-229-66/+2
| | | | | | | | | | | | | | | | Removing old directories for test/ using bk rmdir
| * | | a line left from manual merge removedkonstantin@mysql.com2004-07-211-1/+0
| | | |
| * | | First step of implementation of WL#1518 "make bundled zlibkonstantin@mysql.com2004-07-21107-16663/+5734
| | | | | | | | | | | | | | | | usable for unix builds": zlib 1.2.1 imported
| * | | Export the stmt functions on Embedded Servermiguel@hegel.(none)2004-07-211-0/+27
| | | |
| * | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1bell@sanja.is.com.ua2004-07-216-20/+18
| |\ \ \ | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
| | * | | LEX initialization fixedbell@sanja.is.com.ua2004-07-216-20/+18
| | | | |
| * | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1/serg@serg.mylan2004-07-217-1/+66
| |\ \ \ \ | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| | * | | | fixed ORDER BY ?serg@serg.mylan2004-07-217-1/+66
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | 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)
| * | | | Final patch for WL#1600(warn if max_allowed_packet used)hf@deer.(none)2004-07-2127-12/+45
| | | | |
| * | | | Merginghf@deer.(none)2004-07-216-11/+67
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | WL#1600 (Warn if result is truncatet due to max_allowed_packet)hf@deer.(none)2004-06-2928-10/+90
| | | | |