summaryrefslogtreecommitdiff
path: root/innobase
Commit message (Collapse)AuthorAgeFilesLines
* Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-11-301-14/+15
|\ | | | | | | | | | | | | | | into hundin.mysql.fi:/home/marko/k/mysql-4.1 innobase/lock/lock0lock.c: Auto merged
| * lock0lock.c:unknown2004-11-301-14/+15
| | | | | | | | | | | | | | | | If UNIV_DEBUG is defined, lock_get_type() was called before function definition: fix this innobase/lock/lock0lock.c: If UNIV_DEBUG is defined, lock_get_type() was called before function definition: fix this
* | Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-11-304-21/+152
|\ \ | |/ |/| | | | | | | | | into hundin.mysql.fi:/home/marko/k/mysql-4.1
| * Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-11-304-21/+152
| |\ | | | | | | | | | | | | | | | | | | into hundin.mysql.fi:/home/marko/k/mysql-4.1
| | * InnoDB: Allow ALTER TABLE to do intermediate COMMIT also when the tableunknown2004-11-302-37/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | contains auto_increment columns. (Bug #6633) innobase/include/lock0lock.h: Replaced lock_get_table() with lock_get_src_table() and lock_is_table_exclusive() innobase/lock/lock0lock.c: Replaced lock_get_table() with lock_get_src_table() and lock_is_table_exclusive() sql/ha_innodb.cc: ha_innobase::write_row(): Improve the ALTER TABLE optimization (do intermediate COMMIT also if table contains auto_increment columns)
| | * InnoDB: Make intermediate COMMITs in ALTER TABLE more robust (Bug #6633)unknown2004-11-274-21/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | innobase/include/lock0lock.h: Replaced lock_get_ix_table() with lock_get_table(). innobase/lock/lock0lock.c: Replaced lock_get_ix_table() with lock_get_table(). innobase/include/row0mysql.h: row_lock_table_for_mysql(): Added parameter mode. innobase/row/row0mysql.c: row_lock_table_for_mysql(): Added parameter mode. sql/ha_innodb.cc: ha_innobase::write_row(): Make ALTER TABLE commits more robust: account for conversions from non-InnoDB format, do not attempt to commit if there are other than a single IX or IS lock on the source table, and the source table is in InnoDB format. This prohibits intermediate commits for OPTIMIZE TABLE if the table contains an auto_increment field.
* | | row0sel.c:unknown2004-11-301-0/+1
|/ / | | | | | | | | | | | | | | Remove compiler warning as I had forgotten an include file innobase/row/row0sel.c: Remove compiler warning as I had forgotten an include file
* | mergedunknown2004-11-281-5/+7
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union innobase/srv/srv0srv.c: Auto merged mysql-test/t/select.test: Auto merged sql/item_cmpfunc.h: Auto merged sql/slave.cc: Auto merged
| * srv0srv.c:unknown2004-11-261-5/+7
| | | | | | | | | | | | | | | | | | | | srv_lock_timeout_and_monitor_thread(): write to srv_monitor_file only if --innodb_status_file=1 innobase/srv/srv0srv.c: srv_lock_timeout_and_monitor_thread(): write to srv_monitor_file only if --innodb_status_file=1
* | Many files:unknown2004-11-2611-16/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup innobase/buf/buf0buf.c: Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup innobase/buf/buf0lru.c: Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup innobase/include/buf0lru.h: Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup innobase/include/db0err.h: Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup innobase/include/row0sel.h: Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup innobase/include/ut0mem.h: Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup innobase/mem/mem0pool.c: Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup innobase/row/row0mysql.c: Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup innobase/row/row0sel.c: Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup innobase/srv/srv0start.c: Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup innobase/ut/ut0mem.c: Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup
* | configure.in:unknown2004-11-241-0/+3
| | | | | | | | | | | | | | | | Fix linking error in 5.0: the build system for Linux/S390 does not have inlining working in the compiler; remove inlining on that system innobase/configure.in: Fix linking error in 5.0: the build system for Linux/S390 does not have inlining working in the compiler; remove inlining on that system
* | Fixed BUG #6747: innodb_locks_unsafe_for_binlog still uses next-key locking.unknown2004-11-221-62/+72
| | | | | | | | | | | | | | innobase/row/row0sel.c: Fixed bug: innodb_locks_unsafe_for_binlog still uses next-key locking (BUG #6747). We do not take gap type locks when using InnoDB startup option innodb_locks_unsafe_for_binlog. Some code polishing also done.
* | trx0undo.c, trx0purge.c:unknown2004-11-213-2/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Print a warning to the .err log if the InnoDB history list length is > 20 000 even though purge reaches the list head; this is to track corruption reported on the MySQL mailing list Nov 9, 2004 lock0lock.c: Let SHOW INNODB STATUS print the history list length innobase/lock/lock0lock.c: Let SHOW INNODB STATUS print the history list length innobase/trx/trx0purge.c: Print a warning to the .err log if the InnoDB history list length is > 20 000 even though purge reaches the list head; this is to track corruption reported on the MySQL mailing list Nov 9, 2004 innobase/trx/trx0undo.c: Print a warning to the .err log if the InnoDB history list length is > 20 000 even though purge reaches the list head; this is to track corruption reported on the MySQL mailing list Nov 9, 2004
* | fil0fil.h, fil0fil.c:unknown2004-11-182-4/+17
| | | | | | | | | | | | | | | | | | | | Fix bug introduced in 4.1.1: InnoDB no longer respected the data file max size given in :autoextend:max: innobase/fil/fil0fil.c: Fix bug introduced in 4.1.1: InnoDB no longer respected the data file max size given in :autoextend:max: innobase/include/fil0fil.h: Fix bug introduced in 4.1.1: InnoDB no longer respected the data file max size given in :autoextend:max:
* | row0ins.c:unknown2004-11-181-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | row_ins_scan_sec_index_for_duplicate(), row_ins_duplicate_error_in_clust(): remove unused variables "ptr" innobase/row/row0ins.c: row_ins_scan_sec_index_for_duplicate(), row_ins_duplicate_error_in_clust(): remove unused variables "ptr"
* | merge with 4.0unknown2004-11-121-25/+28
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union BitKeeper/deleted/.del-Makefile.am: Delete: Docs/Images/Makefile.am Build-tools/Bootstrap: Auto merged Docs/Makefile.am: Auto merged configure.in: Auto merged include/mysql.h: Auto merged innobase/dict/dict0dict.c: Auto merged libmysql/libmysql.c: Auto merged mysys/default.c: Auto merged scripts/mysqld_safe.sh: Auto merged sql/log.cc: Auto merged mysql-test/t/mix_innodb_myisam_binlog.test: Auto merged sql/mysqld.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_table.cc: Auto merged client/mysqldump.c: merge with 4.0 (This only reorders options) sql/ha_innodb.cc: merge with 4.0 (Keep original code) sql/time.cc: Note that part of this patch is done in my_time.c
| * InnoDB: fix bugs in the FOREIGN KEY parser (Bug #6340)unknown2004-11-031-26/+29
| | | | | | | | | | | | innobase/dict/dict0dict.c: dict_scan_to(): skip quoted strings while scanning for the keyword dict_create_foreign_constraints_low(): allow quote immediately after CONSTRAINT
* | trx0purge.c:unknown2004-11-111-24/+0
| | | | | | | | | | | | | | | | Remove duplicated innodb max purge lag code innobase/trx/trx0purge.c: Remove duplicated innodb max purge lag code
* | dict0dict.ic:unknown2004-11-091-3/+6
| | | | | | | | | | | | | | | | Fix a bug in InnoDB code that fortunately was never used: row id is stored in a record always as a 6-byte unsigned integer, in a 'non-compressed' form innobase/include/dict0dict.ic: Fix a bug in InnoDB code that fortunately was never used: row id is stored in a record always as a 6-byte unsigned integer, in a 'non-compressed' form
* | Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-11-044-4/+37
|\ \ | | | | | | | | | | | | | | | | | | | | | into hundin.mysql.fi:/home/marko/j/mysql-4.1 innobase/row/row0mysql.c: Auto merged
| * | InnoDB: commit after every 10000 rows in ALTER TABLEunknown2004-11-034-4/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | innobase/include/lock0lock.h: Added function lock_get_ix_table() innobase/include/row0mysql.h: Added parameter "table" to row_lock_table_for_mysql() innobase/lock/lock0lock.c: Added function lock_get_ix_table() innobase/row/row0mysql.c: Added parameter "table" to row_lock_table_for_mysql() sql/ha_innodb.cc: write_row(): commit every 10000 rows in ALTER TABLE sql/ha_innodb.h: Added member variable num_write_row
* | | ibuf0ibuf.c:unknown2004-11-041-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | Do not print to .err log about discarding ibuf entries in DISCARD TABLESPACE; removed compiler warning about unused variable innobase/ibuf/ibuf0ibuf.c: Do not print to .err log about discarding ibuf entries in DISCARD TABLESPACE; removed compiler warning about unused variable
* | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-11-021-0/+14
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-4.1 innobase/dict/dict0load.c: Auto merged
| * | dict0load.c:unknown2004-11-021-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | Raise fatal semaphore wait timeout to 2 hours when we are printing the InnoDB table monitor output innobase/dict/dict0load.c: Raise fatal semaphore wait timeout to 2 hours when we are printing the InnoDB table monitor output
* | | merge with 4.0unknown2004-11-026-13/+69
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | | | | | Build-tools/mysql-copyright: Auto merged Docs/Support/texi2html: Auto merged innobase/dict/dict0dict.c: Auto merged innobase/eval/eval0eval.c: Auto merged innobase/pars/pars0pars.c: Auto merged
| * row0mysql.c, pars0pars.c, eval0eval.c, dict0load.c, dict0dict.c, dict0crea.c:unknown2004-10-316-13/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug #3478: InnoDB's FOREIGN KEY tables treated table and database names as case-insensitive; RENAME TABLE t to T would hang in an endless loop if t had a foreign key constraint defined on it dict0dict.c: Fix bug #3478: InnoDB's FOREIGN KEY tables treated table and database names as case-insensitive; RENAME TABLE t to T would hang in an endless loop if t had a foreign key constraint defined on it; fix also a hang that would occur if one tried in ALTER TABLE or RENAME TABLE to create a foreign key constraint name that collided with another existing name innobase/dict/dict0crea.c: Fix bug #3478: InnoDB's FOREIGN KEY tables treated table and database names as case-insensitive; RENAME TABLE t to T would hang in an endless loop if t had a foreign key constraint defined on it innobase/dict/dict0load.c: Fix bug #3478: InnoDB's FOREIGN KEY tables treated table and database names as case-insensitive; RENAME TABLE t to T would hang in an endless loop if t had a foreign key constraint defined on it innobase/dict/dict0dict.c: Fix bug #3478: InnoDB's FOREIGN KEY tables treated table and database names as case-insensitive; RENAME TABLE t to T would hang in an endless loop if t had a foreign key constraint defined on it; fix also a hang that would occur if one tried in ALTER TABLE or RENAME TABLE to create a foreign key constraint name that collided with another existing name innobase/eval/eval0eval.c: Fix bug #3478: InnoDB's FOREIGN KEY tables treated table and database names as case-insensitive; RENAME TABLE t to T would hang in an endless loop if t had a foreign key constraint defined on it innobase/pars/pars0pars.c: Fix bug #3478: InnoDB's FOREIGN KEY tables treated table and database names as case-insensitive; RENAME TABLE t to T would hang in an endless loop if t had a foreign key constraint defined on it innobase/row/row0mysql.c: Fix bug #3478: InnoDB's FOREIGN KEY tables treated table and database names as case-insensitive; RENAME TABLE t to T would hang in an endless loop if t had a foreign key constraint defined on it
* | Fixed access to freed memoryunknown2004-10-271-2/+0
| | | | | | | | | | | | | | | | | | innobase/srv/srv0srv.c: after merge fix sql/set_var.cc: after merge fix sql/sql_cache.cc: after merge fix
* | Merge with 4.0unknown2004-10-273-0/+27
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/deleted/.del-innodb-lock-master.opt~f76a4a1999728f87: Auto merged innobase/include/trx0sys.h: Auto merged innobase/srv/srv0srv.c: Auto merged innobase/trx/trx0purge.c: Auto merged innobase/trx/trx0rseg.c: Auto merged mysql-test/r/innodb-lock.result: Auto merged mysql-test/t/innodb-lock.test: Auto merged sql/mysql_priv.h: Auto merged sql/set_var.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_parse.cc: Auto merged sql/mysqld.cc: Use local version during merge
| * Backport innodb_max_purge_lag from 4.1unknown2004-10-276-1/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | innobase/include/srv0srv.h: Add configuration parameter srv_max_purge_lag. Add global variable srv_dml_needed_delay. innobase/include/trx0sys.h: Add trx_sys->rseg_history_len innobase/row/row0mysql.c: Add row_mysql_delay_if_needed() for delaying INSERTs, UPDATEs and DELETEs for srv_dml_needed_delay microseconds. innobase/srv/srv0srv.c: Define global variable srv_dml_needed_delay. Define configuration parameter srv_max_purge_lag. innobase/trx/trx0purge.c: Update trx_sys->rseg_history_len. trx_purge(): Compute srv_dml_needed_delay from srv_max_purge_lag and trx_sys->rseg_history_len. innobase/trx/trx0rseg.c: Initialize trx_sys->rseg_history_len at InnoDB start-up. sql/ha_innodb.h: Add configuration parameter srv_max_purge_lag. sql/mysqld.cc: Add startup option innodb_max_purge_lag, with default value 0 (meaning infinite, disabling the feature). sql/set_var.cc: Add global variable innodb_max_purge_lag.
* | fil0fil.c:unknown2004-10-261-0/+10
| | | | | | | | | | | | | | | | Print to the .err log a more detailed error message if in IMPORT TABLESPACE the .ibd file does not exist innobase/fil/fil0fil.c: Print to the .err log a more detailed error message if in IMPORT TABLESPACE the .ibd file does not exist
* | row0mysql.c:unknown2004-10-263-14/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Print more warnings to the .err log if ALTER TABLE ... IMPORT TABLESPACE fails for some reason os0file.c: Do not call exit(1) if os_file_delete() fails; remove unused parameter from handle_error_no_exit() fil0fil.c: Allow DROP TABLE even if the .ibd file for the table does not exist innobase/fil/fil0fil.c: Allow DROP TABLE even if the .ibd file for the table does not exist innobase/os/os0file.c: Dono not call exit(1) if os_file_delete() fails; remove unused parameter from handle_error_no_exit() innobase/row/row0mysql.c: Print more warnings to the .err log if ALTER TABLE ... IMPORT TABLESPACE fails for some reason
* | - fixed typo in innobase/os/os0file.c that caused the Windows build to failunknown2004-10-251-1/+1
| | | | | | | | | | innobase/os/os0file.c: - fixed typo that caused the Windows build to fail
* | Fix compiler warnings (detected by Intel's C++ compiler)unknown2004-10-222-17/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed checking of privilege handling in CREATE ... SELECT (Bug #6094) client/mysql.cc: Fix compiler warnings client/mysqltest.c: Fix wrong counting of lines Remove compiler warnings heap/hp_hash.c: Fix compiler warnings innobase/dict/dict0load.c: Fix compiler warnings innobase/include/mem0mem.h: Fix compiler warnings libmysql/client_settings.h: Fix compiler warnings myisam/ft_nlq_search.c: Add comments about compiler warnings myisam/rt_index.c: Add comments about compiler warnings myisam/rt_mbr.c: Add comments about compiler warnings mysql-test/r/ps.result: Test case for bug#6094 mysql-test/t/ps.test: Test case for bug#6094 mysys/hash.c: Fix compiler warnings mysys/my_handler.c: Add comments about compiler warnings mysys/my_thr_init.c: Add comments about compiler warnings ndb/include/mgmapi/mgmapi.h: Fix compiler warnings regex/main.c: Fix compiler warnings sql/item.h: Fix compiler warnings sql/item_func.h: Add comments about compiler warnings sql/spatial.h: Add comments about compiler warnings sql/sql_lex.h: Fix compiler warning sql/sql_list.h: Fix compiler warning sql/sql_parse.cc: Move testing of access rights of tables in CREATE ... SELECT to create_table_precheck() to fix privilege checking in CREATE ... SELECT (Bug #6094) sql/sql_prepare.cc: Remove not needed empty line sql/sql_string.h: Fix compiler warnings strings/ctype-mb.c: Fix compiler warnings
* | Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1unknown2004-10-223-6/+23
|\ \ | |/ | | | | | | | | | | | | | | innobase/os/os0file.c: Auto merged innobase/row/row0ins.c: Auto merged innobase/row/row0mysql.c: Auto merged
| * os0file.c:unknown2004-10-221-4/+4
| | | | | | | | | | | | | | | | Add typecast from ulint to ssize_t in pread and pwrite, so that the type is according to the Linux man page; this will probably not help to fix the HP-UX 32-bit pwrite failure, since the compiler should do the appropriate typecasts anyway innobase/os/os0file.c: Add typecast from ulint to ssize_t in pread and pwrite, so that the type is according to the Linux man page; this will probably not help to fix the HP-UX 32-bit pwrite failure, since the compiler should do the appropriate typecasts anyway
| * row0mysql.c, row0ins.c:unknown2004-10-222-2/+19
| | | | | | | | | | | | | | | | | | | | Fix bug #5961: release the dictionary latch during a long cascaded FOREIGN KEY operation, so that we do not starve other users innobase/row/row0ins.c: Fix bug #5961: release the dictionary latch during a long cascaded FOREIGN KEY operation, so that we do not starve other users innobase/row/row0mysql.c: Fix bug #5961: release the dictionary latch during a long cascaded FOREIGN KEY operation, so that we do not starve other users
* | SHOW TABLE STATUS now prints create_time, update_time and check_timeunknown2004-10-212-5/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for InnoDB tables. Note that these times may always be correct ones, because for example ALTER TABLE creates a table again. innobase/include/os0file.h: Added information of file timestamps and a function os_file_get_status to get that information using stat(). innobase/os/os0file.c: Added function that return information obout the specified file. sql/ha_innodb.cc: Get timestamps for the file where the table is stored.
* | Merge with 4.0unknown2004-10-201-12/+18
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union Docs/Support/texi2html: Auto merged innobase/trx/trx0rec.c: Auto merged libmysql/libmysql.c: Auto merged myisam/myisampack.c: Auto merged mysql-test/t/innodb-lock.test: Auto merged mysys/thr_lock.c: Auto merged sql/ha_innodb.cc: Auto merged sql/lock.cc: Auto merged sql/sql_acl.cc: Keep old code
| * trx0rec.c:unknown2004-10-191-1/+1
| | | | | | | | | | | | | | | | test innobase/trx/trx0rec.c: test
| * trx0rec.c:unknown2004-10-091-12/+18
| | | | | | | | | | | | | | | | Fix bug #5960: if one updated a column so that its size changed, or updated it to an externally stored (TEXT or BLOB) value, then ANOTHER externally stored column would show up as 512 bytes of good data + 20 bytes of garbage in a consistent read that fetched the old version of the row innobase/trx/trx0rec.c: Fix bug #5960: if one updated a column so that its size changed, or updated it to an externally stored (TEXT or BLOB) value, then ANOTHER externally stored column would show up as 512 bytes of good data + 20 bytes of garbage in a consistent read that fetched the old version of the row
* | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-10-203-13/+26
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-4.1 BitKeeper/etc/logging_ok: auto-union innobase/srv/srv0srv.c: Auto merged
| * \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-10-083-13/+26
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-4.1 BitKeeper/etc/logging_ok: auto-union
| | * \ Mergeunknown2004-10-083-13/+26
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union innobase/include/sync0arr.h: Auto merged innobase/sync/sync0arr.c: Auto merged scripts/mysqlhotcopy.sh: Auto merged innobase/srv/srv0srv.c: SCCS merged
| | | * InnoDB: tolerate system clock glitches a little betterunknown2004-10-073-13/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in the error monitor thread. (Bug #5898) innobase/include/sync0arr.h: sync_array_print_long_waits(): return error status innobase/srv/srv0srv.c: srv_error_monitor_thread(): Keep track on successive fatal timeouts, and crash the server only if the timeouts have been exceeded for several times in succession. innobase/sync/sync0arr.c: sync_array_print_long_waits(): return error status
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-10-201-0/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mishka.local:/home/my/mysql-4.1 client/mysqlimport.c: Auto merged libmysql/libmysql.c: Auto merged ndb/src/ndbapi/ndberror.c: Auto merged sql/ha_innodb.cc: Auto merged sql/ha_ndbcluster.h: Auto merged sql/item.cc: Auto merged sql/ha_ndbcluster.cc: Auto merged
| * | | | Review of all code pushed since last reviewunknown2004-10-201-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simple optimzations and cleanups Removed compiler warnings and fixed portability issues Added client functions 'mysql_embedded()' to allow client to check if we are using embedded server Fixes for purify client/mysqlimport.c: Remove not used variable client/mysqltest.c: Remove usage of MAXPATHLEN (all MySQL code uses FN_REFLEN) Simplified code Remove usage of sprintf("%llu") as this is not portable include/mysql.h: Added mysql_embedded() to be able to easily check if we are using the embedded server innobase/srv/srv0start.c: Don't use memcmp() when using purify (to avoid false warnings) libmysql/libmysql.c: Added mysql_embedded() to be able to easily check if we are using the embedded server libmysql/libmysql.def: Added mysql_embedded() to be able to easily check if we are using the embedded server myisam/myisam_ftdump.c: Remove compiler warning myisam/myisamchk.c: Remove compiler warning myisam/rt_test.c: #ifdef not used code mysys/hash.c: Remove compiler warning (from last push) mysys/my_gethwaddr.c: Remove compiler warning ndb/src/ndbapi/ndberror.c: #ifdef not used code regex/regcomp.c: Remove not used code regex/regcomp.ih: Remove not used code (to remove compiler warnings) sql-common/client.c: Remove compiler warnings sql/field.cc: Simple optimization sql/ha_innodb.cc: Rename mysql_embedded -> mysqld_embedded sql/item.cc: Fix comments Move variables first on block Remove else after return Simple optimizations (no logic changes) sql/item_cmpfunc.cc: Added comment sql/mysql_priv.h: Rename mysql_embedded -> mysqld_embedded sql/mysqld.cc: Rename mysql_embedded -> mysqld_embedded sql/sql_acl.cc: Added comments simple optimization Fixed 'very unlikely' bug when doing REVOKE ALL PRIVILEGES sql/sql_select.cc: More comments Simple optimization sql/sql_show.cc: Simple changes to make similar code similar More comments sql/sql_string.cc: Trivial optimization and better code layout strings/Makefile.am: Change xml.c to use bcmp to avoid warnings from purify strings/xml.c: Change xml.c to use bcmp to avoid warnings from purify tests/client_test.c: Remove usage of MAXPATHLEN (all MySQL code uses FN_REFLEN)
* | | | | os0file.c:unknown2004-10-191-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | InnoDB: print info about how many bytes we were able to read if a file read is not able to read as many bytes as we requested innobase/os/os0file.c: InnoDB: print info about how many bytes we were able to read if a file read is not able to read as many bytes as we requested
* | | | | Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-10-193-90/+36
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into hundin.mysql.fi:/home/marko/j/mysql-4.1
| * | | | | InnoDB: Treat UTF-8 strings properly in case insensitive operationsunknown2004-10-183-90/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | innobase/dict/dict0dict.c: Use innobase_strcasecmp() and innobase_casedn_str() instead of ut_cmp_in_lower_case() and ut_cpy_in_lower_case() innobase/include/ut0byte.h: Remove ut_cpy_in_lower_case() and ut_cmp_in_lower_case() innobase/ut/ut0byte.c: Remove ut_cpy_in_lower_case() and ut_cmp_in_lower_case() sql/ha_innodb.cc: Add innobase_strcasecmp() and innobase_casedn_str() Replace tolower() loop with innobase_casedn_str() Replace my_casedn_str() with innobase_casedn_str() Replace ut_cmp_in_lower_case() with innobase_strcasecmp()
* | | | | | srv0srv.c:unknown2004-10-181-1/+7
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If innodb_thread_concurrency would be exceeded, let a thread sleep 10 ms before entering the FIFO queue; previously, the value was 50 ms, which Peter Z considered too long innobase/srv/srv0srv.c: If innodb_thread_concurrency would be exceeded, let a thread sleep 10 ms before entering the FIFO queue; previously, the value was 50 ms, which Peter Z considered too long
View Lorry Controller Status