summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fixed core dump bug when hot link list in key cache was empty. Bug #10167unknown2005-04-273-6/+221
| | | | | mysql-test/r/drop.result: Fixed result
* Cleanups during reviewunknown2005-04-263-34/+44
| | | | | | | | | | | | mysys/default.c: Cleanup: - Just test once for recursion level - Don't test explicitely for \r or \n as my_isspace() already does that sql/sql_insert.cc: Fix argument sql/sql_select.cc: Fixed indentation added comment
* Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-04-264-1/+7
|\ | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-4.1 sql/mysqld.cc: Auto merged
| * Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-04-264-1/+7
| |\ | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-4.1 sql/mysqld.cc: Auto merged
| | * Small fixes done while reviewing pushed codeunknown2005-04-063-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/innodb-replace.result: Added proper cleanup for test mysql-test/t/innodb-replace.test: Added proper cleanup for test sql/share/english/errmsg.txt: Don't extend the possible length of error message too much for common errors are MySQL 4.0 clients has a limit of 200 characters
| | * Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-04-061-0/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-4.1 sql/mysqld.cc: Auto merged
| | | * Fixed that create_time is set properly for cached threadsunknown2005-04-061-0/+1
| | | |
* | | | Merge bk-internal:/home/bk/mysql-4.1unknown2005-04-262-2/+69
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-4.1-clean
| * | | | checking that statements get into binlog even when they were affectingunknown2005-04-262-2/+69
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | no rows of the blackhold engine (for this engine to be a binlog propagator). NOTE: blackhole.test currently hangs in 5.0 BUG#10175 so I'll merge without running this test; the person who fixes the hang will correct the merged blackhole.result or ask me to). mysql-test/r/blackhole.result: result update mysql-test/t/blackhole.test: checking that statements get into binlog even when they were affecting no rows of the blackhold engine. So that this engine can serve as a binlog propagator (A->B->C replication where B has only blackhole tables, B receives binlog from A, applies it to blackhole tables, writes statements to its binlog which it sends to C; both A and C have non-blackhole tables). B is just a proxy.
* | | | Fix typo in include file name (Bug #9063)unknown2005-04-261-1/+1
| | | | | | | | | | | | | | | | | | | | acinclude.m4: Fix typo
* | | | Fix compile issues in Intel C/C++ compiler (Bug #9063)unknown2005-04-253-6/+37
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | acinclude.m4: Use AC_LANG_PUSH/POP instead of _SAVE/RESTORE Add test to get type of 'struct rlimit' Switch order of including stdlib.h and declaration being tested to match how it will be used in regular code. configure.in: Call MYSQL_TYPE_STRUCT_RLIMIT macro sql/mysqld.cc: Use STRUCT_RLIMIT for getting type of struct rlimit.
* | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-04-251-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/dlenev/src/mysql-4.1-bg10040
| * | | Fix for func_sapdb failures on 64-bit platforms (aka Bug #10040 unknown2005-04-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "'func_sapdb' fails on 64bit build hosts") sql/item_timefunc.cc: calc_time_diff(): Fixed yet another signedness problem.
* | | | ndb - bug#10029 fixunknown2005-04-237-90/+205
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ndb/include/kernel/signaldata/TuxMaint.hpp: handle multipl index update failure atomically ndb/src/kernel/blocks/dbtup/Dbtup.hpp: handle multipl index update failure atomically ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp: handle multipl index update failure atomically ndb/src/kernel/blocks/dbtup/Notes.txt: handle multipl index update failure atomically ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp: handle multipl index update failure atomically ndb/src/ndbapi/ndberror.c: handle multipl index update failure atomically ndb/test/ndbapi/testOIBasic.cpp: handle multipl index update failure atomically
* | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-04-224-52/+154
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
| * | | | Fix for Bug #9318 drop database does not drop ndb tablesunknown2005-04-224-52/+154
| | | | |
* | | | | Bug#7806 - insert on duplicate key and auto-update of timestampunknown2005-04-222-9/+16
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | A fix of the original patch. Correctly clear a bit from an enum value.
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-04-211-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-4.1
| * | | | C99 Portability fixunknown2005-04-211-3/+3
| |/ / /
* | | | - added missing file config_readline.h to the source distributionunknown2005-04-211-1/+1
|/ / /
* | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-04-211-1/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
| * | | Fix for failing ps_7ndb.test, force write_row when batching inserts so that ↵unknown2005-04-211-1/+4
| | | | | | | | | | | | | | | | update of primary key is done before next value to insert
* | | | Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-04-214-11/+60
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.1
| * | | Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-04-214-1/+40
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.1
| * \ \ \ Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-04-204-11/+60
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.1
| | * | | | - Enabled the "blackhole" storage engine for the Max RPM subpackageunknown2005-04-201-0/+5
| | | | | |
| | * | | | - manual mergeunknown2005-04-193-11/+55
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/share/Makefile.am: Auto merged
| | | * | | | - added missing copyright headers to several Makefile.am's (noticedunknown2005-04-193-0/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | while testing changes to the mysql-copyright scripts libmysqld/examples/Makefile.am: - added a copyright header sql/share/Makefile.am: - added a copyright header tools/Makefile.am: - added a copyright header
| | | * | | | Updated Docs/Makefile.am:unknown2005-04-191-10/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - fixed copyright header and removed obsolete comments about how to build the manual using texinfo - added an "install-data-hook" to install the mysql.info info page. This seems to be the only way to install info pages, if they are not built from texinfo sources directly. Docs/Makefile.am: - fixed copyright header and removed obsolete comments about how to build the manual using texinfo - added an "install-data-hook" to install the mysql.info info page. This seems to be the only way to install info pages, if they are not built from texinfo sources directly.
| | | * | | | - removed COPYING from txt_files of Docs/Makefile.amunknown2005-04-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (it's already in EXTRA_DIST of the toplevel Makefile.am) Docs/Makefile.am: - removed COPYING from txt_files (it's already in EXTRA_DIST of the toplevel Makefile.am)
* | | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-04-2141-105/+258
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
| * | | | | | Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1unknown2005-04-211-0/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into deer.(none):/home/hf/work/mysql-4.1.7344
| | * | | | | | Fix for bug #7344 (Repeating mysql_server_start/mysql_server_end crash clients)unknown2005-04-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One more free_charset call added libmysql/libmysql.c: free_charset call added
| * | | | | | | Merge rurik.mysql.com:/home/igor/mysql-4.1unknown2005-04-203-1/+39
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into rurik.mysql.com:/home/igor/dev/mysql-4.1-0 sql/sql_select.cc: Auto merged
| | * | | | | | sql_select.cc:unknown2005-04-193-1/+39
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed bug #9681. The bug happened with queries using derived tables specified by a SELECT with ROLLUP, such as: SELECT * FROM (SELECT a, SUM(a) FROM t1 GROUP BY a WITH ROLLUP) t2, if column a of table t1 is declared as NOT NULL. This was to the fact that the first column of the temporary table created to contain the derived table erroneously inherited the NOT NULL attribute from column a. olap.result, olap.test: Added a test case for bug #9681. mysql-test/t/olap.test: Added a test case for bug #9681. mysql-test/r/olap.result: Added a test case for bug #9681. sql/sql_select.cc: Fixed bug #9681. The bug happened with queries using derived tables specified by a SELECT with ROLLUP, such as: SELECT * FROM (SELECT a, SUM(a) FROM t1 GROUP BY a WITH ROLLUP) t2, if column a of table t1 is declared as NOT NULL. This was to the fact that the first column of the temporary table created to contain the derived table erroneously inherited the NOT NULL attribute from column a.
| * | | | | | ndb - dbug aid for api signal logunknown2005-04-201-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ndb/src/ndbapi/TransporterFacade.cpp: dbug aid for api signal log
| * | | | | | Merge mysql.com:/home/mydev/mysql-4.1unknown2005-04-205-14/+154
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mydev/mysql-4.1-bug7806
| | * \ \ \ \ \ Merge mysql.com:/home/mydev/mysql-4.1unknown2005-04-205-14/+154
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mydev/mysql-4.1-bug7806
| | | * | | | | | Bug#7806 - insert on duplicate key and auto-update of timestampunknown2005-04-195-14/+154
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modified the check for the timestamp field so that the flags for the automatic for inserts and updates are cleared independently. mysql-test/r/type_timestamp.result: Bug#7806 - insert on duplicate key and auto-update of timestamp The test result. mysql-test/t/type_timestamp.test: Bug#7806 - insert on duplicate key and auto-update of timestamp The test case. sql/mysql_priv.h: Bug#7806 - insert on duplicate key and auto-update of timestamp Made check_insert_fields() static. It is used only in sql_insert.cc. sql/sql_insert.cc: Bug#7806 - insert on duplicate key and auto-update of timestamp Modified the check of the insert fields so that an explicit assignment of the timestamp field does only disable the automatic for inserts and retains the automatic for updates. Added a check if the update fields contain the timestamp field. In this case, the automatic on update is disabled, but not the automatic on insert. This is called from mysql_prepare_insert(). sql/table.h: Bug#7806 - insert on duplicate key and auto-update of timestamp Extended a comment to warn about usage of enum timestamp_auto_set_type.
| * | | | | | | | After review fixunknown2005-04-201-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cmd-line-utils/readline/config_readline.h: Fixing code formatting
| * | | | | | | | Mergeunknown2005-04-2031-90/+56
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | BUG#9568 mysql segfaults from CTRL-R unknown2005-04-1931-90/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Segfault because of passing a 64-bit pointer to 32 bit integer. - Add new include config_readline.h which will calculate some new defines based on what is found in config.h - This file was originally included in readline 4.3 as config.h.in, only the part that makes new defines have been moved to this file. cmd-line-utils/readline/bind.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/callback.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/complete.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/display.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/funmap.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/histexpand.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/histfile.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/history.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/histsearch.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/input.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/isearch.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/keymaps.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/kill.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/macro.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/mbutil.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/misc.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/nls.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/parens.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/readline.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/rltty.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/search.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/shell.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/signals.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/terminal.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/text.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/tilde.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/undo.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/util.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/vi_mode.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/xmalloc.c: Include local config_readline.h instead of config.h
* | | | | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-04-2025-23/+84
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
| * | | | | | | | Removed forgotten abort() call, bug#10001unknown2005-04-201-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Removed forgotten abort() call
| * | | | | | | | Disabled ndb tests for embeddedunknown2005-04-1922-0/+22
| | | | | | | | |
| * | | | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-04-193-22/+62
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
| | * | | | | | | Fix for Bug #9691 UPDATE fails on attempt to update primary keyunknown2005-04-193-22/+62
| | | | | | | | |
* | | | | | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-04-206-95/+150
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/psergey/mysql-4.1-bug9103
| * | | | | | | | Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-04-191-4/+4
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into hundin.mysql.fi:/home/jan/mysql-4.1
| | * | | | | | | Style change. Use 1 and 0 instead of true and false.unknown2005-04-191-4/+4
| | |/ / / / / /
View Lorry Controller Status