summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fixed a problem with a test. Time could be 0 or 1 seconds, dependingunknown2005-01-132-2/+2
| | | | | | | on whether running with or without valgrind.
* - added the 4.0 shared mysqlclient libraries to the 4.1 "shared-compat" RPMunknown2005-01-131-10/+18
|
* Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/unknown2005-01-131-26/+13
|\ | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| * Merge serg.mylan:/usr/home/serg/Abk/mysql-4.0unknown2005-01-131-26/+13
| |\ | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1 scripts/mysqlaccess.sh: Auto merged
| | * Merge bk-internal:/home/bk/mysql-4.0/unknown2005-01-121-26/+13
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.0
| | | * Symlink vulnerability fixed.unknown2005-01-121-26/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reported by Javier Fernandez-Sanguino Pena and Debian Security Audit Team (http://www.debian.org/security/audit)
* | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-132-7/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jonas/src/mysql-4.1
| * | | | bug#7864 - fix ndb limit 4.5G data memory due to truncation errorunknown2005-01-132-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ndb/src/kernel/blocks/dbtup/DbtupGen.cpp: remove 8k->32k conversion ndb/src/kernel/vm/Configuration.cpp: compute size in 32k pages directly
* | | | | libmysqld.def, libmysql.def:unknown2005-01-122-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the invisible tabs (!) libmysql/libmysql.def: Use the invisible tabs (!) libmysqld/libmysqld.def: Use the invisible tabs (!)
* | | | | libmysqld.def, libmysql.def:unknown2005-01-122-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing 'get_defaults_files' to fix linking error. libmysql/libmysql.def: Add missing 'get_defaults_files' to fix linking error. libmysqld/libmysqld.def: Add missing 'get_defaults_files' to fix linking error.
* | | | | Add logging of COM_EXECUTE in the general query log.unknown2005-01-132-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | sql/sql_parse.cc: A shorter name for COM_EXECUTE command.
* | | | | Minor clean up.unknown2005-01-122-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/t/analyse.test: Added a note about the bug that this test case tests. sql/sql_analyse.cc: Changed function description to standard format.
* | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-121-3/+26
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | into build.mysql.com:/users/tulin/mysql-4.1
| * | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-121-3/+26
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into build.mysql.com:/users/tulin/mysql-4.1
| | * | | | fix shm keyunknown2005-01-121-3/+26
| | |/ / /
* | | | | A test case for Bug#6761 "mysql_list_fields doesn't work"unknown2005-01-121-0/+24
| | | | |
* | | | | Merge mysql.com:/home/kostja/work/mysql-4.0-6761unknown2005-01-121-1/+1
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/kostja/work/mysql-4.1-root sql/mysqld.cc: Auto merged sql/sql_parse.cc: Auto merged
| * | | A fix for Bug#6761 "mysql_list_fields() does not work": testunknown2005-01-121-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | case will be added to client_test in 4.1 sql/sql_parse.cc: A fix for bug #6761: "mysql_list_fields() does not work": init thd->query_length, which is used next line. Remove a stale comment.
| * | Merge bk-internal:/home/bk/mysql-4.0/unknown2005-01-121-0/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.0 sql/mysqld.cc: Auto merged
* | \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1/unknown2005-01-120-0/+0
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| * | | merged. ul.unknown2005-01-120-0/+0
| |\ \ \ | | | |/ | | |/|
| | * | added missing Com_update_multi status variableunknown2005-01-121-0/+1
| | | |
* | | | Merge mysql.com:/space/my/mysql-4.1unknown2005-01-121-14/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.1-merge
| * | | | - Modified Do-compile to run the test suite with ps-protocol and against unknown2005-01-121-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the embedded server by default (if included). These additional steps can be skipped by providing "--skip-embedded-test" and "--skip-ps-test" Build-tools/Do-compile: - enabled running the test suite with ps-protocol and against the embedded server by default (if included). These additional steps can be skipped by providing "--skip-embedded-test" and "--skip-ps-test"
* | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-121-22/+20
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jonas/src/mysql-4.1
| * | | | | ndb - fix 64-bit problem in autotestunknown2005-01-121-22/+20
| |/ / / / | | | | | | | | | | | | | | | | | | | | ndb/test/src/CpcClient.cpp: Fix 64-bit problem
* | | | | ndbcluster.sh:unknown2005-01-111-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | increased timeouts to see if more tests get started automatically mysql-test/ndb/ndbcluster.sh: increased timeouts to see if more tests get started automatically
* | | | | Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-112-1/+2
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jwinstead2/mysql-4.1-clean
| * | | | Merge mysql.com:/home/jwinstead2/mysql-4.1-6418unknown2005-01-111-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jwinstead2/mysql-4.1-clean
| | * | | | Use ZLIB_LIBS when linking libmysqlclient_r (Bug #6418)unknown2005-01-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libmysql_r/Makefile.am: Make sure we link against zlib
| * | | | | Replace ZLIB_LIBS in mysql_config. (Bug #6418)unknown2005-01-111-0/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | scripts/Makefile.am: Replace ZLIB_LIBS
* | | | | Fixed Bug#2813, "analyse does not quot string values in enams from string".unknown2005-01-113-1/+68
|/ / / /
* | | | Bug #7730 Server crash using soundex on an utf8 tableunknown2005-01-113-5/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't use my_tolower: it works only for 8bit charsets.
* | | | Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1unknown2005-01-114-17/+55
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into deer.(none):/home/hf/work/mysql-4.1.5920 client/mysql.cc: Auto merged
| * | | | fix for bug #5920 (embedded-server mysql doesn't handle --defaults-file)unknown2005-01-034-17/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client/mysql.cc: bug #5920 (embedded-server mysql doesn't handle --defaults-file) defaults files handled include/my_sys.h: bug #5920 (embedded-server mysql doesn't handle --defaults-file) get_defaults_file interface added libmysqld/libmysqld.c: just small fix, not related to the bug. mysys/default.c: bug #5920 (embedded-server mysql doesn't handle --defaults-file) get_defaults_files implementation
* | | | | Merge mysql.com:/space/my/mysql-4.1unknown2005-01-113-5/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.1-build
| * | | | | - Create the mysqld binaries with the correct file names during the buildunknown2005-01-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of renaming them in the packaging stage with Do-win-build later: mysqld-opt.exe -> mysqld.exe, mysqld.exe -> mysqld-debug.exe
| * | | | | - Housekeeping: removed a few unreferenced variables, noticed while doingunknown2005-01-112-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows builds sql/sql_base.cc: - removed an unreferenced variable sql/strfunc.cc: - removed an unreferenced variable
* | | | | | A fix for Bug#7365 "embedded server for MacOS: problem with preparedunknown2005-01-111-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | statements": no test case, the test case is there already, libmysqld/examples/client_test.c, we just need to run it on a daily basis. libmysqld/lib_sql.cc: Convert statement id to least significant byte first format, uset for data transmission in MySQL protocol. It's assumed to be in this format by mysql_stmt_execute.
* | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-115-39/+49
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
| * | | | | | bug fixed parsing with comments on same lineunknown2005-01-112-5/+13
| | | | | | |
| * | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-114-6/+58
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
| * | | | | | | Suma.cpp:unknown2005-01-111-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | same as prev fix, wrong read of 64 bit value ndb/src/kernel/blocks/suma/Suma.cpp: same as prev fix, wrong read of 64 bit value
| * | | | | | | Backup.cpp:unknown2005-01-111-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug#7660 ndb/src/kernel/blocks/backup/Backup.cpp: bug#7660
| * | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-111-30/+27
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
| | * \ \ \ \ \ \ Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-111-30/+27
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
| | | * | | | | | | can't use my_pread,my_pwrite since it uses mutexes on the filesunknown2005-01-111-30/+27
| | | | | | | | | |
* | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1/unknown2005-01-118-13/+65
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| * | | | | | | | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-111-1/+1
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into deer.(none):/home/hf/work/mysql-4.1.7330
| | * \ \ \ \ \ \ \ \ Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1unknown2005-01-111-1/+1
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into deer.(none):/home/hf/work/mysql-4.1.7330