summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* - Fixed a bug in myisam_max_[extra]_sort_file_size, bug ID 339 and 342unknown2003-05-136-21/+63
| | | | | | | | | | | | | | | | | | - Fix for QNX: UNIX sockets available since 6.2.1 include/my_global.h: Fix for QNX: UNIX sockets available since 6.2.1 mysql-test/r/variables.result: Fixed a bug in myisam_max_[extra]_sort_file_size, bug ID 339 mysql-test/t/variables.test: Fixed a bug in myisam_max_[extra]_sort_file_size, bug ID 339 sql/mysqld.cc: Fixed a bug in myisam_max_[extra]_sort_file_size, bug ID 339 sql/set_var.cc: Fixed a bug in myisam_max_[extra]_sort_file_size, bug ID 339 sql/set_var.h: Fixed a bug in myisam_max_[extra]_sort_file_size, bug ID 339
* Merge bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-05-131-23/+5
|\ | | | | | | | | | | | | into mashka.mysql.fi:/home/my/mysql-4.0
| * Removed timing of tests from mysql-test-run.unknown2003-05-131-23/+5
| | | | | | | | | | | | | | Needed by QNX, and there was no real use for timing.
* | Merge bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-05-1320-83/+184
|\ \ | |/ |/| | | | | | | | | into mashka.mysql.fi:/home/my/mysql-4.0
| * Safety fix to enable RAID in max binariesunknown2003-05-1314-66/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Better fix for format('nan') Fix for HAVING COUNT(DISTINCT...) myisam/mi_check.c: Better error message myisam/mi_dynrec.c: Simple code cleanup myisam/myisamchk.c: Better error messages mysql-test/r/func_misc.result: Added back test for format('nan') mysql-test/r/having.result: New test mysql-test/t/func_misc.test: Added back test for format('nan') mysql-test/t/having.test: Added test for count(distinct) in having mysys/raid.cc: Safety fix to enable RAID in max binaries scripts/mysql_install_db.sh: Create data directories even if --in-rpm is used (for MaxOSX) sql/item_strfunc.cc: Better fix for format('nan') sql/mysqld.cc: Give stacktrace on assert() sql/sql_yacc.yy: Fix for HAVING COUNT(DISTINCT...) tests/big_record.pl: Extend test to abuse packed MyISAM tables tests/table_types.pl: Fixed wrong merge
| * More testsunknown2003-05-082-6/+22
| |
| * merge with 3.23unknown2003-05-081-2/+2
| |\ | | | | | | | | | | | | sql/sql_base.cc: merge
| | * Better grant test for SELECT *unknown2003-05-081-4/+4
| | |
| * | Merge to get security patchunknown2003-05-086-10/+50
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union sql/sql_acl.cc: Auto merged tests/grant.pl: Auto merged tests/grant.res: Auto merged BitKeeper/triggers/post-commit: use local file client/mysqldump.c: Merge to get crash fix
| | * Security patch to remove wrong error when one had a global update/delete ↵unknown2003-05-075-9/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | privilige and a database specific SELECT privilege. sql/sql_acl.cc: Security patch sql/sql_base.cc: Security patch sql/sql_parse.cc: Security patch tests/grant.pl: Test of security patch tests/grant.res: Test of security patch
| | * Merge bk-internal.mysql.com:/home/bk/mysql-3.23unknown2003-04-291-3/+5
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | into narttu.mysql.fi:/my/mysql-3.23
| | | * Put changeset number in emailsunknown2003-04-241-3/+5
| | | |
| | * | Porting back security fix from 4.0.unknown2003-04-291-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | All tests plus grant.pl test passed.
| | * | Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-3.23unknown2003-04-291-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sinisa.nasamreza.org:/mnt/work/mysql
| | | * | Back porting a fix from 4.0 at customer's requestunknown2003-04-141-1/+1
| | | | |
| | * | | Merge bk-internal:/home/bk/mysql-3.23/unknown2003-04-2824-54/+128
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql client/mysqldump.c: Auto merged BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| | * \ \ \ Merge bk-internal:/home/bk/mysql-3.23/unknown2003-03-171-1/+1
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mysql.com:/usr/home/serg/Abk/mysql
| | | * | | | crash fixunknown2003-03-171-1/+1
| | | | | | |
| * | | | | | Updated commentunknown2003-05-071-1/+2
| | | | | | |
* | | | | | | - On Mac OS X, better call mysql_install_db with "-IN-RPM" during unknown2003-05-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the installation to make sure the privilege tables are being installed even if the DNS configuration is broken, which seems to be quite common (reverse lookups to "hostname" fail). This should resolve the problem many Mac OS users experience ("Fatal error: Can't open privilege tables: Table 'mysql.host' doesn't exist") when they try to start MySQL after installing the PKG.
* | | | | | | srv0start.c, trx0sys.c:unknown2003-05-122-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let InnoDB to skip writing of pages from the doublewrite buffer if innodb_force_recovery=6; normally, if the page is corrupt AND the corresponding page in the doublewrite buffer is also corrupt, InnoDB calls exit(1) innobase/trx/trx0sys.c: Let InnoDB to skip writing of pages from the doublewrite buffer if innodb_force_recovery=6; normally, if the page is corrupt AND the corresponding page in the doublewrite buffer is also corrupt, InnoDB calls exit(1) innobase/srv/srv0start.c: Let InnoDB to skip writing of pages from the doublewrite buffer if innodb_force_recovery=6; normally, if the page is corrupt AND the corresponding page in the doublewrite buffer is also corrupt, InnoDB calls exit(1)
* | | | | | | MySQL-classic did not pass the test suite rpl_rotate_logs.test anymore ↵unknown2003-05-101-15/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | because a recent 1.1424.2.17 cset introduced an opt_using_transactions which prevented binlogs to be rotated if transactions were not enabled. Fix for this. This bug did not affect releases. sql/log.cc: MySQL-classic did not pass the test suite rpl_rotate_logs.test anymore because a recent 1.1424.2.17 cset introduced an opt_using_transactions which prevented binlogs to be rotated if transactions were not enabled. Fix for this. This bug did not affect releases.
* | | | | | | my_base.h:unknown2003-05-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug: if MIN() or MAX() resulted in a deadlock or a lock wait timeout, MySQL did not return an error, but NULL as the function value include/my_base.h: Fix bug: if MIN() or MAX() resulted in a deadlock or a lock wait timeout, MySQL did not return an error, but NULL as the function value
* | | | | | | sql_select.cc, opt_sum.cc:unknown2003-05-072-13/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug: if MIN() or MAX() resulted in a deadlock or a lock wait timeout, MySQL did not return an error, but NULL as the function value sql/opt_sum.cc: Fix bug: if MIN() or MAX() resulted in a deadlock or a lock wait timeout, MySQL did not return an error, but NULL as the function value sql/sql_select.cc: Fix bug: if MIN() or MAX() resulted in a deadlock or a lock wait timeout, MySQL did not return an error, but NULL as the function value
* | | | | | | - added MySQL-shared-compat.spec(.sh) to the distribution. This spec fileunknown2003-05-062-3/+78
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | can be used to build a compatibility package that includes the shared libraries of MySQL 3.23.xx and MySQL 4.0.xx for backwards compatibility with dynamically linked applications. It simply repackages the two MySQL-shared RPMs, so these need to be created or downloaded separately. support-files/Makefile.am: - added MySQL-shared-compat.spec(.sh) to the distribution
* | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-05-054-140/+27
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into narttu.mysql.fi:/my/mysql-4.0
| * | | | | | Fixed that reading a DATE string of 000000 is interpreted as 0000-00-00 ↵unknown2003-05-054-140/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of 2000-00-00 sql/time.cc: Removed not used code Fixed that reading a DATE string of 000000 is interpreted as 0000-00-00 instead of 2000-00-00
* | | | | | | buf0lru.c, buf0flu.c:unknown2003-05-052-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Better warning message if more than 4 / 5 of the buffer pool is consumed by locks of adaptive hash index innobase/buf/buf0flu.c: Better warning message if more than 4 / 5 of the buffer pool is consumed by locks of adaptive hash index innobase/buf/buf0lru.c: Better warning message if more than 4 / 5 of the buffer pool is consumed by locks of adaptive hash index
* | | | | | | Merge bk-internal:/home/bk/mysql-4.0/unknown2003-05-058-52/+87
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.0 sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged
| * | | | | | | parallel-repair available in mysqldunknown2003-05-045-9/+42
| | | | | | | |
| * | | | | | | count_bits() moved to mysys/unknown2003-05-043-43/+45
| | | | | | | |
* | | | | | | | Merge heikki@build.mysql.com:/home/bk/mysql-4.0unknown2003-05-044-12/+73
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into hundin.mysql.fi:/home/heikki/mysql-4.0
| * | | | | | | | row0ins.c, dict0dict.c, dict0dict.h, srv0srv.c:unknown2003-05-044-12/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let SHOW INNODB STATUS print detailed info of the latest unique key violation, note that REPLACE and INSERT IGNORE mask the error from the user innobase/srv/srv0srv.c: Let SHOW INNODB STATUS print detailed info of the latest unique key violation, note that REPLACE and INSERT IGNORE mask the error from the user innobase/include/dict0dict.h: Let SHOW INNODB STATUS print detailed info of the latest unique key violation, note that REPLACE and INSERT IGNORE mask the error from the user innobase/dict/dict0dict.c: Let SHOW INNODB STATUS print detailed info of the latest unique key violation, note that REPLACE and INSERT IGNORE mask the error from the user innobase/row/row0ins.c: Let SHOW INNODB STATUS print detailed info of the latest unique key violation, note that REPLACE and INSERT IGNORE mask the error from the user
* | | | | | | | | Merge pzaitsev@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-05-041-0/+20
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/pz/mysql/mysql-4.0-root
| * | | | | | | | os0file.c:unknown2003-05-041-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Print progress information if at startup InnoDB creates and writes bigger than 100 MB data file or log file innobase/os/os0file.c: Print progress information if at startup InnoDB creates and writes bigger than 100 MB data file or log file
* | | | | | | | | Minor fix to previous codeunknown2003-05-041-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/mysql_priv.h: Add ifdef to allow compilation without Innodb
* | | | | | | | | Merge mysql.com:/home/pz/mysql/mysql-4.0-rootunknown2003-05-043-0/+15
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/pz/mysql/mysql-4.0
| * | | | | | | | Added innodb_max_dirty_pages_pct parameter to limit amount unknown2003-05-043-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of dirty pages in the buffer pool (can be changed online) sql/mysql_priv.h: Added innodb_max_dirty_pages_pct parameter to limit amount of dirty pages in the buffer pool (can be changed online) sql/mysqld.cc: Added new option sql/set_var.cc: Added new variable handling
* | | | | | | | | srv0srv.c:unknown2003-05-041-1/+17
| |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not let the main thread sleep the 1 second if we had to do a bug pool flush batch trying to establish srv_max_buf_pool_modified_pct innobase/srv/srv0srv.c: Do not let the main thread sleep the 1 second if we had to do a bug pool flush batch trying to establish srv_max_buf_pool_modified_pct
* | | | | | | | Merge bk-internal:/home/bk/mysql-4.0/unknown2003-05-041-0/+11
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.0
| * | | | | | | result updatedunknown2003-05-041-0/+11
| | | | | | | |
* | | | | | | | srv0srv.c:unknown2003-05-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up the working of the main thread; add a tunable parameter srv_max_buf_pool_modified_pct which can be used to make the flush phase in shutdown quicker innobase/srv/srv0srv.c: Clean up the working of the main thread; add a tunable parameter srv_max_buf_pool_modified_pct which can be used to make the flush phase in shutdown quicker
* | | | | | | | buf0buf.c, srv0srv.h, buf0buf.h, srv0srv.c:unknown2003-05-034-28/+118
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up the working of the main thread; add a tunable parameter srv_max_buf_pool_modified_pct which can be used to make the flush phase in shutdown quicker innobase/srv/srv0srv.c: Clean up the working of the main thread; add a tunable parameter srv_max_buf_pool_modified_pct which can be used to make the flush phase in shutdown quicker innobase/include/buf0buf.h: Clean up the working of the main thread; add a tunable parameter srv_max_buf_pool_modified_pct which can be used to make the flush phase in shutdown quicker innobase/include/srv0srv.h: Clean up the working of the main thread; add a tunable parameter srv_max_buf_pool_modified_pct which can be used to make the flush phase in shutdown quicker innobase/buf/buf0buf.c: Clean up the working of the main thread; add a tunable parameter srv_max_buf_pool_modified_pct which can be used to make the flush phase in shutdown quicker
* | | | | | | Merge bk-internal:/home/bk/mysql-4.0/unknown2003-05-032-1/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.0
| * | | | | | | "delete from table where const" bug fixedunknown2003-05-032-1/+7
| | | | | | | |
* | | | | | | | - applied patch from Tim Bunce (new --addtodest option that adds copiedunknown2003-05-031-9/+27
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | files into an already existing directory)
* | | | | | | Merge bk-internal:/home/bk/mysql-4.0/unknown2003-05-035-30/+52
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.0
| * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-05-035-30/+52
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into narttu.mysql.fi:/my/mysql-4.0 mysql-test/r/innodb.result: Auto merged mysql-test/t/innodb.test: Auto merged sql/sql_base.cc: Auto merged sql/sql_update.cc: Auto merged
| | * | | | | | Fix problem where key_read was not cleaned up properly, which caused assert ↵unknown2003-05-035-30/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in innodb test. mysql-test/r/innodb.result: Changed tests to make them repeatable. mysql-test/t/innodb.test: Changed tests to make them repeatable. sql/opt_sum.cc: Safety fix sql/sql_base.cc: Safety assert
* | | | | | | | test case addedunknown2003-05-032-0/+8
|/ / / / / / /
View Lorry Controller Status