summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-1133-136/+536
|\ | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-4.1 sql/sql_class.h: Auto merged
| * 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
| | | | * | | | | 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
| | | | | * | | | | Fix for bug #6434 (bad memory deletion in app using libmysqld)unknown2005-01-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should build libmysqld in SAFEMALLOC mode. VC++Files/libmysqld/libmysqld.dsp: SAFEMALLOC define added to the libmysqld/Debug configuration
| | * | | | | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-113-5/+57
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jonas/src/mysql-4.1
| | | * | | | | | | bug#7798 - ndb - range scan with invalid table version could cause node failureunknown2005-01-113-5/+57
| | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/ndb_index_ordered.result: Test scan with invalid table version mysql-test/t/ndb_index_ordered.test: Test scan with invalid table version ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Set apiConnectstate= CS_ABORTING when receving a scan req with invalid table version
| | * | | | | | | Followup: rename the declaration (hash_reset -> my_hash_reset)unknown2005-01-111-1/+1
| | | |_|/ / / / | | |/| | | | |
| | * | | | | | A fix for linking failure of MySQL client when linking with imap librariesunknown2005-01-112-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (Bug#7428) (renamed: hash_reset -> my_hash_reset) mysys/hash.c: renamed: hash_reset -> my_hash_reset sql/sql_class.h: hash_reset -> my_hash_reset
| | * | | | | | make it compile with -ansi -pedanticunknown2005-01-111-1/+1
| | |/ / / / /
| * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1/unknown2005-01-111-3/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| | * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1/unknown2005-01-111-3/+1
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| | | * | | | | bad merge fixedunknown2005-01-101-3/+1
| | | | | | | |
| * | | | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-111-0/+4
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jonas/src/mysql-4.1
| | * | | | | | bug#7765 - ndb startup on 64-bit, increase stack on 64-bitunknown2005-01-111-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ndb/src/common/portlib/NdbThread.c: Use double stack for 64-bit
| * | | | | | | Bug#7477unknown2005-01-111-22/+7
| | | | | | | |
| * | | | | | | Merge mysql.com:/home/jwinstead2/mysql-4.1-7556unknown2005-01-111-22/+38
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jwinstead2/mysql-4.1-clean
| | * | | | | | | Replace all sprintf() calls with my_snprintf() in client.c. All of theunknown2005-01-091-22/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | format strings (in all languages) already included field limits on the specifiers, so this is just protection against future mistakes. (Bug #7556) sql-common/client.c: Replace all sprintf() calls with my_snprintf()
| * | | | | | | | Merge mysql.com:/home/jwinstead2/mysql-4.1-7762unknown2005-01-111-13/+17
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jwinstead2/mysql-4.1-clean
| | * | | | | | | Fix style nitunknown2005-01-111-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/examples/ha_archive.cc: Fix style
| | * | | | | | | Fix double-initalization of mutex in archive storage engine. (Bug #7762)unknown2005-01-101-14/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/examples/ha_archive.cc: Fix redundant initialization of share->mutex Fix error handling to always clean up correctly Fix a couple of warnings
| * | | | | | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-102-1/+236
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mysql_src/mysql-4.1-clean
| | * | | | | | | - removed the mysql-test/suites/jp test suite and marked all files as goneunknown2005-01-101-0/+235
| | | | | | | | |
| | * | | | | | | os0file.c:unknown2005-01-101-1/+1
| | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix compiler error on those OS X platforms where Apple's special file flush trick with fcntl() is not defined innobase/os/os0file.c: Fix compiler error on those OS X platforms where Apple's special file flush trick with fcntl() is not defined
| * | | | | | | A test for the BUG#7658 just fixed in 4.0 (could not put it into 4.0 as in ↵unknown2005-01-102-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.0 we don't replicate OPTIMIZE TABLE).
| * | | | | | | Merge mysql.com:/home/mysql_src/mysql-4.0unknown2005-01-102-1/+4
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mysql_src/mysql-4.1-clean Build-tools/Bootstrap: Auto merged sql/net_serv.cc: Auto merged
| | * | | | | | Fix for BUG#7658 "optimize crashes slave thread (1 in 1000)]":unknown2005-01-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql_admin_table() attempted to write to a vio which was 0. I could have fixed mysql_admin_table() but fixing my_net_write() looked more future-proof. sql/net_serv.cc: If no VIO, no write.
| | * | | | | | Bootstrap:unknown2005-01-061-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Made the default --mail address to be <build@mysql.com>. Build-tools/Bootstrap: Made the default --mail address to be <build@mysql.com>.
* | | | | | | | Review of new pushed codeunknown2005-01-111-8/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Indentation cleanup client/mysqladmin.cc: Indentation cleanup
* | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-10274-150/+69600
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-4.1 sql/sql_parse.cc: Auto merged sql/sql_table.cc: Auto merged
| * | | | | | | bug#7761 - ndb does not autcommit - postreview fixesunknown2005-01-101-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/sql_table.cc: Move ha_enable to before new Copy, to ensure no memory is leaked
| * | | | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-101-11/+13
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jonas/src/mysql-4.1
| | * | | | | | | bug#7761 - ndb does not autocommit during alter tableunknown2005-01-101-11/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/sql_table.cc: Turn off transactions before locking (as locking will need to know)
| * | | | | | | | set_var.cc:unknown2005-01-081-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whack duplicate variable line. (Affects SHOW VARIABLES.) sql/set_var.cc: Whack duplicate variable line. (Affects SHOW VARIABLES.)