summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-03-1610-32/+69
|\ | | | | | | | | | | | | into mashka.mysql.fi:/home/my/mysql-4.0
| * Write binlog before commit when doing INSERT ... SELECTunknown2003-03-163-7/+27
| | | | | | | | | | | | | | | | | | mysql-test/r/create.result: After merge fix sql/sql_insert.cc: Write binlog before commit sql/sql_update.cc: Added comment
| * merge with 3.23 to get:unknown2003-03-157-20/+42
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix for empty table/column names mysql-test/t/create.test: Auto merged sql/sql_parse.cc: Auto merged sql/ha_innodb.cc: Auto merged sql/table.cc: Auto merged tests/grant.pl: Auto merged sql/filesort.cc: merge with 3.23 sql/sql_table.cc: merge with 3.23 tests/grant.res: merge with 3.23
| | * Code cleanupunknown2003-03-141-10/+6
| | |
| | * Merge bk-internal.mysql.com:/home/bk/mysql-3.23unknown2003-03-146-10/+35
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | into mashka.mysql.fi:/home/my/mysql-3.23
| | | * Check for empty table/column namesunknown2003-03-146-10/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/t/create.test: Test for empty table/column name tests/grant.pl: More tests tests/grant.res: More tests
| | * | ha_innobase.cc:unknown2003-03-131-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug: MySQL could erroneously return Empty set if InnoDB estimated index range size to 0 records though the range was not empty; MySQL also failed to do the next-key locking in the case of an empty index range sql/ha_innobase.cc: Fix bug: MySQL could erroneously return Empty set if InnoDB estimated index range size to 0 records though the range was not empty; MySQL also failed to do the next-key locking in the case of an empty index range
| * | | Code cleanupunknown2003-03-151-5/+0
| | | | | | | | | | | | | | | | | | | | sql/sql_parse.cc: Removed not needed test
* | | | trx0roll.c:unknown2003-03-161-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix compiler warning in Windows about ib_longlong to ulint conversion innobase/trx/trx0roll.c: Fix compiler warning in Windows about ib_longlong to ulint conversion
* | | | row0sel.c:unknown2003-03-151-13/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug number 154: GROUP BY and DISTINCT could treat NULL values inequal innobase/row/row0sel.c: Fix bug number 154: GROUP BY and DISTINCT could treat NULL values inequal
* | | | - fixed C++-style comments to make IBM C compiler happyunknown2003-03-152-5/+5
| | | | | | | | | | | | | | | | | | | | client/mysqlshow.c: - fixed C++-style comment to make IBM C compiler happy
* | | | Merge build:/home/bk/mysql-4.0unknown2003-03-141-58/+56
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/Users/mysqldev/my/mysql-4.0
| * | | | Small fixes in mysql_tableinfo. It's only code tiny changes, does not modifyunknown2003-03-141-58/+56
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the output of the script. scripts/mysql_tableinfo.sh: Small fixes in this program which I contributed some time ago. These fixes are waiting in Monty's mailbox since August, and there are tiny : * use array{'x'} instead of array{x} * use fetchrow_arrayref instead of fetchrow_array * try to hide the command-line options from 'ps' like mysqlhotcopy does * use 'map' instead of homegrown function * use $_ instead of $i when possible
* | | | - we need to require an installation on the root volume (/usr/local/mysql)unknown2003-03-141-1/+1
|/ / /
* | | ha_innodb.cc:unknown2003-03-131-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | Fix bug: MySQL could erroneously return Empty set if InnoDB estimated index range size to 0 records though the range was not empty; MySQL also failed to do the next-key locking in the case of an empty index range sql/ha_innodb.cc: Fix bug: MySQL could erroneously return Empty set if InnoDB estimated index range size to 0 records though the range was not empty; MySQL also failed to do the next-key locking in the case of an empty index range
* | | Merge bk-internal:/home/bk/mysql-4.0/unknown2003-03-131-0/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
| * \ \ Mergeunknown2003-03-131-0/+5
| |\ \ \ | | |/ / | | | | | | | | | | | | sql/filesort.cc: SCCS merged
| | * | fix for crash with small sort_bufferunknown2003-03-131-0/+5
| | |/
* | | Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-03-131-7/+9
|\ \ \ | |/ / |/| | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.0
| * | - added option "--skip-disk-image" and short form "-s" in addition to theunknown2003-03-131-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | already existing "--skip-dmg" (per Monty request) - Fixed handling of license files
* | | mergedunknown2003-03-133-27/+40
|\ \ \ | | |/ | |/| | | | | | | | | | | | | sql/sql_base.cc: Auto merged tests/grant.res: Auto merged
| * | Better fix for GRANT bugunknown2003-03-133-31/+45
| | | | | | | | | | | | | | | | | | | | | tests/grant.pl: More options for test tests/grant.res: new test results
* | | Merge bk-internal:/home/bk/mysql-4.0/unknown2003-03-131-1/+1
|\ \ \ | | |/ | |/| | | | | | | | | | | | | into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
| * | - fixed newly added DBUG_RETURN to DBUG_VOID_RETURN (compile failed withunknown2003-03-131-1/+1
| | | | | | | | | | | | | | | | | | | | | "DBUG_RETURN undeclared" on Mac OS X)
* | | make test result more obviousunknown2003-03-132-2/+3
| | |
* | | test result updated after mergeunknown2003-03-133-4/+31
| | |
* | | mergedunknown2003-03-1311-53/+106
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | man/perror.1: Auto merged scripts/mysqld_safe.sh: Auto merged sql/gen_lex_hash.cc: Auto merged sql/ha_myisam.cc: Auto merged sql/item.cc: Auto merged sql/sql_select.cc: Auto merged strings/ctype-tis620.c: Auto merged mysql-test/r/analyse.result: ul mysql-test/r/group_by.result: ul mysql-test/r/select.result: ul
| * Merge bk-internal:/home/bk/mysql-3.23/unknown2003-03-131-0/+4
| |\ | | | | | | | | | | | | | | | | | | into serg.mysql.com:/usr/home/serg/Abk/mysql
| | * added commentunknown2003-03-121-0/+4
| | |
| * | ha_myisam.cc:unknown2003-03-121-1/+1
| |/ | | | | | | | | | | | | | | typo fixed sql/ha_myisam.cc: typo fixed
| * Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-3.23unknown2003-03-122-4/+5
| |\ | | | | | | | | | | | | | | | | | | into sinisa.nasamreza.org:/mnt/work/mysql
| | * Fix for a bug with column privileges ...unknown2003-03-121-3/+4
| | |
| | * Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-3.23unknown2003-03-113-18/+18
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | into sinisa.nasamreza.org:/mnt/work/mysql
| | * \ Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-3.23unknown2003-03-111-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sinisa.nasamreza.org:/mnt/work/mysql
| | | * | A fix for an obvious bug in hash generating proram.unknown2003-03-101-1/+1
| | | | |
| * | | | Merge bk-internal.mysql.com:/home/bk/mysql-3.23unknown2003-03-1211-33/+69
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mashka.mysql.fi:/home/my/mysql-3.23
| | * | | | - Fixed man page for apropos/whatis (thanks to Christian Hammers from Debianunknown2003-03-111-10/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for the patch) (bug #135)
| | * | | | Merge sanja.is.com.ua:/home/bell/mysql/mysql-3.23unknown2003-03-113-1/+19
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/work-rand-3.23
| | | * | | | fixed bug of unchecked random part of WHERE clause (bug #142)unknown2003-03-113-1/+19
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/select.result: test of random WHERE clause mysql-test/t/select.test: test of random WHERE clause sql/sql_select.cc: fixed bug of unchecked random part of WHERE clause
| | * | | | Merge bk-internal:/home/bk/mysql-3.23/unknown2003-03-114-4/+27
| | |\ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mysql.com:/usr/home/serg/Abk/mysql
| | | * | | fixed an obscure bug in group by + having + Item_ref::get_dateunknown2003-03-114-4/+27
| | | |/ /
| | * | | - made test for multiple --user options more sh-compatibleunknown2003-03-111-2/+2
| | | | |
| | * | | - fixed C++-style comments in .c files to make IBM compiler happyunknown2003-03-112-16/+16
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (it barfs on these with a syntax error) sql/net_serv.cc: - fixed C++-style comment (this file is copied as libmysql_r/net.c) strings/ctype-tis620.c: - fixed many C++-style comments
| * | | NEWDATE -> DATE in anylyse() outputunknown2003-03-123-34/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed that analyse(#) also affects strings mysql-test/r/analyse.result: Better analyse test mysql-test/t/analyse.test: Better analyse test sql/sql_analyse.cc: NEWDATE -> DATE in anylyse() output Changed that analyse(#) also affects strings Fixed that number of elements in ENUM is limited by # not by #+1
* | | | texinfo syntax cleanup. 4.1 protocol sections are still too broken for this ↵unknown2003-03-131-22/+87
| | | | | | | | | | | | | | | | file to be compiled :(
* | | | Merge bk-internal:/home/bk/mysql-4.0/unknown2003-03-131-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0 sql/mysqld.cc: Auto merged
| * | | | better help messageunknown2003-03-131-1/+1
| | | | |
* | | | | Added PeterG's new internals documenation.unknown2003-03-122-0/+3783
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs/internals.texi: Added PeterG's new internals documentation. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | | | VC++ InstallShield Setup Programs for 4.0.XX treeunknown2003-03-1266-0/+5732
| | | | |
* | | | | making sure that test works.unknown2003-03-122-2/+2
| | | | |