summaryrefslogtreecommitdiff
path: root/innobase
Commit message (Collapse)AuthorAgeFilesLines
* Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1unknown2005-10-2733-654/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp heap/_check.c: Auto merged heap/hp_create.c: Auto merged include/config-netware.h: Auto merged include/my_base.h: Auto merged include/my_handler.h: Auto merged include/myisam.h: Auto merged innobase/include/Makefile.am: Auto merged myisam/mi_check.c: Auto merged myisam/mi_delete.c: Auto merged myisam/mi_rnext_same.c: Auto merged myisam/mi_search.c: Auto merged myisam/mi_write.c: Auto merged myisam/myisamdef.h: Auto merged myisam/sort.c: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysql-test/r/date_formats.result: Auto merged mysql-test/r/update.result: Auto merged mysql-test/t/date_formats.test: Auto merged mysql-test/t/select.test: Auto merged mysql-test/t/update.test: Auto merged mysys/my_getopt.c: Auto merged mysys/my_handler.c: Auto merged scripts/make_binary_distribution.sh: Auto merged sql/ha_myisam.cc: Auto merged sql/item_timefunc.cc: Auto merged sql/records.cc: Auto merged sql/sql_load.cc: Auto merged sql/sql_select.cc: Auto merged sql/structs.h: Auto merged strings/conf_to_src.c: Auto merged strings/ctype-win1250ch.c: Auto merged Makefile.am: Merged from 4.1 myisam/myisamchk.c: Merged from 4.1 mysql-test/mysql-test-run.pl: Merged from 4.1 mysql-test/r/insert_select.result: Merged from 4.1 mysql-test/r/myisam.result: Merged from 4.1 mysql-test/r/select.result: Merged from 4.1 mysql-test/t/insert_select.test: Merged from 4.1 mysql-test/t/myisam.test: Merged from 4.1 netware/mysql_test_run.c: Merged from 4.1 sql/item.cc: Merged from 4.1 sql/mysqld.cc: Merged from 4.1 sql/sql_update.cc: Merged from 4.1 tests/mysql_client_test.c: Merged from 4.1
| * 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).
* | BUG#13900 DATETIME data changes after inserting a new row in a InnoDB tableunknown2005-10-173-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Applying patch from Marko. All tests pass in pentium-debug-max build on Linux. innobase/include/rem0rec.h: BUG#13900 DATETIME data changes after inserting a new row in a InnoDB table Applying patch from Marko. innobase/include/rem0rec.ic: BUG#13900 DATETIME data changes after inserting a new row in a InnoDB table Applying patch from Marko. innobase/row/row0upd.c: BUG#13900 DATETIME data changes after inserting a new row in a InnoDB table Applying patch from Marko.
* | Merge msdesk.(none):/home/msvensson/mysql-4.1unknown2005-10-061-1/+15
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into msdesk.(none):/home/msvensson/mysql-5.0 BUILD/SETUP.sh: Auto merged BitKeeper/deleted/.del-ctype-cp932.c: Auto merged BitKeeper/deleted/.del-ctype_cp932.result: Auto merged BitKeeper/deleted/.del-ctype_cp932.test: Auto merged BitKeeper/deleted/.del-ndb_range_bounds.pl~ff7e47a35fb44c74: Auto merged innobase/os/os0sync.c: Auto merged mysql-test/r/ctype_tis620.result: Auto merged mysql-test/r/ctype_ucs.result: Auto merged mysql-test/r/ctype_utf8.result: Auto merged mysql-test/t/ctype_uca.test: Auto merged mysql-test/t/ctype_ucs.test: Auto merged mysql-test/t/ctype_ujis.test: Auto merged mysql-test/t/ctype_utf8.test: Auto merged sql/ha_innodb.cc: Auto merged sql/item_cmpfunc.cc: Auto merged strings/ctype-big5.c: Auto merged strings/ctype-gbk.c: Auto merged strings/ctype-simple.c: Auto merged strings/ctype-sjis.c: Auto merged strings/ctype-ucs2.c: Auto merged client/mysql.cc: Sam change in both 4.1 and 5.0 mysql-test/r/ctype_uca.result: Merge mysql-test/r/ctype_ujis.result: Merge strings/ctype-mb.c: Merge strings/ctype-tis620.c: Merge
| * 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
* | Merge 127.(none):/home/osku/mysql/5.0/cleanunknown2005-09-293-4/+38
|\ \ | | | | | | | | | | | | | | | | | | into 127.(none):/home/osku/mysql/5.0/revcpy
| * | InnoDB: Fix potential buffer underflow.unknown2005-09-293-4/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | innobase/include/ut0mem.h: Add ut_strlcpy_rev. innobase/mem/mem0mem.c: Use ut_strlcpy_rev instead of buggy own implementation. innobase/ut/ut0mem.c: Add ut_strlcpy_rev.
* | | Minor corrections to InnoDB function commentsunknown2005-09-292-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | innobase/include/mem0mem.h: Correct the comment of mem_heap_create_func(). innobase/include/mem0mem.ic: Correct the comment of mem_heap_create_func(). sql/ha_innodb.cc: Correct comments regarding return value
* | | Merge 127.(none):/home/osku/mysql/5.0/cleanunknown2005-09-281-0/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into 127.(none):/home/osku/mysql/5.0/13497
| * | | InnoDB: Remove compiler warnings.unknown2005-09-281-0/+9
| |/ / | | | | | | | | | | | | | | | | | | innobase/os/os0proc.c: Add UT_NOT_USED for parameters in dummy implementations of AWE functions. sql/ha_innodb.cc: Tweak casts to eliminate compiler warnings.
* | | InnoDB: Print better error message when log files are missing/corruptunknown2005-09-281-1/+3
|/ / | | | | | | | | | | | | | | (bug #13497). innobase/buf/buf0buf.c: Print better error message when log files are missing/corrupt.
* | Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-09-273-22/+3
|\ \ | | | | | | | | | | | | | | | | | | into 127.(none):/home/osku/mysql/5.0/clean
| * \ Merge akopytov@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-09-273-22/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | into polly.local:/home/kaa/src/mysql-5.0
| | * | Fix for bug #13367, post-review changesunknown2005-09-273-22/+3
| | | |
| | * | Fix for bug #13367unknown2005-09-261-2/+2
| | | |
* | | | InnoDB: Fix compile warning.unknown2005-09-272-4/+4
|/ / / | | | | | | | | | | | | | | | | | | innobase/include/trx0trx.h: Change trx_set_detailed_error's second argument to const char*. innobase/trx/trx0trx.c: Change trx_set_detailed_error's second argument to const char*.
* | | InnoDB: Handle temporary file creation failure more gracefully.unknown2005-09-261-7/+9
|/ / | | | | | | | | innobase/row/row0ins.c: Don't assert on temp file creation failure.
* | row0ins.c:unknown2005-09-231-1/+2
| | | | | | | | | | | | | | | | Fix a compilation error: Visual C++ does not seem to allow variable declaration in the middle of a program block innobase/row/row0ins.c: Fix a compilation error: Visual C++ does not seem to allow variable declaration in the middle of a program block
* | Merge 127.(none):/home/osku/mysql/5.0/cleanunknown2005-09-239-13/+173
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 127.(none):/home/osku/mysql/5.0/3443 innobase/dict/dict0dict.c: Auto merged innobase/include/trx0trx.h: Auto merged sql/ha_innodb.cc: Auto merged mysql-test/r/innodb.result: Merge fixes. mysql-test/t/innodb.test: Merge fixes.
| * | Fix bug #3443, better foreign key error messsages.unknown2005-09-239-13/+173
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | innobase/dict/dict0dict.c: Add 'add_newline' parameter to dict_print_info_on_foreign_key_in_create_format. innobase/include/dict0dict.h: Add 'add_newline' parameter to dict_print_info_on_foreign_key_in_create_format. innobase/include/os0file.h: Add os_file_read_string. innobase/include/trx0trx.h: Add trx_set_detailed_error and trx_set_detailed_error_from_file functions and a detailed_error field to trx_struct. innobase/include/ut0mem.h: Add ut_strlcpy. innobase/os/os0file.c: Add os_file_read_string. innobase/row/row0ins.c: Add row_ins_set_detailed function and call it when needed. Adapt to changes in dict_print_info_on_foreign_key_in_create_format. innobase/trx/trx0trx.c: Add trx_set_detailed_error and trx_set_detailed_error_from_file. Clear trx->detailed_error in trx_create. innobase/ut/ut0mem.c: Add ut_strlcpy. mysql-test/r/innodb.result: Add new tests, adapt existing ones whose output was changed. mysql-test/t/innodb.test: Add new tests, adapt existing ones whose output was changed. sql/ha_innodb.cc: Add get_error_message. Clear trx->detailed_error in start_stmt and external_lock. sql/ha_innodb.h: Add get_error_message. sql/handler.cc: Add special case code in print_error for HA_ERR_ROW_IS_REFERENCED and HA_ERR_NO_REFERENCED_ROW. Change SETMSG to point to new error messages. sql/share/errmsg.txt: Add ER_ROW_IS_REFERENCED_2 and ER_NO_REFERENCED_ROW_2.
* | | InnoDB: Minor fixes.unknown2005-09-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | innobase/include/trx0trx.h: Fix invalid comment. sql/ha_innodb.cc: Change some memory allocations to fail-on-error. Cast argument of my_free to gptr, not char*.
* | | InnoDB: Fix bug #13315, index columns having a maximum length of 767.unknown2005-09-236-20/+39
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | innobase/data/data0data.c: Adapt to DICT_MAX_COL_PREFIX_LEN rename. innobase/dict/dict0dict.c: Adapt to DICT_MAX_COL_PREFIX_LEN rename. innobase/include/dict0mem.h: Rename DICT_MAX_COL_PREFIX_LEN to DICT_MAX_INDEX_COL_LEN. innobase/include/row0mysql.h: Add field_lengths parameter to row_create_index_for_mysql. innobase/rem/rem0rec.c: Adapt to DICT_MAX_COL_PREFIX_LEN rename. innobase/row/row0mysql.c: Add field_lengths parameter to row_create_index_for_mysql and use it to check for too long index columns. mysql-test/r/innodb.result: New tests. mysql-test/t/innodb.test: New tests. sql/ha_innodb.cc: Create temporary field_lengths buffer and pass it to row_create_index_for_mysql.
* | InnoDB: correct two misleading commentsunknown2005-09-221-1/+1
| | | | | | | | | | | | | | innobase/include/data0type.ic: Correct the comment of dtype_get_min_size() sql/ha_innodb.h: Correct the comment of innobase_set_cursor_view()
* | InnoDB: Remove unused #defines BTR_PAGE_MAX_KEY_SIZE and BTR_COMPRESS_LIMIT.unknown2005-09-161-10/+0
| |
* | InnoDB: Reject foreign keys in temporary tables. Closes bug #12084. unknown2005-09-064-7/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | innobase/dict/dict0dict.c: Add reject_fks parameter to dict_create_foreign_constraints_low and dict_create_foreign_constraints. innobase/include/dict0dict.h: Add reject_fks parameter to dict_create_foreign_constraints. innobase/include/row0mysql.h: Add reject_fks parameter to row_table_add_foreign_constraints. innobase/row/row0mysql.c: Add reject_fks parameter to row_table_add_foreign_constraints. sql/ha_innodb.cc: In create, pass correct reject_fks argument to row_table_add_foreign_constraints depending on whether we're creating a temporary table or not. Also move duplicated cleanup code to a single place.
* | row0mysql.c, ha_innodb.cc:unknown2005-09-051-2/+3
| | | | | | | | | | | | | | | | | | | | Fix bug #12308 : do not roll back the whhole transaction in a lock wait timeout error, just roll back the latest SQL statement; note that the locks set in the latest SQL statements remain, as InnoDB does not know what locks were set in which SQL statement sql/ha_innodb.cc: Fix bug #12308 : do not roll back the whhole transaction in a lock wait timeout error, just roll back the latest SQL statement; note that the locks set in the latest SQL statements remain, as InnoDB does not know what locks were set in which SQL statement innobase/row/row0mysql.c: Fix bug #12308 : do not roll back the whhole transaction in a lock wait timeout error, just roll back the latest SQL statement; note that the locks set in the latest SQL statements remain, as InnoDB does not know what locks were set in which SQL statement
* | univ.i, page0page.ic:unknown2005-09-032-0/+17
| | | | | | | | | | | | | | | | | | | | Add a sanity check to page_rec_is_comp; a new univ.i macro UNIV_RELEASE_NOT_YET_STABLE controls such sanity checks that we will remove after the release is stable enough innobase/include/page0page.ic: Add a sanity check to page_rec_is_comp; a new univ.i macro UNIV_RELEASE_NOT_YET_STABLE controls such sanity checks that we will remove after the release is stable enough innobase/include/univ.i: Add a sanity check to page_rec_is_comp; a new univ.i macro UNIV_RELEASE_NOT_YET_STABLE controls such sanity checks that we will remove after the release is stable enough
* | row0sel.c:unknown2005-09-031-4/+3
| | | | | | | | | | | | | | | | Fix a wrong debug assert in the previous patch innobase/row/row0sel.c: Fix a wrong debug assert in the previous patch
* | row0sel.c:unknown2005-09-031-29/+49
| | | | | | | | | | | | | | | | Add more comments to row_search_for_mysql() and remove the ugly double use of the variable rec in that function innobase/row/row0sel.c: Add more comments to row_search_for_mysql() and remove the ugly double use of the variable rec in that function
* | row0sel.c:unknown2005-09-031-6/+12
| | | | | | | | | | | | | | | | Fix bug #12947 : a consistent read could return inconsistent results; this bug was introduced in 5.0.5 innobase/row/row0sel.c: Fix bug #12947 : a consistent read could return inconsistent results; this bug was introduced in 5.0.5
* | Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-08-251-6/+17
|\ \ | | | | | | | | | | | | | | | | | | into 127.(none):/home/osku/mysql-5.0-2
| * \ Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-08-191-6/+17
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | into 127.(none):/home/osku/mysql-5.0-2
| | * | Fix bug #12588, InnoDB's deadlock detector running out of stack space.unknown2005-08-171-6/+17
| | | | | | | | | | | | | | | | | | | | innobase/lock/lock0lock.c: Limit recursion depth in lock_deadlock_recursive to 200.
* | | | Merge mysql.com:/home/emurphy/src/bk-clean/mysql-4.1unknown2005-08-191-1/+2
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/emurphy/src/work/mysql-5.0 BitKeeper/deleted/.del-ctype-cp932.c: Auto merged BitKeeper/deleted/.del-ctype_cp932.result: Auto merged BitKeeper/deleted/.del-ctype_cp932.test: Auto merged include/m_ctype.h: Auto merged include/my_sys.h: Auto merged innobase/srv/srv0start.c: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysys/charset.c: Auto merged netware/BUILD/nwbootstrap: Auto merged sql/item.h: Auto merged sql/log_event.cc: Auto merged sql/log_event.h: Auto merged sql/sql_prepare.cc: Auto merged strings/ctype-big5.c: Auto merged strings/ctype-bin.c: Auto merged strings/ctype-czech.c: Auto merged strings/ctype-euc_kr.c: Auto merged strings/ctype-extra.c: Auto merged strings/ctype-gb2312.c: Auto merged strings/ctype-gbk.c: Auto merged strings/ctype-latin1.c: Auto merged strings/ctype-sjis.c: Auto merged strings/ctype-tis620.c: Auto merged strings/ctype-uca.c: Auto merged strings/ctype-ucs2.c: Auto merged strings/ctype-ujis.c: Auto merged strings/ctype-utf8.c: Auto merged strings/ctype-win1250ch.c: Auto merged configure.in: Manual merge from 4.1 include/config-netware.h: Manual merge from 4.1 sql/item.cc: Manual merge from 4.1 sql/mysqld.cc: Manual merge from 4.1
| * | | 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.
* | | | btr0sea.c:unknown2005-08-191-0/+7
| |/ / |/| | | | | | | | | | | | | | | | | | | | Add diagnostic code to track a crash in adaptive hash indexes; the crash may happen if block->index == NULL innobase/btr/btr0sea.c: Add diagnostic code to track a crash in adaptive hash indexes; the crash may happen if block->index == NULL
* | | row0sel.c:unknown2005-08-191-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Temporarily remove error print if MySQL tries to do a SELECT even though trx->n_mysql_tables_in_use is 0. We must return the error print when the lock count of cursors is properly implemented (Bug #12456) innobase/row/row0sel.c: Temporarily remove error print if MySQL tries to do a SELECT even though trx->n_mysql_tables_in_use is 0. We must return the error print when the lock count of cursors is properly implemented (Bug #12456)
* | | Allow consistent cursor view see changes made by creating transaction.unknown2005-08-181-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | This is quick fix and needs to be fixed when semi-consistent high-granularity read view is implemented (Bug #12456).
* | | univ.i:unknown2005-08-171-1/+1
| |/ |/| | | | | | | | | | | | | Do not use __builtin_expect etc. with the Intel ICC compiler, as the compiler crashed in btr0cur.c; the patch was submitted by Axel Schwenke (Bug #11510) innobase/include/univ.i: Do not use __builtin_expect etc. with the Intel ICC compiler, as the compiler crashed in btr0cur.c; the patch was submitted by Axel Schwenke (Bug #11510)
* | Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-08-129-31/+37
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into 127.(none):/home/osku/mysql-5.0 innobase/srv/srv0srv.c: Auto merged sql/ha_innodb.cc: Auto merged
| * | InnoDB: Print more than 300 characters of queries in various error conditions,unknown2005-08-129-31/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | most notably deadlocked ones in SHOW INNODB STATUS. Fixes bug #7819. innobase/btr/btr0pcur.c: Adapt to changes in trx_print. innobase/include/trx0trx.h: Add max_query_len parameter to trx_print. innobase/lock/lock0lock.c: Adapt to changes in trx_print. innobase/row/row0ins.c: Adapt to changes in trx_print. innobase/row/row0sel.c: Adapt to changes in trx_print. innobase/row/row0umod.c: Adapt to changes in trx_print. innobase/row/row0upd.c: Adapt to changes in trx_print. innobase/srv/srv0srv.c: Adapt to changes in trx_print. innobase/trx/trx0trx.c: Add max_query_len parameter to trx_print. sql/ha_innodb.cc: Add max_query_len parameter to innobase_mysql_print_thd.
* | | set_var.cc, mysqld.cc, ha_innodb.h, ha_innodb.cc, srv0srv.c, srv0srv.h:unknown2005-08-112-0/+2
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added innodb_commit_concurrency variable innobase/include/srv0srv.h: Added innodb_commit_concurrency variable innobase/srv/srv0srv.c: Added innodb_commit_concurrency variable sql/ha_innodb.cc: Added innodb_commit_concurrency variable sql/ha_innodb.h: Added innodb_commit_concurrency variable sql/mysqld.cc: Added innodb_commit_concurrency variable sql/set_var.cc: Added innodb_commit_concurrency variable
* | A fix and a test case for Bug#12243 "MySQL Server crashes with 2 unknown2005-08-103-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cursors (+ commit)" and Bug#11832 "Server crash with InnoDB + Cursors" See comments to the changed files. innobase/include/read0read.h: - add cursor_view_t::n_mysql_tables_in_use innobase/read/read0read.c: - maintain cursor_view_t::n_mysql_tables_in_use. InnoDB maintains trx->n_mysql_tables_in_use to know when it can auto-commit a read-only statement. When this count drops to zero, MySQL has ended processing of such statement and InnoDB can commit. Cursors should not break this invariant, and should exclude the tables used in a cursor from the count of active tables. When a cursor is closed, the number of its tables is added back, to ensure that close_thread_tables->unlock_external-> ha_innobase::external_lock(F_UNLCK) won't drop the count in trx below zero. innobase/row/row0sel.c: - remove the restoration of the global read view from row_search_for_mysql: MySQL may call row_search_for_mysql more than once when fetching a row for a cursor (e.g. if there is a WHERE clause that filters out some rows). sql/ha_innodb.cc: - add more verbose printout for the case when we close an InnoDB connection without priorlly issuing a commit or rollback. The problem should be investigated. tests/mysql_client_test.c: - add a test case for Bug#12243 "MySQL Server crashes with 2 cursors (+ commit)"
* | Merge hundin.mysql.fi:/home/heikki/mysql-4.1unknown2005-08-031-0/+9
|\ \ | |/ | | | | | | | | | | | | | | | | into hundin.mysql.fi:/home/heikki/mysql-5.0 innobase/buf/buf0buf.c: Auto merged sql/ha_innodb.cc: Auto merged
| * 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
* | Many files:unknown2005-08-037-32/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Push the patch of Jan Lindstrom: better comments ha_innodb.cc: Partial fix for Bug #12263 : we let InnoDB always to perform a rollback on the trx object if MySQL closes a connection; but we do print a warning to the .err log if an InnoDB transaction was active; we may remove that print later, since the situation really is not a bug; MySQL just is not aware that some cursor operation started an InnoDB transaction sql/ha_innodb.cc: Partial fix for Bug #12263 : we let InnoDB always to perform a rollback on the trx object if MySQL closes a connection; but we do print a warning to the .err log if an InnoDB transaction was active; we may remove that print later, since the situation really is not a bug; MySQL just is not aware that some cursor operation started an InnoDB transaction sql/ha_innodb.h: Push the patch of Jan Lindstrom: better comments innobase/trx/trx0trx.c: Push the patch of Jan Lindstrom: better comments innobase/srv/srv0srv.c: Push the patch of Jan Lindstrom: better comments innobase/srv/srv0start.c: Push the patch of Jan Lindstrom: better comments innobase/row/row0sel.c: Push the patch of Jan Lindstrom: better comments innobase/read/read0read.c: Push the patch of Jan Lindstrom: better comments innobase/include/read0read.h: Push the patch of Jan Lindstrom: better comments innobase/include/trx0trx.h: Push the patch of Jan Lindstrom: better comments
* | row0sel.c:unknown2005-07-281-2/+2
| | | | | | | | | | | | | | | | | | | | row_sel_store_mysql_rec(): Make comment about space padding more accurate. innobase/row/row0sel.c: row_sel_store_mysql_rec(): Make comment about space padding more accurate.
* | row_sel_store_mysql_rec(): Convert NULL true VARCHAR columnsunknown2005-07-281-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | correctly. innobase/row/row0sel.c: Initialize NULL true VARCHAR columns with NUL bytes, as that is what the columns will contain in handler::write_row(). (Bug #12186) mysql-test/r/innodb.result: Update table checksums to reflect the new handling of true VARCHAR columns that are NULL.
* | Merge hundin.mysql.fi:/home/marko/mysql-4.1unknown2005-07-263-1/+18
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | into hundin.mysql.fi:/home/marko/mysql-5.0 innobase/include/os0file.h: Automerge and manual fix innobase/os/os0file.c: Automerged innobase/trx/trx0sys.c: Automerged
| * 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
View Lorry Controller Status