summaryrefslogtreecommitdiff
path: root/innobase
Commit message (Collapse)AuthorAgeFilesLines
* row0sel.c:unknown2002-12-031-2/+10
| | | | | | | | Fix a hang introduced in 4.0.5 in INSERT INTO ... SELECT ... when binlogging is not on innobase/row/row0sel.c: Fix a hang introduced in 4.0.5 in INSERT INTO ... SELECT ... when binlogging is not on
* ut0mem.c:unknown2002-11-221-0/+6
| | | | | | | | Flush stderr if we run out of memory, so that the error message more probably finds its way to the error log innobase/ut/ut0mem.c: Flush stderr if we run out of memory, so that the error message more probably finds its way to the error log
* row0mysql.c, row0mysql.h, ha_innodb.cc, sql_table.cc, handler.h:unknown2002-11-192-0/+6
| | | | | | | | | | | | | | | | Fix crash when InnoDB temp table is truncated + fix bug: do not X-lock rows under LOCK TABLES except if the table is temp sql/handler.h: Fix crash when InnoDB temp table is truncated + fix bug: do not X-lock rows under LOCK TABLES except if the table is temp sql/sql_table.cc: Fix crash when InnoDB temp table is truncated + fix bug: do not X-lock rows under LOCK TABLES except if the table is temp sql/ha_innodb.cc: Fix crash when InnoDB temp table is truncated + fix bug: do not X-lock rows under LOCK TABLES except if the table is temp innobase/include/row0mysql.h: Fix crash when InnoDB temp table is truncated + fix bug: do not X-lock rows under LOCK TABLES except if the table is temp innobase/row/row0mysql.c: Fix crash when InnoDB temp table is truncated + fix bug: do not X-lock rows under LOCK TABLES except if the table is temp
* srv0start.c:unknown2002-11-161-0/+16
| | | | | | | | Print an error message if someone tries to call InnoDB startip more than once during process lifetime innobase/srv/srv0start.c: Print an error message if someone tries to call InnoDB startip more than once during process lifetime
* row0sel.c:unknown2002-11-131-8/+5
| | | | | | | | Fix bug: if a unique search from a primary key matched to a delete-marked row, it could return the NEXT row innobase/row/row0sel.c: Fix bug: if a unique search from a primary key matched to a delete-marked row, it could return the NEXT row
* dict0load.c:unknown2002-11-132-1/+2
| | | | | | | | | | | | Fix wrong sprintf argument row0sel.c: Fix uninitialized variable error found by Miguel innobase/row/row0sel.c: Fix uninitialized variable error found by Miguel innobase/dict/dict0load.c: Fix wrong sprintf argument
* Merge work:/my/mysql-4.0 into hundin.mysql.fi:/my/mysql-4.0unknown2002-11-101-2/+2
|\
| * Added 4.1 protocol descriptionunknown2002-11-101-2/+2
| | | | | | | | | | innobase/log/log0log.c: Removed compiler warnings
* | Many files:unknown2002-11-097-71/+241
|/ | | | | | | | | | | | | | | | | | | | Try to skip over corrupt records in SELECT if innodb_force_recovery > 0; print more page hex dumps in CHECK TABLE innobase/include/btr0btr.h: Try to skip over corrupt records in SELECT if innodb_force_recovery > 0; print more page hex dumps in CHECK TABLE innobase/include/btr0pcur.h: Try to skip over corrupt records in SELECT if innodb_force_recovery > 0; print more page hex dumps in CHECK TABLE innobase/include/db0err.h: Try to skip over corrupt records in SELECT if innodb_force_recovery > 0; print more page hex dumps in CHECK TABLE innobase/include/btr0pcur.ic: Try to skip over corrupt records in SELECT if innodb_force_recovery > 0; print more page hex dumps in CHECK TABLE innobase/btr/btr0btr.c: Try to skip over corrupt records in SELECT if innodb_force_recovery > 0; print more page hex dumps in CHECK TABLE innobase/page/page0page.c: Try to skip over corrupt records in SELECT if innodb_force_recovery > 0; print more page hex dumps in CHECK TABLE innobase/row/row0sel.c: Try to skip over corrupt records in SELECT if innodb_force_recovery > 0; print more page hex dumps in CHECK TABLE
* Delete: innobase/stamp-h.inunknown2002-11-081-1/+0
|
* log0recv.c:unknown2002-11-081-5/+7
| | | | | | | | Removed compiler warnings about wrong printf formats innobase/log/log0recv.c: Removed compiler warnings about wrong printf formats
* btr0btr.c, buf0buf.c:unknown2002-11-072-5/+13
| | | | | | | | | | Fix a glitch: under heavy ibuf activity InnoDB could print the whole contents of ibuf tree to the error log innobase/buf/buf0buf.c: Fix a glitch: under heavy ibuf activity InnoDB could print the whole contents of ibuf tree to the error log innobase/btr/btr0btr.c: Fix a glitch: under heavy ibuf activity InnoDB could print the whole contents of ibuf tree to the error log
* Many files:unknown2002-11-0710-24/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix hang introduced by selective deadlock resolution srv0srv.c, row0mysql.c: Fix hang introduced by selective deadlock resolution + corruption caused by lock timeout or sel deadl res in ON DELETE CASCADE innobase/include/que0que.h: Fix hang introduced by selective deadlock resolution innobase/include/trx0trx.h: Fix hang introduced by selective deadlock resolution innobase/include/ut0ut.h: Fix hang introduced by selective deadlock resolution innobase/lock/lock0lock.c: Fix hang introduced by selective deadlock resolution innobase/log/log0log.c: Fix hang introduced by selective deadlock resolution innobase/que/que0que.c: Fix hang introduced by selective deadlock resolution innobase/row/row0mysql.c: Fix hang introduced by selective deadlock resolution + corruption caused by lock timeout or sel deadl res in ON DELETE CASCADE innobase/srv/srv0srv.c: Fix hang introduced by selective deadlock resolution + corruption caused by lock timeout or sel deadl res in ON DELETE CASCADE innobase/trx/trx0sys.c: Fix hang introduced by selective deadlock resolution innobase/trx/trx0trx.c: Fix hang introduced by selective deadlock resolution
* mergeunknown2002-11-074-4/+5
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | configure.in: Auto merged sql/field.cc: Auto merged sql/ha_innodb.cc: Auto merged sql/item_func.cc: Auto merged sql/log.cc: Auto merged sql/mysqld.cc: Auto merged sql/slave.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_update.cc: Auto merged
| * Portability fixes for Fortre C++ 5.0 (on Sun) in 32 and 64 bit modes.unknown2002-11-074-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client/mysqlbinlog.cc: Portability fix configure.in: Added use of ASFLAGS (For Solaris with Forte 5.0) include/my_global.h: Portability fix include/myisam.h: Portability fix include/queues.h: Portability fix innobase/include/ut0ut.h: Portability fix innobase/log/log0log.c: Portability fix innobase/rem/rem0cmp.c: Portability fix innobase/trx/trx0sys.c: Portability fix isam/pack_isam.c: Portability fix myisam/ft_boolean_search.c: Portability fix myisam/mi_dynrec.c: Code change to go around bug in Forte 5.0 myisam/sort.c: Portability fix mysys/my_aes.c: Portability fix scripts/Makefile.am: Support for ASFLAGS scripts/mysqlbug.sh: Support for ASFLAGS sql/field.cc: Portability fix sql/filesort.cc: Portability fix sql/gen_lex_hash.cc: Portability fix sql/ha_innodb.cc: Portability fix Changed SHOW INNODB STATUS to return error instead of writing message to log file. sql/ha_isammrg.cc: Portability fix sql/ha_myisam.cc: Portability fix sql/ha_myisammrg.cc: Portability fix sql/hash_filo.h: Portability fix sql/hostname.cc: Portability fix sql/item_cmpfunc.h: Indentation change sql/item_func.cc: Portability fix sql/item_func.h: Portability fix sql/log.cc: Portability fix sql/log_event.cc: Portability fix sql/mysql_priv.h: Portability fix sql/mysqld.cc: Portability fix Fixed bug with rpl_recovery_rank command line option on 64 bit systems sql/opt_range.cc: Portability fix sql/repl_failsafe.cc: Portability fix sql/slave.cc: Portability fix sql/slave.h: Portability fix sql/sql_acl.cc: Portability fix sql/sql_base.cc: Portability fix sql/sql_cache.cc: Portability fix sql/sql_cache.h: Portability fix sql/sql_class.cc: Portability fix sql/sql_delete.cc: Portability fix sql/sql_insert.cc: Portability fix sql/sql_manager.cc: Portability fix sql/sql_parse.cc: Portability fix BUILD/compile-solaris-sparc-forte: C sql/sql_udf.cc: Portability fix sql/sql_update.cc: Portability fix strings/Makefile.am: Portability fix strings/bmove_upp-sparc.s: Fix so that this works on 32 and 64 bit sparcs strings/str_test.c: Cleanup strings/strappend-sparc.s: Fix so that this works on 32 and 64 bit sparcs strings/strend-sparc.s: Fix so that this works on 32 and 64 bit sparcs strings/strmake-sparc.s: Fix so that this works on 32 and 64 bit sparcs strings/strmov-sparc.s: Fix so that this works on 32 and 64 bit sparcs strings/strnmov-sparc.s: Fix so that this works on 32 and 64 bit sparcs strings/strstr-sparc.s: Fix so that this works on 32 and 64 bit sparcs strings/strxmov-sparc.s: Fixes to make this more portable, but it's still not usable on 64 bit systems :( BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | Many files:unknown2002-11-0618-176/+444
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock sql/ha_innodb.cc: Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock innobase/dict/dict0crea.c: Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock innobase/dict/dict0dict.c: Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock innobase/include/log0recv.h: Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock innobase/include/row0mysql.h: Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock innobase/include/srv0srv.h: Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock innobase/include/trx0trx.h: Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock innobase/log/log0recv.c: Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock innobase/os/os0sync.c: Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock innobase/os/os0thread.c: Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock innobase/row/row0ins.c: Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock innobase/row/row0mysql.c: Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock innobase/row/row0purge.c: Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock innobase/row/row0undo.c: Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock innobase/row/row0upd.c: Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock innobase/srv/srv0srv.c: Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock innobase/srv/srv0start.c: Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock innobase/trx/trx0roll.c: Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock innobase/trx/trx0trx.c: Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock
* srv0start.h, srv0start.c, ha_innodb.cc:unknown2002-10-312-0/+13
| | | | | | | | | | | | Add check that sizeof(trx_t) is the same in ha_inndob.cc and InnoDB compilation modules sql/ha_innodb.cc: Add check that sizeof(trx_t) is the same in ha_inndob.cc and InnoDB compilation modules innobase/srv/srv0start.c: Add check that sizeof(trx_t) is the same in ha_inndob.cc and InnoDB compilation modules innobase/include/srv0start.h: Add check that sizeof(trx_t) is the same in ha_inndob.cc and InnoDB compilation modules
* row0undo.c:unknown2002-10-301-3/+14
| | | | | | | | Partial fix to a hang introduced in CREATE TABLE in the push last night innobase/row/row0undo.c: Partial fix to a hang introduced in CREATE TABLE in the push last night
* lexyy.c:unknown2002-10-301-0/+3
| | | | | | | | Update instructions about editing the files generated by flex and bison innobase/pars/lexyy.c: Update instructions about editing the files generated by flex and bison
* configure.in:unknown2002-10-291-0/+2
| | | | | | | | In Linux do not printb thread id's but process no's in SHOW INNODB STATUS innobase/configure.in: In Linux do not printb thread id's but process no's in SHOW INNODB STATUS
* Many files:unknown2002-10-2948-557/+1505
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution mysqld.cc: Change MySQL default isolation level to REPEATABLE READ; note that InnoDB has always had that default, and BDB and MyISAM always run at SERIALIZABLE level anyway sql/mysqld.cc: Change MySQL default isolation level to REPEATABLE READ; note that InnoDB has always had that default, and BDB and MyISAM always run at SERIALIZABLE level anyway sql/ha_innodb.cc: Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution sql/ha_innodb.h: Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution innobase/include/buf0buf.h: Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution innobase/include/dict0dict.h: Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution innobase/include/fil0fil.h: Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution innobase/include/lock0lock.h: Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution innobase/include/os0file.h: Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution innobase/include/os0proc.h: Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution innobase/include/os0thread.h: Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution innobase/include/page0cur.h: Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution innobase/include/page0page.h: Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution innobase/include/read0read.h: Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution innobase/include/rem0rec.h: Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution innobase/include/srv0srv.h: Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution innobase/include/sync0rw.h: Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution innobase/include/sync0sync.h: Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution innobase/include/trx0purge.h: Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution innobase/include/trx0trx.h: Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution innobase/include/rem0rec.ic: Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution innobase/btr/btr0btr.c: Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution innobase/btr/btr0cur.c: Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution innobase/btr/btr0pcur.c: Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution innobase/buf/buf0buf.c: Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution innobase/buf/buf0flu.c: Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution innobase/dict/dict0dict.c: Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution innobase/fil/fil0fil.c: Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution innobase/fsp/fsp0fsp.c: Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution innobase/ibuf/ibuf0ibuf.c: Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution innobase/lock/lock0lock.c: Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution innobase/mem/mem0dbg.c: Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution innobase/os/os0file.c: Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution innobase/os/os0proc.c: Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution innobase/page/page0cur.c: Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution innobase/page/page0page.c: Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution innobase/pars/lexyy.c: Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution innobase/pars/pars0grm.c: Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution innobase/read/read0read.c: Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution innobase/row/row0ins.c: Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution innobase/row/row0mysql.c: Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution innobase/row/row0purge.c: Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution innobase/row/row0sel.c: Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution innobase/row/row0uins.c: Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution innobase/row/row0undo.c: Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution innobase/row/row0upd.c: Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution innobase/srv/srv0srv.c: Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution innobase/srv/srv0start.c: Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution innobase/sync/sync0rw.c: Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution innobase/sync/sync0sync.c: Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution innobase/trx/trx0purge.c: Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution innobase/trx/trx0trx.c: Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution
* mergedunknown2002-10-252-1/+10
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/gone: auto-union BitKeeper/etc/logging_ok: auto-union BitKeeper/deleted/.del-skipkeys~53ffbfa7d2fa9fb: Delete: BitKeeper/etc/skipkeys BitKeeper/etc/skipkeys: Rename: BitKeeper/deleted/.del-skipkeys~f623848ba4db5c3 -> BitKeeper/etc/skipkeys Build-tools/Do-compile: Auto merged Docs/manual.texi: Auto merged innobase/pars/lexyy.c: Auto merged innobase/pars/pars0grm.c: Auto merged mysys/my_init.c: Auto merged scripts/mysqlhotcopy.sh: Auto merged sql/nt_servc.cc: Auto merged sql/nt_servc.h: Auto merged sql/sql_base.cc: Auto merged sql/sql_table.cc: Auto merged mysql-test/t/bdb-crash.test: Auto merged
| * lexyy.c, pars0grm.c:unknown2002-10-252-3/+10
| | | | | | | | | | | | | | | | | | | | Include univ.i before any system headers to remove a large file compilation failure on AIX innobase/pars/pars0grm.c: Include univ.i before any system headers to remove a large file compilation failure on AIX innobase/pars/lexyy.c: Include univ.i before any system headers to remove a large file compilation failure on AIX
* | Merge with 3.23.54unknown2002-10-166-12/+100
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union BitKeeper/deleted/.del-LICENSE~4cfaff8de837acb8: Auto merged BitKeeper/deleted/.del-MySQLEULA.txt: Delete: Docs/MySQLEULA.txt BitKeeper/deleted/.del-global.h~e80d28157acfdcb5: Auto merged Build-tools/mysql-copyright-2: Auto merged Build-tools/mysql-copyright: Auto merged heap/heapdef.h: Auto merged heap/hp_open.c: Auto merged innobase/btr/btr0cur.c: Auto merged innobase/lock/lock0lock.c: Auto merged innobase/os/os0file.c: Auto merged innobase/os/os0thread.c: Auto merged myisam/mi_open.c: Auto merged mysql-test/Makefile.am: Auto merged mysql-test/t/null_key.test: Auto merged mysys/safemalloc.c: Auto merged scripts/make_binary_distribution.sh: Auto merged scripts/mysqld_safe.sh: Auto merged scripts/mysqlhotcopy.sh: Auto merged sql/field.h: Auto merged sql/field_conv.cc: Auto merged sql/ha_innodb.h: Auto merged sql/item.cc: Auto merged sql/sql_db.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged sql/table.cc: Auto merged tests/grant.res: Auto merged Build-tools/Do-compile: merge Docs/manual.texi: merge configure.in: merge mysql-test/r/distinct.result: merge mysql-test/r/null_key.result: merge sql/ha_innodb.cc: merge sql/item.h: merge sql/log.cc: merge sql/mysqld.cc: merge support-files/mysql.spec.sh: merge
| * btr0cur.c:unknown2002-10-161-1/+1
| | | | | | | | | | | | | | | | Fix typo in earlier commit innobase/btr/btr0cur.c: Fix typo in earlier commit
| * btr0cur.c:unknown2002-10-161-8/+36
| | | | | | | | | | | | | | | | Fix bug: range estimator exaggerated small range size greatly if the paths in the B-tree happened to branch on a high level innobase/btr/btr0cur.c: Fix bug: range estimator exaggerated small range size greatly if the paths in the B-tree happened to branch on a high level
| * os0thread.c:unknown2002-10-111-2/+2
| | | | | | | | | | | | | | | | Fix compilation error on HP-UX-11: pthread_t is a scalar there, not a struct like in HP-UX-10.20 innobase/os/os0thread.c: Fix compilation error on HP-UX-11: pthread_t is a scalar there, not a struct like in HP-UX-10.20
| * os0file.c:unknown2002-10-061-0/+2
| | | | | | | | | | | | | | | | SHOW INNODB STATUS always showed average bytes read as 0 in Unix innobase/os/os0file.c: SHOW INNODB STATUS always showed average bytes read as 0 in Unix
| * btr0cur.c:unknown2002-10-052-3/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not let range estimator to return over 1 / 2 of total rows in table; use longlong in range estimation btr0cur.h, ha_innobase.cc: Use longlong in range estimation, in case there are > 4 billion rows sql/ha_innobase.cc: Use longlong in range estimation, in case there are > 4 billion rows innobase/include/btr0cur.h: Use longlong in range estimation, in case there are > 4 billion rows innobase/btr/btr0cur.c: Do not let range estimator to return over 1 / 2 of total rows in table; use longlong in range estimation
| * lock0lock.c:unknown2002-10-031-0/+20
| | | | | | | | | | | | | | | | Fix bug: if SHOW INNODB STATUS or innodb_monitor printed several hundred transactions, the output was truncated and we forgot to release the kernel mutex innobase/lock/lock0lock.c: Fix bug: if SHOW INNODB STATUS or innodb_monitor printed several hundred transactions, the output was truncated and we forgot to release the kernel mutex
| * os0thread.h:unknown2002-10-031-0/+9
| | | | | | | | | | | | | | | | Fix the probable reason why InnoDB versions after July 2, 2002 did not start properly in some Win 95/98/ME computers innobase/include/os0thread.h: Fix the probable reason why InnoDB versions after July 2, 2002 did not start properly in some Win 95/98/ME computers
| * lock0lock.c:unknown2002-10-011-0/+13
| | | | | | | | | | | | | | | | Fix bug: the AUTO-INC lock was held to the end of trx if it was granted after a lock wait innobase/lock/lock0lock.c: Fix bug: the AUTO-INC lock was held to the end of trx if it was granted after a lock wait
* | row0ins.c, ha_innodb.cc:unknown2002-09-221-4/+6
| | | | | | | | | | | | | | | | | | | | Table hash key len in query cache also includes null char at end sql/ha_innodb.cc: Table hash key len in query cache also includes null char at end innobase/row/row0ins.c: Table hash key len in query cache also includes null char at end
* | dict0dict.c:unknown2002-09-211-6/+26
| | | | | | | | | | | | | | | | Fix a crash introduced when we grew foreign key comment to 16000 chars innobase/dict/dict0dict.c: Fix a crash introduced when we grew foreign key comment to 16000 chars
* | srv0srv.c:unknown2002-09-201-2/+2
| | | | | | | | | | | | | | | | Fix typo innobase/srv/srv0srv.c: Fix typo
* | srv0srv.h, srv0srv.c, row0mysql.c:unknown2002-09-203-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Put back a change unintentionally removed in the last 2 pushes innobase/row/row0mysql.c: Put back a change unintentionally removed in the last 2 pushes innobase/srv/srv0srv.c: Put back a change unintentionally removed in the last 2 pushes innobase/include/srv0srv.h: Put back a change unintentionally removed in the last 2 pushes
* | trx0trx.ic, trx0trx.h, srv0srv.h, row0sel.h, dict0mem.h:unknown2002-09-205-1/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modifications for query cache + trxs, fix of q.c.+ foreign keys innobase/include/dict0mem.h: Modifications for query cache + trxs, fix of q.c.+ foreign keys innobase/include/row0sel.h: Modifications for query cache + trxs, fix of q.c.+ foreign keys innobase/include/srv0srv.h: Modifications for query cache + trxs, fix of q.c.+ foreign keys innobase/include/trx0trx.h: Modifications for query cache + trxs, fix of q.c.+ foreign keys innobase/include/trx0trx.ic: Modifications for query cache + trxs, fix of q.c.+ foreign keys
* | Many files:unknown2002-09-207-31/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modifications for query cache + trxs, fix of q.c.+ foreign keys os0file.c: Use unbuffered i/o in Windows innobase/dict/dict0mem.c: Modifications for query cache + trxs, fix of q.c.+ foreign keys innobase/os/os0file.c: Use unbuffered i/o in Windows innobase/lock/lock0lock.c: Modifications for query cache + trxs, fix of q.c.+ foreign keys innobase/row/row0ins.c: Modifications for query cache + trxs, fix of q.c.+ foreign keys innobase/row/row0mysql.c: Modifications for query cache + trxs, fix of q.c.+ foreign keys innobase/row/row0sel.c: Modifications for query cache + trxs, fix of q.c.+ foreign keys innobase/srv/srv0srv.c: Modifications for query cache + trxs, fix of q.c.+ foreign keys sql/ha_innodb.h: Modifications for query cache + trxs, fix of q.c.+ foreign keys sql/ha_innodb.cc: Modifications for query cache + trxs, fix of q.c.+ foreign keys
* | Merge with 3.23.53unknown2002-09-174-10/+30
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs/manual.texi: Auto merged innobase/include/srv0srv.h: Auto merged innobase/os/os0file.c: Auto merged innobase/row/row0mysql.c: Auto merged innobase/srv/srv0srv.c: Auto merged sql/sql_table.cc: Auto merged sql/filesort.cc: merge
| * row0mysql.c:unknown2002-09-131-2/+2
| | | | | | | | | | | | | | | | Fix typos in previous push innobase/row/row0mysql.c: Fix typos in previous push
| * row0mysql.c:unknown2002-09-131-2/+13
| | | | | | | | | | | | | | | | Allow CREATE TABLE and DROP TABLE even if innodb_force_recovery is used, the user can drop a problematic table innobase/row/row0mysql.c: Allow CREATE TABLE and DROP TABLE even if innodb_force_recovery is used, the user can drop a problematic table
| * srv0srv.c, srv0srv.h:unknown2002-09-113-8/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change srv_flush_log_at_trx_commit to ulint, note that ibool is defined as ulint, so this is purely formal change os0file.c: Start using unbuffered i/o again in Windows because sequential read using normal i/o was 4 times slower in XP innobase/os/os0file.c: Start using unbuffered i/o again in Windows because sequential read using normal i/o was 4 times slower in XP innobase/include/srv0srv.h: Change srv_flush_log_at_trx_commit to ulint, note that ibool is defined as ulint, so this is purely formal change innobase/srv/srv0srv.c: Change srv_flush_log_at_trx_commit to ulint, note that ibool is defined as ulint, so this is purely formal change
* | Merge with 3.23.53unknown2002-09-116-7/+48
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Build-tools/Do-compile: Auto merged innobase/btr/btr0cur.c: Auto merged innobase/os/os0file.c: Auto merged innobase/srv/srv0srv.c: Auto merged innobase/sync/sync0arr.c: Auto merged innobase/trx/trx0undo.c: Auto merged sql/ha_innodb.h: Auto merged Docs/manual.texi: merge sql/ha_innodb.cc: merge sql/mysqld.cc: merge
| * os0file.c:unknown2002-09-101-1/+1
| | | | | | | | | | | | | | | | Fix a typo: should be buf_page_print innobase/os/os0file.c: Fix a typo: should be buf_page_print
| * trx0undo.c:unknown2002-09-091-3/+4
| | | | | | | | | | | | | | | | Remove an assertion in trx0undo.c which could erroneously fail when we ran out of tablespace innobase/trx/trx0undo.c: Remove an assertion in trx0undo.c which could erroneously fail when we ran out of tablespace
| * sync0arr.c:unknown2002-09-081-1/+1
| | | | | | | | | | | | | | | | Increase max latch wait time to 600 seconds before we assert innobase/sync/sync0arr.c: Increase max latch wait time to 600 seconds before we assert
| * btr0cur.c:unknown2002-09-081-0/+25
| | | | | | | | | | | | | | | | Remove long latch hold which happened if we scanned long an index without finding any record visible to the current consistent read innobase/btr/btr0cur.c: Remove long latch hold which happened if we scanned long an index without finding any record visible to the current consistent read
| * os0sync.c:unknown2002-09-081-0/+6
| | | | | | | | | | | | | | | | Add diagnostics to track why a semaphore creation failed on Windows ME innobase/os/os0sync.c: Add diagnostics to track why a semaphore creation failed on Windows ME
| * srv0srv.c:unknown2002-09-071-2/+11
| | | | | | | | | | | | | | | | The option (= default) innodb_fast_shutdown did not always make the shutdown quickly, fix that innobase/srv/srv0srv.c: The option (= default) innodb_fast_shutdown did not always make the shutdown quickly, fix that
* | Portability fixes.unknown2002-09-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve mysql-test to be more robust. Fix that GRANT doesn't delete SSL options Change innobase_flush_log_at_trx_commit to uint. Don't rotate logs if we read a rotate log entry from the master. Docs/manual.texi: Changelog client/mysqlbinlog.cc: Handle empty binlogfiles gracefully client/mysqltest.c: Do a sleep after 'sync_with_master' Cleaned up sleep() handling. Free all memory on exit configure.in: Fix for Mac OS 10.2 include/my_sys.h: Added my_strdup_with_length() innobase/btr/btr0cur.c: Fixed wrong printf() libmysql/libmysql.c: Added DBUG_PRINT statements. Assume that mysql_...send() functions has correct query length. mysql-test/mysql-test-run.sh: Properly remove log files before starting new tests. mysql-test/r/grant.result: Update for new test results mysql-test/r/innodb.result: Update for new test results mysql-test/r/myisam.result: Update for new test results mysql-test/r/rpl_log.result: Update for new test results mysql-test/r/rpl_rotate_logs.result: Update for new test results mysql-test/r/variables.result: Update for new test results mysql-test/t/grant.test: Test that GRANT doesn't delete SSL options mysql-test/t/myisam.test: Test long key usage mysql-test/t/rpl_log.test: Disable 'show new master' mysql-test/t/rpl_mystery22.test: Longer sleep for more safety. mysql-test/t/rpl_rotate_logs.test: More comments mysys/my_malloc.c: Added my_strdup_with_length() mysys/safemalloc.c: Added my_strdup_with_length() mysys/thr_alarm.c: Fix of alarms for windows. sql/ha_innodb.cc: Change innobase_flush_log_at_trx_commit to uint mysql-test/r/rpl_redirect.result: Updated test results mysql-test/t/rpl_redirect.test: Added more tests to improve code coverage. sql/ha_innodb.h: Change innobase_flush_log_at_trx_commit to uint sql/item_func.cc: Return GLOBAL and SESSION as part of column names sql/log.cc: Only write STOP events when server goes down. sql/log_event.cc: Don't rotate logs if we read a rotate log entry from the master. sql/log_event.h: Change ident_len to uint (more efficient) sql/mysqld.cc: Change innobase_flush_log_at_trx_commit to uint sql/net_serv.cc: More debug output sql/repl_failsafe.cc: More DEBUG Search until we find next position in binary log (and not only =) sql/slave.cc: More DBUG & comments Don't rotate the binary log on master flush logs sql/slave.h: indentation change sql/sql_acl.cc: Test that GRANT doesn't delete SSL options sql/sql_parse.cc: Disable show_new_master. sql/sql_repl.cc: Chamger show_binlog_events() to use my_error() sql/sql_table.cc: Fixed check for too long keys in MyISAM sql/sql_udf.cc: Fix udf handling
View Lorry Controller Status