summaryrefslogtreecommitdiff
path: root/BitKeeper
Commit message (Collapse)AuthorAgeFilesLines
* Merge mysql.com:/space/my/mysql-4.1lenz@mysql.com2005-12-071-4/+4
|\ | | | | | | into mysql.com:/space/my/mysql-5.0-merg
| * Merge mysql.com:/space/my/mysql-4.0lenz@mysql.com2005-12-071-4/+4
| |\ | | | | | | | | | into mysql.com:/space/my/mysql-4.1
| | * - commit emails are now sent to commits@lists.mysql.com instead of lenz@mysql.com2005-12-061-4/+4
| | | | | | | | | | | | internals@lists.mysql.com to reduce the noise on the internals list.
* | | Merge mysql.com:/home/mysql_src/mysql-4.1guilhem@mysql.com2005-10-121-0/+1
|\ \ \ | |/ / | | | | | | | | | into mysql.com:/home/mysql_src/mysql-5.0; a very bad automerge (issues with non-ascii chars), plus some hard conflicts I'll fix by hand in a next cset
| * | Importing BUILD/compile-pentium64-valgrind-max from 5.0 (unchanged), and ↵guilhem@mysql.com2005-10-041-0/+1
| | | | | | | | | | | | speeding up 'bk citool' for me
* | | Merge mysql.com:/home/alexi/dev/mysql-4.1-0aivanov@mysql.com2005-09-061-0/+0
|\ \ \ | |/ / | | | | | | into mysql.com:/home/alexi/dev/mysql-5.0-0
| * | config:tomas@poseidon.ndb.mysql.com2005-08-251-0/+1
| | | | | | | | | | | | changed tomas default checkout
| * | jonas - jonas@eel.(none)2005-08-191-0/+1
| | | | | | | | | | | | Fix checkout properties
* | | config:tomas@poseidon.ndb.mysql.com2005-08-251-0/+1
| | | | | | | | | | | | updated tomas default checkout
* | | jonas:jonas@eel.(none)2005-08-191-0/+1
| | | | | | | | | | | | fix bk checkout properties
* | | Merge mysql.com:/space/my/mysql-4.1-buildlenz@mysql.com2005-07-061-1/+1
|\ \ \ | |/ / | | | | | | into mysql.com:/space/my/mysql-5.0-build
| * | Merge mysql.com:/space/my/mysql-4.0-buildlenz@mysql.com2005-07-051-1/+1
| |\ \ | | |/ | | | | | | into mysql.com:/space/my/mysql-4.1-build
| | * - disabled openlogging to satisfy BK when using a commercial license keylenz@mysql.com2005-07-051-1/+1
| | |
| | * Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.0mronstrom@mysql.com2005-06-061-0/+1
| | |\ | | | | | | | | | | | | into mysql.com:/Users/mikron/bug10901
| | | * Bug #10901mronstrom@mysql.com2005-06-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Analyze table corrupts the state on data_file_length, records, index_file_length... by writing the shared state when there is an updated internal state due to inserts or deletes Fixed by synching the shared state with the internal state before writing it to disk Added test cases of 2 error cases and a normal case in new analyze test case
| | * | sql_repl.cc:ndbdev@dl145b.mysql.com2005-06-031-0/+1
| | |/ | | | | | | | | | Bug #11064 some read error not detected in replication on 64-bit platform
| | * Merge bk-internal:/home/bk/mysql-4.0mwagner@ultrafly.mysql.com2005-05-071-0/+1
| | |\ | | | | | | | | | | | | into ultrafly.mysql.com:/Users/mwagner/work/bk/mysql-4.0
| | | * Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.0svoj@mysql.com2005-05-071-0/+1
| | | |\ | | | | | | | | | | | | | | | into mysql.com:/home/svoj/devel/mysql/7709-mysql-4.0
| | | | * BUG#7709 fix - Boolean fulltext query against unsupported engines does notsvoj@mysql.com2005-05-071-0/+1
| | | | | | | | | | | | | | | | | | | | fail.
| | * | | errmsg.txt:mwagner@ultrafly.mysql.com2005-05-071-0/+1
| | |/ / | | | | | | | | | | | | Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
* | | | mergendbdev@dl145b.mysql.com2005-06-141-0/+1
|\ \ \ \ | |/ / /
| * | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1tulin@dl145c.mysql.com2005-06-131-0/+1
| |\ \ \ | | | | | | | | | | | | | | | into dl145c.mysql.com:/home/ndbdev/tomas/mysql-4.1
| | * | | logging_ok:tulin@dl145c.mysql.com2005-06-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Logging to logging@openlogging.org accepted DbtcMain.cpp, testTimeout.cpp: Bug #11290 TransactionInactiveTimeout = 0 does not result in infinite timeout
| * | | | ctype_utf8.test, ctype_utf8.result:igor@igor-inspiron.creware.com2005-06-131-0/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a test case for bug #11167. sql_select.cc: Fixed bug #11167. In 4.1 char/varchar fields are limited by 255 characters in length that make them longer than 255 bytes in size for such character sets as UTF8. The functions store_record_in_cache and read_cached_records did not take into account this Moreover the code did not take into account that the size of the varchar fields in 5.0 can be up to 65535 bytes
* | | | Adding auxiliary scripts that allow to display messages in result files from ↵obarnir@mysql.com2005-06-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | within test files - show_msg.inc - displays a message followed by a line of '-' at the length of the messgae - show_msg80.inc - displays a message followed by a line of '-' with a fixed length of 80
* | | | Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0igor@rurik.mysql.com2005-06-071-0/+1
|\ \ \ \ | |/ / / | | | | | | | | into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
| * | | Accepted openloggingelliot@mysql.com2005-06-071-0/+1
| | | |
* | | | Merge monster.:D:/Work/mysql-4.1 into monster.:D:/Work/mysql5.0reggie@monster.2005-06-021-0/+1
|\ \ \ \ | |/ / /
| * | | fixed compile problem by replacing W_OK with F_OKreggie@monster.2005-06-021-0/+1
| | | |
* | | | item_func.h:igor@igor-inspiron.creware.com2005-06-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed bug #9939: a wrong conversion of arguments for functions COALESCE and IFNULL. The str_op virtual method was added into Item_func_numhybrid. item_func.cc: Fixed bug #9939: a wrong conversion of arguments for functions COALESCE and IFNULL. The str_op virtual method was added into Item_func_numhybrid. item_cmpfunc.h, item_cmpfunc.cc: Fixed bug #9939: a wrong conversion of arguments for functions COALESCE and IFNULL. Item_func_coalesce and Item_func_ifnull now inherit from a modified Item_func_numhybrid. case.test, case.result: Added test cases for bug #9939.
* | | | changes to fix joins not working (bug #10848). New tests, as well as ↵patg@radha.local2005-05-251-0/+1
| | | | | | | | | | | | | | | | table->status being set in index_read_idx
* | | | Merge bk-internal.mysql.com:/data0/bk/mysql-4.1gbichot@bk-internal.mysql.com2005-05-242-0/+14
|\ \ \ \ | |/ / / | | | | | | | | into bk-internal.mysql.com:/data0/bk/mysql-5.0
| * | | marking the file gone again to hopefully get the tree on its feetgbichot@bk-internal.mysql.com2005-05-232-0/+2
| | | |
* | | | Resolve merge from 4.1jimw@mysql.com2005-05-181-0/+1
|\ \ \ \ | |/ / /
| * | | ndberror.c:tulin@dl145c.mysql.com2005-05-181-0/+1
| | | | | | | | | | | | | | | | updated error message for ndb
| * | | relaxed DBUG_ASSERT in Item_int_with_ref::new_item() to "any constant" ↵bell@book.sanja.is.com.ua2005-05-161-0/+1
| | | | | | | | | | | | | | | | (BUG#10020)
| * | | Fix for bug #10493 (SJIS fields are not correctly saved)holyfoot@hf-ibm.(none)2005-05-101-0/+1
| | | |
* | | | new build scripts for SAP teamschwenke@lmy003.wdf.sap.corp2005-05-181-0/+2
| | | |
* | | | mergedserg@serg.mylan2005-05-142-0/+15
|\ \ \ \
| * \ \ \ Mergekonstantin@mysql.com2005-05-132-0/+2
| |\ \ \ \
| | * | | | Add myself to the list of users who don't automatically check outkonstantin@mysql.com2005-05-131-0/+1
| |/ / / / | | | | | | | | | | | | | | | all version controlled files (should speed up bk citool)
| * | | | Mergemskold@mysql.com2005-05-081-0/+1
| |\ \ \ \ | | |/ / /
| | * | | errmsg.txt:mwagner@ultrafly.mysql.com2005-05-081-0/+1
| | | | | | | | | | | | | | | | | | | | Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
| | * | | Mergejimw@mysql.com2005-05-071-0/+1
| | |\ \ \ | | | |/ /
| | | * | [backport of 4.1, because 4.0 autobuild now hits the same problem;gbichot@production.mysql.com2005-05-071-0/+1
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | when merging just use "ul"] In configure.in, don't remove $AVAILABLE_LANGUAGES_ERRORS_RULES at end because config.status may later need this file (if it does not find it it won't incorporate dependencies of errmsg.sys in sql/share/Makefile). In sql/share/Makefile.am using "all:" leads to double-"all:" in Makefile.
| * | | Corrections to test "sp", stored procedure "fib" (see entry 9937 in the bug DB).joerg@trift-lap.fambruehe2005-05-071-0/+1
| | | |
| * | | Merge ltantony.mysql.com:/usr/home/antony/work2/p2-bug6616-4.1antony@ltantony.mysql.com2005-05-071-0/+1
| |\ \ \ | | |/ / | | | | | | | | into ltantony.mysql.com:/usr/home/antony/work2/p2-bug6616-5.0
| | * | Merge ltantony.mysql.com:/usr/home/antony/work2/p2-bug6616antony@ltantony.mysql.com2005-05-061-0/+1
| | |\ \ | | | |/ | | | | | | | | into ltantony.mysql.com:/usr/home/antony/work2/p2-bug6616-4.1
| | | * Bug#6616antony@ltantony.mysql.com2005-05-061-0/+1
| | | | | | | | | | | | | | | | | | | | MySQL server 100% CPU if FLUSH TABLES WITH READ LOCK + INSERT Infinite loop caused by missing update to thd version.
| * | | Merge bk-internal.mysql.com:/users/rburnett/bug9721rburnett@bk-internal.mysql.com2005-05-061-0/+1
| |\ \ \ | | |/ / | | | | | | | | into bk-internal.mysql.com:/users/rburnett/mysql-5.0
View Lorry Controller Status