summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* union.result:Sinisa@sinisa.nasamreza.org2005-04-263-1/+31
| | | | | | | | Results for the above test case union.test: A test case for bug #10032 involving UNION's and ORDER BY clause sql_yacc.yy: Fix for a bug #10032 involving a parser bug with UNION's and ORDER BY
* Merge bk-internal.mysql.com:/home/bk/mysql-4.1dlenev@mysql.com2005-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 dlenev@brandersnatch.localdomain2005-04-251-2/+2
| | | | | | | | "'func_sapdb' fails on 64bit build hosts")
* | ndb - bug#10029 fixpekka@mysql.com2005-04-237-90/+205
| |
* | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1mskold@mysql.com2005-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 tablesmskold@mysql.com2005-04-224-52/+154
| | |
* | | Bug#7806 - insert on duplicate key and auto-update of timestampingo@mysql.com2005-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.1msvensson@neptunus.(none)2005-04-211-3/+3
|\ \ | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-4.1
| * | C99 Portability fixmsvensson@neptunus.(none)2005-04-211-3/+3
| |/
* | - added missing file config_readline.h to the source distributionlenz@mysql.com2005-04-211-1/+1
|/
* Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1mskold@mysql.com2005-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 ↵mskold@mysql.com2005-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.1lenz@mysql.com2005-04-214-11/+60
|\ \ | |/ |/| | | into mysql.com:/space/my/mysql-4.1
| * Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1lenz@mysql.com2005-04-214-1/+40
| |\ | | | | | | | | | into mysql.com:/space/my/mysql-4.1
| * \ Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1lenz@mysql.com2005-04-204-11/+60
| |\ \ | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.1
| | * | - Enabled the "blackhole" storage engine for the Max RPM subpackagelenz@mysql.com2005-04-201-0/+5
| | | |
| | * | - manual mergelenz@mysql.com2005-04-193-11/+55
| | |\ \
| | | * | - added missing copyright headers to several Makefile.am's (noticedlenz@mysql.com2005-04-193-0/+48
| | | | | | | | | | | | | | | | | | | | while testing changes to the mysql-copyright scripts
| | | * | Updated Docs/Makefile.am:lenz@mysql.com2005-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.
| | | * | - removed COPYING from txt_files of Docs/Makefile.amlenz@mysql.com2005-04-191-1/+1
| | | | | | | | | | | | | | | | | | | | (it's already in EXTRA_DIST of the toplevel Makefile.am)
* | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1mskold@mysql.com2005-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.1hf@deer.(none)2005-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)hf@deer.(none)2005-04-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | One more free_charset call added
| * | | | | Merge rurik.mysql.com:/home/igor/mysql-4.1igor@rurik.mysql.com2005-04-203-1/+39
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
| | * | | | sql_select.cc:igor@rurik.mysql.com2005-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.
| * | | | ndb - dbug aid for api signal logpekka@mysql.com2005-04-201-0/+4
| | | | |
| * | | | Merge mysql.com:/home/mydev/mysql-4.1ingo@mysql.com2005-04-205-14/+154
| |\ \ \ \ | | | | | | | | | | | | | | | | | | into mysql.com:/home/mydev/mysql-4.1-bug7806
| | * \ \ \ Merge mysql.com:/home/mydev/mysql-4.1ingo@mysql.com2005-04-205-14/+154
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mydev/mysql-4.1-bug7806
| | | * | | | Bug#7806 - insert on duplicate key and auto-update of timestampingo@mysql.com2005-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.
| * | | | | | After review fixmsvensson@neptunus.(none)2005-04-201-4/+8
| | | | | | |
| * | | | | | Mergemsvensson@neptunus.(none)2005-04-2031-90/+56
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | BUG#9568 mysql segfaults from CTRL-R msvensson@neptunus.(none)2005-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.
* | | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1mskold@mysql.com2005-04-2025-23/+84
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
| * | | | | | Removed forgotten abort() call, bug#10001mskold@mysql.com2005-04-201-1/+0
| | | | | | |
| * | | | | | Disabled ndb tests for embeddedmskold@mysql.com2005-04-1922-0/+22
| | | | | | |
| * | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1mskold@mysql.com2005-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 keymskold@mysql.com2005-04-193-22/+62
| | | | | | |
* | | | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1sergefp@mysql.com2005-04-206-95/+150
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | into mysql.com:/home/psergey/mysql-4.1-bug9103
| * | | | | | Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1jan@hundin.mysql.fi2005-04-191-4/+4
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | into hundin.mysql.fi:/home/jan/mysql-4.1
| | * | | | | Style change. Use 1 and 0 instead of true and false.jan@hundin.mysql.fi2005-04-191-4/+4
| | |/ / / /
| * | | | | CSC5149 - ndb test programsjoreland@mysql.com2005-04-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Fix src distributions for benchmark prg
| * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1dlenev@mysql.com2005-04-183-69/+108
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | into mysql.com:/home/dlenev/src/mysql-4.1-bg8086
| | * | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1dlenev@brandersnatch.localdomain2005-04-183-69/+108
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/dlenev/src/mysql-4.1-bg8086
| | | * | | | Fix for bug #8068 "TIMEDIFF with first negative argument gives wrong dlenev@brandersnatch.localdomain2005-03-283-69/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | result" (and similar bug in ADDTIME/SUBTIME). Both Item_func_add_time/Item_func_timediff::val_str() now use calc_time_diff() function which was backported from 5.0 (and which was was fixed to properly handle microseconds part of its second argument). Also now we correctly set sign of result in case when first argument is negative and second is positive.
| * | | | | | Fixed a bug: deadlock without any locking, simple select and update (Bug #7975).jan@hundin.mysql.fi2005-04-182-22/+38
| |/ / / / / | | | | | | | | | | | | | | | | | | Backported from 5.0.3.
* | | | | | Fix for BUG#9103: sergefp@mysql.com2005-04-185-8/+41
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Don't produce data truncation warnings from within cp_buffer_from_ref(). This function is only used to make index search tuples and data truncation that occurs here has no relation with truncated values being saved into tables.
* | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1sergefp@mysql.com2005-04-173-2/+34
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | into mysql.com:/home/psergey/mysql-4.1-bug9439
| * | | | | Fix for BUG#9439:sergefp@mysql.com2005-04-163-2/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed type of "Sub_part" column in SHOW KEYS from TINYINT to SMALLINT (as MAX_KEY_LENGTH=1024) (this is the final cset with proper tests)
* | | | | | Merge mysql.com:/space/my/mysql-4.0-buildlenz@mysql.com2005-04-171-2/+1
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | into mysql.com:/space/my/mysql-4.1-build
| * | | | | - removed ReadMe.txt from CLEANFILES, as it's cleaned by Docs/Makefile.amlenz@mysql.com2005-04-171-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | already (and that's the Makefile that acutally creates it)