summaryrefslogtreecommitdiff
path: root/innobase
Commit message (Collapse)AuthorAgeFilesLines
* Applied innodb-4.1-ss36 and innodb-4.1-ss38 snapshotsunknown2007-01-211-13/+16
| | | | | | | | | | | | | | | | | | | | Fixes: - Bug #24299: - Bug #25596: innobase/dict/dict0dict.c: Applied innodb-4.1-ss36 and innodb-4.1-ss38 snapshots Revision r36: innodb-4.1: Port r1030 from innodb/branches/5.0: Replace isspace() with a wrapper ib_isspace(), because on Win32 isspace(0xa0) appears to hold. (Bug #24299) Revision r38: ib_isspace(c): Check for c being the null character. (Bug #25596)
* Many files:unknown2007-01-119-13/+16
| | | | | | | | | | | | | | | | | | | | | | | | Reverted change for bug#13859, applied smaller patch from Marko innobase/buf/buf0buf.c: Reverted change for bug#13859, applied smaller patch from Marko innobase/dict/dict0dict.c: Reverted change for bug#13859, applied smaller patch from Marko innobase/fil/fil0fil.c: Reverted change for bug#13859, applied smaller patch from Marko innobase/ha/ha0ha.c: Reverted change for bug#13859, applied smaller patch from Marko innobase/ha/hash0hash.c: Reverted change for bug#13859, applied smaller patch from Marko innobase/include/hash0hash.h: Reverted change for bug#13859, applied smaller patch from Marko innobase/lock/lock0lock.c: Reverted change for bug#13859, applied smaller patch from Marko innobase/log/log0recv.c: Reverted change for bug#13859, applied smaller patch from Marko innobase/thr/thr0loc.c: Reverted change for bug#13859, applied smaller patch from Marko
* Many files:unknown2007-01-019-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | Renamed hash_create() not to clash with imap using embedded server (bug#13859) innobase/buf/buf0buf.c: Renamed hash_create() not to clash with imap using embedded server (bug#13859) innobase/dict/dict0dict.c: Renamed hash_create() not to clash with imap using embedded server (bug#13859) innobase/fil/fil0fil.c: Renamed hash_create() not to clash with imap using embedded server (bug#13859) innobase/ha/ha0ha.c: Renamed hash_create() not to clash with imap using embedded server (bug#13859) innobase/ha/hash0hash.c: Renamed hash_create() not to clash with imap using embedded server (bug#13859) innobase/include/hash0hash.h: Renamed hash_create() not to clash with imap using embedded server (bug#13859) innobase/lock/lock0lock.c: Renamed hash_create() not to clash with imap using embedded server (bug#13859) innobase/log/log0recv.c: Renamed hash_create() not to clash with imap using embedded server (bug#13859) innobase/thr/thr0loc.c: Renamed hash_create() not to clash with imap using embedded server (bug#13859)
* This ChangeSet must be null-merged to 5.0. Applied innodb-4.1-ss33unknown2006-11-091-13/+31
| | | | | | | | | | | | | | | | Fixes: - Bug #24089: Race condition in fil_flush_file_spaces() innobase/fil/fil0fil.c: Applied innodb-4.1-ss33 Revision r33: innodb-4.1: Merge r1002 from innodb/trunk: fil_flush_file_spaces(): Copy the system->unflushed_spaces list to an array while holding the mutex. This removes the crash-triggering race condition that was introduced when fixing Bug 15653. (Bug #24089)
* Applied innodb-4.1-ss32 snapshot.unknown2006-07-261-9/+6
| | | | | | | | innobase/ibuf/ibuf0ibuf.c: Applied innodb-4.1-ss32 snapshot. ibuf_fixed_addr_page(): Add parameter space. As the insert buffer B-tree is only located in the system tablespace (space 0), IBUF_TREE_ROOT_PAGE_NO is only special in space 0.
* Applied innodb-4.1-ss31 snapshot.unknown2006-06-061-10/+10
| | | | | | | | | | | Fixed BUG#19727 "InnoDB crashed server and crashed tables are not recoverable". innobase/row/row0mysql.c: Applied innodb-4.1-ss31 snapshot. Move trx_commit_for_mysql(trx) calls before calls to row_mysql_unlock_data_dictionary(trx).
* Applied innodb-4.1-ss29 snapshot.unknown2006-05-151-25/+38
| | | | | | | | | | | | | | | | | | Fix BUG#19542 "InnoDB doesn't increase the Handler_read_prev counter. innobase/os/os0file.c: Applied innodb-4.1-ss29 snapshot. Check the page trailers also after writing to disk. This improves the chances of diagnosing Bug 18886. os_file_check_page_trailers(): New function for checking that two copies of the LSN stamped on the pages match. os_aio_simulated_handle(): Call os_file_check_page_trailers() before and after os_file_write(). sql/ha_innodb.cc: Applied innodb-4.1-ss29 snapshot. Increment statistic counter in ha_innobase::index_prev().
* Applied innodb-4.1-ss26 snapshot.unknown2006-05-031-2/+0
| | | | | | | | | | Fixed BUG#19366: "consistent_snapshot.test fails". innobase/include/dict0dict.ic: Applied innodb-4.1-ss26 snapshot. Remove too strict assertions from some dict_table_t accessor functions (Bug#19366).
* Applied innodb-4.1-ss22 snapshot.unknown2006-04-206-1/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix BUG#16814: "SHOW INNODB STATUS format error in LATEST FOREIGN KEY ERROR section" Add a missing newline to the LAST FOREIGN KEY ERROR section in SHOW INNODB STATUS output. Fix BUG#18934: "InnoDB crashes when table uses column names like DB_ROW_ID". Refuse tables that use reserved column names. innobase/dict/dict0dict.c: Applied innodb-4.1-ss22 snapshot. dict_foreign_error_report(): Always print a newline after invoking dict_print_info_on_foreign_key_in_create_format() (Bug#16814). Refuse tables that use reserved column names (Bug#18934). innobase/dict/dict0mem.c: Applied innodb-4.1-ss22 snapshot. Refuse tables that use reserved column names (Bug#18934). innobase/include/dict0dict.h: Applied innodb-4.1-ss22 snapshot. Refuse tables that use reserved column names (Bug#18934). innobase/include/dict0mem.h: Applied innodb-4.1-ss22 snapshot. Refuse tables that use reserved column names (Bug#18934). innobase/include/univ.i: Applied innodb-4.1-ss22 snapshot. innobase/row/row0mysql.c: Applied innodb-4.1-ss22 snapshot. Refuse tables that use reserved column names (Bug#18934).
* Fixed BUG#15653, BUG#16582.unknown2006-01-303-17/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | Applied innodb-4.1-ss20 snapshot. innobase/btr/btr0sea.c: Applied innodb-4.1-ss20 snapshot. Account for a race condition when dropping the adaptive hash index for a B-tree page (Bug #16582). btr_search_drop_page_hash_index(): Retry the operation if a hash index with different parameters was built meanwhile. Add diagnostics for the case that hash node pointers to the page remain. This fix is from Heikki. btr_search_info_update_hash(), btr_search_info_update_slow(): Document the parameter "info" as in/out. innobase/fil/fil0fil.c: Applied innodb-4.1-ss20 snapshot. Keep track on unflushed modifications to file spaces. When there are tens of thousnads of file spaces, flushing all files in fil_flush_file_spaces() would be very slow (Bug #16582). fil_flush_file_spaces(): Only flush unflushed file spaces. fil_space_t, fil_system_t: Add a list of unflushed spaces. innobase/include/btr0sea.ic: Applied innodb-4.1-ss20 snapshot. btr_search_info_update_hash(), btr_search_info_update_slow(): Document the parameter "info" as in/out.
* Fixed BUG#16387.unknown2006-01-301-1/+2
| | | | | | | | | | | | | | | | | | Applied innodb-4.1-ss17 snapshot. Do not mistake TABLENAME_ibfk_0 for auto-generated id. innobase/dict/dict0dict.c: Applied innodb-4.1-ss17 snapshot. dict_table_get_highest_foreign_id(): Ignore foreign constraint identifiers starting with the pattern TABLENAME_ibfk_0 (BUG#16387). mysql-test/r/innodb.result: Applied innodb-4.1-ss17 snapshot. Fixed results for added test case. mysql-test/t/innodb.test: Applied innodb-4.1-ss17 snapshot. Added test case.
* Changes from innodb-4.1-ss14 snapshotunknown2006-01-152-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed BUG#14056: Column prefix index on UTF-8 primary key causes "Can't find record.." Also fixed bug 15991. innobase/include/os0file.h: Changes from innodb-4.1-ss14 snapshot os_file_hadle_error(): Map the error codes EXDEV, ENOTDIR, and EISDIR to the new code OS_FILE_PATH_ERROR. Treat this code as OS_FILE_PATH_ERROR. This fixes the crash on RENAME TABLE when the .ibd file is a symbolic link to a different file system. (Bug 15991) innobase/os/os0file.c: Changes from innodb-4.1-ss14 snapshot os_file_hadle_error(): Map the error codes EXDEV, ENOTDIR, and EISDIR to the new code OS_FILE_PATH_ERROR. Treat this code as OS_FILE_PATH_ERROR. This fixes the crash on RENAME TABLE when the .ibd file is a symbolic link to a different file system. (Bug 15991) mysql-test/r/innodb.result: Changes from innodb-4.1-ss14 snapshot Fixed BUG#14056: Column prefix index on UTF-8 primary key causes "Can't find record.." mysql-test/t/innodb.test: Changes from innodb-4.1-ss14 snapshot Fixed BUG#14056: Column prefix index on UTF-8 primary key causes "Can't find record.." sql/ha_innodb.cc: Changes from innodb-4.1-ss14 snapshot Fixed BUG#14056: Column prefix index on UTF-8 primary key causes "Can't find record.."
* Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.0unknown2006-01-121-0/+9
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 include/config-netware.h: Auto merged innobase/os/os0thread.c: Auto merged netware/mysqld_safe.c: Merge from 4.0 to 4.1 sql/mysqld.cc: Merge from 4.0 to 4.1
| * NetWare specific change to increase thread stack size.unknown2006-01-121-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes to Netware specific mysqld_safe.c include/config-netware.h: NetWare specific change to increase thread stack size. innobase/os/os0thread.c: NetWare specific change to increase thread stack size. netware/mysqld_safe.c: NetWare specific change to make multiple mysqld_safe instances work when called through a NCF file. sql/mysqld.cc: NetWare specific change to increase thread stack size.
* | Fix BUG#12071: "Windows hang: 'Opening tables' or 'Waiting forunknown2005-12-1212-110/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | table' lockup". Changes from the innodb-4.1-ss11 snapshot. Do not call os_file-create_tmpfile() at runtime. Instead, create a tempfile at startup and guard access to it with a mutex. Also, fix bugs: 10511: "Wrong padding of UCS2 CHAR columns in ON UPDATE CASCADE"; 13778: "If FOREIGN_KEY_CHECKS=0, one can create inconsistent FOREIGN KEYs". When FOREIGN_KEY_CHECKS=0 we still need to check that datatypes between foreign key references are compatible. Also, added test cases (also for bug 9802). innobase/dict/dict0dict.c: Changes from the innodb-4.1-ss11 snapshot innobase/dict/dict0load.c: Changes from the innodb-4.1-ss11 snapshot innobase/include/dict0dict.h: Changes from the innodb-4.1-ss11 snapshot innobase/include/dict0load.h: Changes from the innodb-4.1-ss11 snapshot innobase/include/os0file.h: Changes from the innodb-4.1-ss11 snapshot innobase/include/rem0cmp.h: Changes from the innodb-4.1-ss11 snapshot innobase/include/srv0srv.h: Changes from the innodb-4.1-ss11 snapshot innobase/rem/rem0cmp.c: Changes from the innodb-4.1-ss11 snapshot innobase/row/row0ins.c: Changes from the innodb-4.1-ss11 snapshot innobase/row/row0mysql.c: Changes from the innodb-4.1-ss11 snapshot innobase/srv/srv0srv.c: Changes from the innodb-4.1-ss11 snapshot innobase/srv/srv0start.c: Changes from the innodb-4.1-ss11 snapshot libmysqld/ha_blackhole.cc: Changes from the innodb-4.1-ss11 snapshot mysql-test/r/innodb.result: Changes from the innodb-4.1-ss11 snapshot mysql-test/t/innodb.test: Changes from the innodb-4.1-ss11 snapshot sql/ha_innodb.cc: Changes from the innodb-4.1-ss11 snapshot
* | Fix BUG#10511: Wrong padding of UCS2 CHAR columns inunknown2005-10-281-9/+39
| | | | | | | | | | | | | | | | ON UPDATE CASCADE innobase/row/row0ins.c: Patch from Marko is applied
* | Removed innobase/my_cnf, innobase/include/makefilewin.i,unknown2005-10-2633-654/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and innobase/*/makefilewin (which are unused now). BitKeeper/deleted/.del-makefilewin.i~5c8479dcb8a455b2: Delete: innobase/include/makefilewin.i BitKeeper/deleted/.del-makefilewin~78000390c783b1c5: Delete: innobase/btr/makefilewin BitKeeper/deleted/.del-makefilewin~2fc379bd4065c995: Delete: innobase/buf/makefilewin BitKeeper/deleted/.del-makefilewin~d37b6b303348c871: Delete: innobase/data/makefilewin BitKeeper/deleted/.del-makefilewin~5104767c73775697: Delete: innobase/dict/makefilewin BitKeeper/deleted/.del-makefilewin~d90f35fdc3f2ee5f: Delete: innobase/dyn/makefilewin BitKeeper/deleted/.del-makefilewin~c7b621c745e5de95: Delete: innobase/eval/makefilewin BitKeeper/deleted/.del-makefilewin~4d139e182457e553: Delete: innobase/fil/makefilewin BitKeeper/deleted/.del-makefilewin~d1a9d1f7d33fcb73: Delete: innobase/fsp/makefilewin BitKeeper/deleted/.del-makefilewin~ef3a208fa0e9b0db: Delete: innobase/fut/makefilewin BitKeeper/deleted/.del-makefilewin~f1e3b890aa1c9ea3: Delete: innobase/ha/makefilewin BitKeeper/deleted/.del-makefilewin~1c53f31b88dd36e: Delete: innobase/ibuf/makefilewin BitKeeper/deleted/.del-makefilewin~7a9d7d5a42bbfaf5: Delete: innobase/lock/makefilewin BitKeeper/deleted/.del-makefilewin~b643e38d8da389ac: Delete: innobase/log/makefilewin BitKeeper/deleted/.del-makefilewin~a40ea12eebdd6ef0: Delete: innobase/mach/makefilewin BitKeeper/deleted/.del-makefilewin~1dbc058d76ebf1db: Delete: innobase/mem/makefilewin BitKeeper/deleted/.del-makefilewin~6ba64863bce3d0b8: Delete: innobase/mtr/makefilewin BitKeeper/deleted/.del-makefilewin~15e9e5c9e8fa870b: Delete: innobase/os/makefilewin BitKeeper/deleted/.del-makefilewin~aeea7c82f21f7cf5: Delete: innobase/page/makefilewin BitKeeper/deleted/.del-makefilewin~dea10ec1c94f7be: Delete: innobase/pars/makefilewin BitKeeper/deleted/.del-makefilewin~608ed49dcd88e0f7: Delete: innobase/que/makefilewin BitKeeper/deleted/.del-makefilewin~2e0407fe123f8365: Delete: innobase/read/makefilewin BitKeeper/deleted/.del-makefilewin~fdda94ad32fa9e34: Delete: innobase/rem/makefilewin BitKeeper/deleted/.del-makefilewin~dc4b8ad5ea53bd: Delete: innobase/row/makefilewin BitKeeper/deleted/.del-makefilewin~63acd666293282a: Delete: innobase/srv/makefilewin BitKeeper/deleted/.del-makefilewin~13888739357b3025: Delete: innobase/sync/makefilewin BitKeeper/deleted/.del-makefilewin~c8273a47b90f52bb: Delete: innobase/thr/makefilewin BitKeeper/deleted/.del-makefilewin~f4b7b99a887b7de: Delete: innobase/trx/makefilewin BitKeeper/deleted/.del-makefilewin~72a64128bacce71b: Delete: innobase/usr/makefilewin BitKeeper/deleted/.del-makefilewin~389ee2dcf79afb79: Delete: innobase/ut/makefilewin BitKeeper/deleted/.del-makefilewin~14f24a4a173e2fcd: Delete: innobase/makefilewin BitKeeper/deleted/.del-my_cnf~977f69858affc57b: Delete: innobase/my_cnf innobase/include/Makefile.am: Removed ref to Makefilewin.i (it is unused now).
* | os0sync.c:unknown2005-10-031-1/+15
| | | | | | | | | | | | | | | | Add diagnostic code to track an assertion failure of 0 == pthread_mutex_destroy(); this was reported on the MySQL mailing list Sept 23, 2005 innobase/os/os0sync.c: Add diagnostic code to track an assertion failure of 0 == pthread_mutex_destroy(); this was reported on the MySQL mailing list Sept 23, 2005
* | Bug #6581 Failure to start mysql server on Windows with AWE option enabledunknown2005-08-121-1/+2
| | | | | | | | | | | | innobase/srv/srv0start.c: added line to error message clearly indicating that to get AWE support the user must compile InnoDB with __WIN2000__ defined.
* | buf0buf.c:unknown2005-08-031-0/+9
| | | | | | | | | | | | | | | | Fix a bug: InnoDB could in a crash recovery print a big false corruption warning if the first page of an ibdata file was 'recreated' in the buffer pool; this could happen, for example, if a table was dropped, and the page used later innobase/buf/buf0buf.c: Fix a bug: InnoDB could in a crash recovery print a big false corruption warning if the first page of an ibdata file was 'recreated' in the buffer pool; this could happen, for example, if a table was dropped, and the page used later
* | InnoDB: Do not flush after each write, not even when creating theunknown2005-07-263-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | data files. Previously, writes were flushed until the doublewrite buffer was created. That would be too slow on systems where os_file_flush() [or fsync(2)] is slow. (Bug #12125) innobase/include/os0file.h: Disable os_do_not_call_flush_at_each_write unless #ifdef UNIV_DO_FLUSH innobase/os/os0file.c: Disable os_do_not_call_flush_at_each_write unless #ifdef UNIV_DO_FLUSH innobase/trx/trx0sys.c: Disable os_do_not_call_flush_at_each_write unless #ifdef UNIV_DO_FLUSH
* | InnoDB: After review fixesunknown2005-06-271-3/+10
| | | | | | | | | | innobase/os/os0file.c: os_file_set_size(): After review fixes (prevent overflows)
* | InnoDB: Optimize the extension of files. This will greatly speedunknown2005-06-273-43/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | up CREATE TABLE in innodb_file_per_table=1 mode. innobase/fil/fil0fil.c: fil_extend_space_to_desired_size(): Do not allocate or initialize more memory than is necessary. Write at most one megabyte at a time. innobase/include/os0file.h: os_file_set_size(): Corrected the synopsis innobase/os/os0file.c: os_file_set_size(): Corrected the synopsis and some comments. s/offset/current_size; s/low/desired_size/; Do not allocate or initialize more memory than is necessary. Write at most one megabyte at a time.
* | Merge hundin.mysql.fi:/home/marko/k/mysql-4.0unknown2005-05-261-0/+5
|\ \ | |/ | | | | | | | | | | | | into hundin.mysql.fi:/home/marko/mysql-4.1 innobase/row/row0mysql.c: Auto merged
| * InnoDB: Check all referencing tables in DROP DATABASE (Bug #10335).unknown2005-05-261-0/+5
| | | | | | | | | | | | innobase/row/row0mysql.c: row_drop_table_for_mysql(): Check all referencing tables when drop_db==TRUE (Bug #10335)
* | row0mysql.c:unknown2005-05-131-2/+10
| | | | | | | | | | | | | | | | InnoDB wrongly complained in the .err log that MySQL is trying to drop a non-existent table, if tablespace ran out (Bug #10607) innobase/row/row0mysql.c: InnoDB wrongly complained in the .err log that MySQL is trying to drop a non-existent table, if tablespace ran out (Bug #10607)
* | Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-05-064-20/+61
|\ \ | | | | | | | | | | | | | | | | | | | | | into hundin.mysql.fi:/home/marko/mysql-4.1 sql/ha_innodb.cc: Auto merged
| * | InnoDB: Truncate SHOW INNODB STATUS output at the start of the listunknown2005-04-194-20/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of active transactions, if necessary and possible. (Bug #5436) innobase/include/lock0lock.h: Split lock_print_info() into lock_print_info_summary() and lock_print_info_all_transactions(). innobase/lock/lock0lock.c: Split lock_print_info() into lock_print_info_summary() and lock_print_info_all_transactions(). innobase/include/srv0srv.h: srv_printf_innodb_monitor(): Add output parameters trx_start and trx_end. innobase/srv/srv0srv.c: srv_printf_innodb_monitor(): Add output parameters trx_start and trx_end. sql/ha_innodb.cc: innodb_show_status(): Truncate oversized output at the beginning of the list of active transactions, if possible.
* | | dict0dict.c, dict0dict.h, fil0fil.c:unknown2005-04-273-1/+27
|/ / | | | | | | | | | | | | | | | | | | | | | | Fix a problem in crash recovery of .ibd files on Windows if the user used lower_case_table_names=0 or 2; the directory scan in crash recovery forgot to put all paths to lower case, so that the tablespace name would be consistent with the internal data dictionary of InnoDB; remember that InnoDB puts internally all database names and table names to lower case on Windows, regardless of the value of lower_case_table_names innobase/fil/fil0fil.c: Fix a problem in crash recovery of .ibd files on Windows if the user used lower_case_table_names=0 or 2; the directory scan in crash recovery forgot to put all paths to lower case, so that the tablespace name would be consistent with the internal data dictionary of InnoDB; remember that InnoDB puts internally all database names and table names to lower case on Windows, regardless of the value of lower_case_table_names innobase/include/dict0dict.h: Fix a problem in crash recovery of .ibd files on Windows if the user used lower_case_table_names=0 or 2; the directory scan in crash recovery forgot to put all paths to lower case, so that the tablespace name would be consistent with the internal data dictionary of InnoDB; remember that InnoDB puts internally all database names and table names to lower case on Windows, regardless of the value of lower_case_table_names innobase/dict/dict0dict.c: Fix a problem in crash recovery of .ibd files on Windows if the user used lower_case_table_names=0 or 2; the directory scan in crash recovery forgot to put all paths to lower case, so that the tablespace name would be consistent with the internal data dictionary of InnoDB; remember that InnoDB puts internally all database names and table names to lower case on Windows, regardless of the value of lower_case_table_names
* | Fixed a bug: deadlock without any locking, simple select and update (Bug #7975).unknown2005-04-181-18/+23
| | | | | | | | | | | | | | | | | | | | | | | | Backported from 5.0.3. innobase/row/row0ins.c: If the SQL-query will update or replace duplicate records we take X-lock for duplicate records. sql/ha_innodb.cc: INSERT ON DUPLICATE KEY UPDATE will also update duplicate records and we should take X-lock in this case for duplicate records.
* | fil0fil.c:unknown2005-04-141-19/+51
| | | | | | | | | | | | | | | | Add fault tolerance in the scan of .ibd files at a crash recovery; formerly a single failure of readdir_get_next caused the rest of the directory to be skipped innobase/fil/fil0fil.c: Add fault tolerance in the scan of .ibd files at a crash recovery; formerly a single failure of readdir_get_next caused the rest of the directory to be skipped
* | fil0fil.c:unknown2005-04-131-1/+2
| | | | | | | | | | | | | | | | At the shutdown, write the latest lsn only to the first pages of the ibdata files of the system tablespace, NOT to the .ibd files; writing to tens of thousands .ibd files can take minutes innobase/fil/fil0fil.c: At the shutdown, write the latest lsn only to the first pages of the ibdata files of the system tablespace, NOT to the .ibd files; writing to tens of thousands .ibd files can take minutes
* | row0sel.c:unknown2005-04-131-12/+12
| | | | | | | | | | | | | | | | Do not test the value of err if the lock operation was skipped because innodb_logs_unsafe_for_binlog was TRUE; though this did not cause any bugs visible to the user, because err is inited to DB_SUCCESS at the start of the function row_search_for_mysql() innobase/row/row0sel.c: Do not test the value of err if the lock operation was skipped because innodb_logs_unsafe_for_binlog was TRUE; though this did not cause any bugs visible to the user, because err is inited to DB_SUCCESS at the start of the function row_search_for_mysql()
* | InnoDB: Ignore character set mismatch in ALTER TABLE and RENAME TABLEunknown2005-04-125-18/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if foreign_key_checks=0. (Bug #9802) innobase/dict/dict0dict.c: dict_foreign_add_to_cache(): Add flag check_types. If the flag is FALSE, ignore character set mismatch. innobase/dict/dict0load.c: dict_load_foreign(), dict_load_foreigns(): Add flag check_types. If the flag is FALSE, differences in character sets will be ignored. innobase/include/dict0dict.h: dict_foreign_add_to_cache(): Add flag check_types. If the flag is FALSE, differences in character sets will be ignored. innobase/include/dict0load.h: dict_load_foreigns(): Add flag check_types. If the flag is FALSE, differences in character sets will be ignored. innobase/row/row0mysql.c: row_table_add_foreign_constraints(), row_rename_table_for_mysql(): Pass trx->check_foreigns to dict_load_foreigns() sql/ha_innodb.cc: ha_innobase::rename_table(): Clear trx->check_foreign if necessary.
* | InnoDB: Avoid test suite failures caused by a locking conflictunknown2005-04-063-4/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | between two server instances at server shutdown/startup. This conflict on advisory locks appears to be the result of a bug in the operating system; these locks should be released when the files are closed, but somehow that does not always happen immediately in Linux. (Bug #9381) innobase/include/os0file.h: Add OS_FILE_OPEN_RETRY for os_file_create()ing ibdata1 innobase/os/os0file.c: os_file_lock(): Do not close the file on failure, but let the callers do that. os_file_create(): If create_mode==OS_FILE_OPEN_RETRY and os_file_lock() fails, keep retrying for 100 seconds. innobase/srv/srv0start.c: open_or_create_data_files(): Open the first data file with OS_FILE_OPEN_RETRY, to resolve a conflict with a shutting-down instance of the MySQL server.
* | row0sel.c, btr0pcur.c, btr0pcur.ic, btr0pcur.h:unknown2005-04-064-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add diagnostic code to track assertion failure in ut_a(cursor->old_stored == BTR_PCUR_OLD_STORED); the failure happened in OPTIMIZE TABLE, and in 4.0.24 in some other context innobase/include/btr0pcur.h: Add diagnostic code to track assertion failure in ut_a(cursor->old_stored == BTR_PCUR_OLD_STORED); the failure happened in OPTIMIZE TABLE, and in 4.0.24 in some other context innobase/include/btr0pcur.ic: Add diagnostic code to track assertion failure in ut_a(cursor->old_stored == BTR_PCUR_OLD_STORED); the failure happened in OPTIMIZE TABLE, and in 4.0.24 in some other context innobase/btr/btr0pcur.c: Add diagnostic code to track assertion failure in ut_a(cursor->old_stored == BTR_PCUR_OLD_STORED); the failure happened in OPTIMIZE TABLE, and in 4.0.24 in some other context innobase/row/row0sel.c: Add diagnostic code to track assertion failure in ut_a(cursor->old_stored == BTR_PCUR_OLD_STORED); the failure happened in OPTIMIZE TABLE, and in 4.0.24 in some other context
* | dict0dict.c:unknown2005-04-051-0/+3
| | | | | | | | | | | | | | | | Add a note that ENUM in new tables cannot reference ENUM in old tables, in FOREIGN KEY constraints innobase/dict/dict0dict.c: Add a note that ENUM in new tables cannot reference ENUM in old tables, in FOREIGN KEY constraints
* | trx0trx.c:unknown2005-03-211-1/+9
| | | | | | | | | | | | | | | | If MySQL wrote to its binlog, but for some reason trx->update_undo and trx->insert_undo were NULL in InnoDB, then trx->commit_lsn was garbage, and InnoDB could assert in the log flush of trx_commit_complete_for_mysql() (Bug #9277) innobase/trx/trx0trx.c: If MySQL wrote to its binlog, but for some reason trx->update_undo and trx->insert_undo were NULL in InnoDB, then trx->commit_lsn was garbage, and InnoDB could assert in the log flush of trx_commit_complete_for_mysql() (Bug #9277)
* | Mergeunknown2005-03-211-0/+6
|\ \ | |/ | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union innobase/include/trx0trx.h: Auto merged innobase/trx/trx0trx.c: SCCS merged
| * trx0trx.c, trx0trx.h:unknown2005-03-212-1/+15
| | | | | | | | | | | | | | | | | | | | If MySQL wrote to its binlog, but for some reason trx->update_undo and trx->insert_undo were NULL in InnoDB, then trx->commit_lsn was garbage, and InnoDB could assert in the log flush of trx_commit_complete_for_mysql() (Bug #9277) innobase/include/trx0trx.h: If MySQL wrote to its binlog, but for some reason trx->update_undo and trx->insert_undo were NULL in InnoDB, then trx->commit_lsn was garbage, and InnoDB could assert in the log flush of trx_commit_complete_for_mysql() (Bug #9277) innobase/trx/trx0trx.c: If MySQL wrote to its binlog, but for some reason trx->update_undo and trx->insert_undo were NULL in InnoDB, then trx->commit_lsn was garbage, and InnoDB could assert in the log flush of trx_commit_complete_for_mysql() (Bug #9277)
* | Merge hundin.mysql.fi:/home/marko/k/mysql-4.0unknown2005-03-151-1/+8
|\ \ | |/ | | | | | | | | | | | | into hundin.mysql.fi:/home/marko/mysql-4.1 innobase/dict/dict0load.c: SCCS merged
| * dict0load.c:unknown2005-03-141-1/+8
| | | | | | | | | | | | | | | | | | | | dict_load_table(): Refuse to open ROW_FORMAT=COMPACT tables of MySQL 5.0.3 and later. innobase/dict/dict0load.c: dict_load_table(): Refuse to open ROW_FORMAT=COMPACT tables of MySQL 5.0.3 and later.
* | buf0flu.c:unknown2005-03-151-1/+9
| | | | | | | | | | | | | | | | Add diagnostics to track why ut_a(block->state == BUF_BLOCK_FILE_PAGE) failed in buf_flush_ready_for_replace() for a user innobase/buf/buf0flu.c: Add diagnostics to track why ut_a(block->state == BUF_BLOCK_FILE_PAGE) failed in buf_flush_ready_for_replace() for a user
* | log0recv.c:unknown2005-03-091-1/+3
| | | | | | | | | | | | | | | | | | Better ibbackup message Add a message explaining why we do a 'crash recovery' after an ibbackup restore; suggested by Tim Smith innobase/log/log0recv.c: Better ibbackup message
* | dict0load.c:unknown2005-03-081-17/+0
| | | | | | | | | | | | | | | | | | | | dict_load_table(): Do not complain about mix_len != 0, because MySQL 3.23.4x left garbage in that column. innobase/dict/dict0load.c: dict_load_table(): Do not complain about mix_len != 0, because MySQL 3.23.4x left garbage in that column.
* | After merge fixesunknown2005-03-081-17/+1
|\ \ | |/ | | | | | | | | innobase/dict/dict0load.c: dict_load_table(): Display diagnostic output if mix_len differs from 0.
| * dict0load.c:unknown2005-03-081-16/+0
| | | | | | | | | | | | | | | | | | | | | | | | dict_load_table(): Remove the check for row_format=compact for now, because the flag bit we used (high-order bit of mix_len) has not been zero for at least two customers. innobase/dict/dict0load.c: dict_load_table(): Remove the check for row_format=compact for now, because the flag bit we used (high-order bit of mix_len) has not been zero for at least two customers.
* | Merge hundin.mysql.fi:/home/marko/k/mysql-4.0unknown2005-03-082-1/+2
|\ \ | |/ | | | | | | | | | | | | | | | | into hundin.mysql.fi:/home/marko/mysql-4.1 innobase/include/srv0srv.h: Auto merged innobase/srv/srv0srv.c: Auto merged
| * InnoDB: Win64 portability fix: add missing declaration andunknown2005-03-082-1/+2
| | | | | | | | | | | | | | | | | | | | | | correct the definition of srv_max_buf_pool_modified_pct. innobase/include/srv0srv.h: Declare srv_max_buf_pool_modified_pct innobase/srv/srv0srv.c: Define srv_max_buf_pool_modified_pct as ulong, as it is declared in ha_innodb.h.
* | Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-03-0716-46/+51
|\ \ | | | | | | | | | | | | | | | | | | into hundin.mysql.fi:/home/marko/mysql-4.1