Commit graph

454 commits

Author SHA1 Message Date
unknown
e3c7f4d85e A lot of portability fixes.
Added rename table for BDB. This fixes a bug in ALTER TABLE with BDB tables.


BUILD/SETUP.sh:
  Enabled uninitalized warnings for debug builds.
Build-tools/Do-compile:
  Added options --no-mysqltest and --no-benchmarks
  Log time before each stage
  Removed warnings on some OS (at least hpux11)
acinclude.m4:
  Fixed call to wrong function
configure.in:
  Don't use -O3 as compiler option with aCC
innobase/include/univ.i:
  Removed compiler warning (on Hpux11)
innobase/os/os0file.c:
  Removed compiler warning (on Hpux11)
innobase/trx/trx0sys.c:
  Removed compiler warning (on Hpux11)
innobase/trx/trx0trx.c:
  Removed compiler warning (on Hpux11)
innobase/ut/ut0ut.c:
  Removed compiler warning (with gcc)
myisam/mi_check.c:
  Added missing 'static'
myisam/mi_test1.c:
  Added missing 'static'
mysys/my_getopt.c:
  Added missing 'static'
sql/ha_berkeley.cc:
  Added rename table. This fixes a bug in ALTER TABLE with BDB tables.
  Fixed compilation problem on OSF1
sql/ha_berkeley.h:
  Added rename table. This fixes a bug in ALTER TABLE with BDB tables.
sql/mini_client.cc:
  Added reinterpret cast to avoid some warnings.
sql/sql_parse.cc:
  Added reinterpret cast to avoid some warnings.
  Removed usage of strnlen() as this gave portability problems.
sql/sql_union.cc:
  Added reinterpret cast to avoid some warnings.
sql/table.cc:
  Added reinterpret cast to avoid some warnings.
tools/mysqlmanager.c:
  Added missing 'static'
2003-01-05 20:18:49 +02:00
unknown
b69d8f4a6f Many files:
Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE
sql_select.cc:
  Remove superfluous prints to .err log when a locking SELECT fails to a deadlock or a lock wait timeout


sql/sql_select.cc:
  Remove superfluous prints to .err log when a locking SELECT fails to a deadlock or a lock wait timeout
innobase/btr/btr0sea.c:
  Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE
innobase/dict/dict0dict.c:
  Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE
innobase/fsp/fsp0fsp.c:
  Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE
innobase/ibuf/ibuf0ibuf.c:
  Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE
innobase/include/buf0buf.h:
  Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE
innobase/include/db0err.h:
  Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE
innobase/include/dict0mem.h:
  Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE
innobase/include/mem0mem.h:
  Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE
innobase/include/row0mysql.h:
  Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE
innobase/include/row0upd.h:
  Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE
innobase/include/mem0mem.ic:
  Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE
innobase/mem/mem0pool.c:
  Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE
innobase/row/row0ins.c:
  Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE
innobase/row/row0mysql.c:
  Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE
innobase/row/row0sel.c:
  Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE
innobase/row/row0upd.c:
  Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE
innobase/srv/srv0start.c:
  Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE
innobase/ut/ut0ut.c:
  Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE
2002-12-22 01:54:29 +02:00
unknown
62c7449a55 Merge with 3.23:
Remove duplicate casedn_str() in mysql_change_db()
Fix for null handling in CASE


innobase/btr/btr0sea.c:
  Auto merged
mysql-test/t/case.test:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
mysql-test/r/case.result:
  merge with 3.23
sql/sql_db.cc:
  Merge with 3.23 (to remove duplicate casedn_str())
2002-12-21 10:56:40 +02:00
unknown
35f6e920c5 btr0sea.c:
Remove an assertion which can fail in a race of 3 threads


innobase/btr/btr0sea.c:
  Remove an assertion which can fail in a race of 3 threads
2002-12-20 20:55:51 +02:00
unknown
e6783a8785 Removed compiler warnings
Fixed wrong variable name for Windows


VC++Files/innobase/innobase.dsp:
  Don't use precompiled headers (doesn't work with samba)
VC++Files/myisammrg/myisammrg.dsp:
  Add missing files
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
  Fixed included paths
VC++Files/mysqldemb/mysqldemb.dsp:
  Don't use precompiled headers (doesn't work with samba)
VC++Files/mysqlserver/mysqlserver.dsp:
  Don't use precompiled headers (doesn't work with samba)
VC++Files/sql/mysqld.dsp:
  Fixed paths
innobase/include/univ.i:
  Removed compiler warning
myisammrg/myrg_open.c:
  Removed compiler warning
sql/ha_myisam.cc:
  Removed compiler warning
  Fixed wrong (but not dangerous) if statement
sql/ha_myisammrg.cc:
  Removed compiler warning
sql/mysqld.cc:
  Fixed wrong variable name for Windows
sql/sql_update.cc:
  Removed not used label
2002-12-12 21:01:32 +02:00
unknown
934f5cc466 Ensure that BEGIN / COMMIT is handled properly if slave dies
Added syntax support for
CREATE TABLE foo (a char CHARACTER SET latin1) CHARSET=latin1;


Docs/internals.texi:
  Update binary protocol description
innobase/include/db0err.h:
  Merge from 3.23
mysql-test/r/insert.result:
  Updated test result from 3.23
sql/log.cc:
  Fixed bug in replication and log rotation
sql/log_event.cc:
  Ensure that BEGIN / COMMIT is handled properly if slave dies
sql/slave.cc:
  Fixed bug in replication and log rotation
sql/slave.h:
  Ensure that BEGIN / COMMIT is handled properly if slave dies
sql/sql_analyse.cc:
  Moved usage of res before res is destroyed (by bzero(&s...))
sql/sql_yacc.yy:
  Added syntax support for
  
  CREATE TABLE foo (a char CHARACTER SET latin1) CHARSET=latin1;
  
  To be able to read MySQL 4.1 dump files.
2002-12-11 15:46:39 +02:00
unknown
3c9b877b19 Merge with 3.23
innobase/dict/dict0dict.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
innobase/include/db0err.h:
  Skiped merge (Heikki wants to do this)
innobase/row/row0mysql.c:
  Skiped merge (Heikki wants to do this)
sql/sql_show.cc:
  Use local code
2002-12-11 13:32:31 +02:00
unknown
c92d611d54 row0mysql.c:
Heikki will merge to 4.0: cleanup


innobase/row/row0mysql.c:
  Heikki will merge to 4.0: cleanup
2002-12-05 22:09:51 +02:00
unknown
446f877906 row0mysql.c, dict0dict.c, db0err.h, ha_innobase.cc:
Heikki will merge to 4.0: Prevent listing the same column twice in an InnoDB index: that will cause index corruption when that col is UPDATEd


sql/ha_innobase.cc:
  Heikki will merge to 4.0: Prevent listing the same column twice in an InnoDB index: that will cause index corruption when that col is UPDATEd
innobase/include/db0err.h:
  Heikki will merge to 4.0: Prevent listing the same column twice in an InnoDB index: that will cause index corruption when that col is UPDATEd
innobase/dict/dict0dict.c:
  Heikki will merge to 4.0: Prevent listing the same column twice in an InnoDB index: that will cause index corruption when that col is UPDATEd
innobase/row/row0mysql.c:
  Heikki will merge to 4.0: Prevent listing the same column twice in an InnoDB index: that will cause index corruption when that col is UPDATEd
2002-12-05 22:03:24 +02:00
unknown
9b515ad043 row0sel.c:
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
2002-12-03 18:16:48 +02:00
unknown
fa76afe6ed ut0mem.c:
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
2002-11-22 13:59:06 +02:00
unknown
0fb06a68ce row0mysql.c, row0mysql.h:
Backport of bug fix in 4.0: do not x-lock rows under LOCK TABLES READ unless the table is a temp table


innobase/include/row0mysql.h:
  Backport of bug fix in 4.0: do not x-lock rows under LOCK TABLES READ unless the table is a temp table
innobase/row/row0mysql.c:
  Backport of bug fix in 4.0: do not x-lock rows under LOCK TABLES READ unless the table is a temp table
2002-11-19 16:54:52 +02:00
unknown
d050750f1f row0mysql.c, row0mysql.h, ha_innodb.cc, sql_table.cc, 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/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
2002-11-19 16:27:26 +02:00
unknown
2c349012b0 srv0start.c:
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
2002-11-16 01:59:04 +02:00
unknown
f8680cf00c row0sel.c:
Backport from 4.0 a bug fix: if unique search from a primary key matched a delete-marked record, InnoDB could return the NEXT record


innobase/row/row0sel.c:
  Backport from 4.0 a bug fix: if unique search from a primary key matched a delete-marked record, InnoDB could return the NEXT record
2002-11-13 16:24:50 +02:00
unknown
5907ab4e04 row0sel.c:
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
2002-11-13 15:45:05 +02:00
unknown
d0516d75ae dict0load.c:
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
2002-11-13 06:11:56 +02:00
unknown
1b6548d54d Merge work:/my/mysql-4.0 into hundin.mysql.fi:/my/mysql-4.0 2002-11-10 09:39:50 +02:00
unknown
c88db89d62 Added 4.1 protocol description
innobase/log/log0log.c:
  Removed compiler warnings
2002-11-10 09:39:00 +02:00
unknown
04ca9bcdec Many files:
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
2002-11-09 18:23:09 +02:00
unknown
f76bf0d9db Delete: innobase/stamp-h.in 2002-11-08 21:16:30 +01:00
unknown
c219f509c2 log0recv.c:
Removed compiler warnings about wrong printf formats


innobase/log/log0recv.c:
  Removed compiler warnings about wrong printf formats
2002-11-08 18:44:42 +02:00
unknown
f57822ccfd btr0btr.c, buf0buf.c:
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
2002-11-07 21:04:26 +02:00
unknown
f5e71883be row0mysql.c:
Backport from 4.0: Fix corruption of ON DELETE CASCADE in lock wait timeout


innobase/row/row0mysql.c:
  Backport from 4.0: Fix corruption of ON DELETE CASCADE in lock wait timeout
2002-11-07 15:05:26 +02:00
unknown
4fa5e50edb Many files:
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
2002-11-07 14:47:25 +02:00
unknown
8d0d518ced merge
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
2002-11-07 12:49:01 +02:00
unknown
c88b910208 Portability fixes for Fortre C++ 5.0 (on Sun) in 32 and 64 bit modes.
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
2002-11-07 03:54:00 +02:00
unknown
444d8207d9 Many files:
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
2002-11-06 00:41:27 +02:00
unknown
e53b7488dc srv0start.h, srv0start.c, ha_innodb.cc:
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
2002-10-31 12:03:34 +02:00
unknown
8ade6771d7 ha_innobase.cc:
Backport from 4.0: Fix bug in MySQL-3.23 ORDER BY from a table with no PRIMARY KEY and where the user had added UNIQUE indexes with CREATE INDEX
pars0grm.y:
  Move inclusion of math.h after univ.i also in the .y file; this fix is already done in 4.0


innobase/pars/pars0grm.y:
  Move inclusion of math.h after univ.i also in the .y file; this fix is already done in 4.0
sql/ha_innobase.cc:
  Backport from 4.0: Fix bug in MySQL-3.23 ORDER BY from a table with no PRIMARY KEY and where the user had added UNIQUE indexes with CREATE INDEX
2002-10-31 00:30:19 +02:00
unknown
59f65c4b0b row0undo.c:
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
2002-10-30 09:44:06 +02:00
unknown
af85803133 lexyy.c:
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
2002-10-30 00:11:40 +02:00
unknown
2f7981b73d configure.in:
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
2002-10-29 23:26:21 +02:00
unknown
3cb98f0d66 Many files:
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
2002-10-29 23:16:46 +02:00
unknown
f5563ddad4 merged
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
2002-10-25 21:15:52 +00:00
unknown
f4ebc48eca lexyy.c, pars0grm.c:
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
2002-10-25 20:15:30 +03:00
unknown
7013d8ef0a Merge with 3.23.54
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
2002-10-16 13:11:25 +03:00
unknown
b95b51e53a btr0cur.c:
Fix typo in earlier commit


innobase/btr/btr0cur.c:
  Fix typo in earlier commit
2002-10-16 00:05:15 +03:00
unknown
09ab0dded2 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


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
2002-10-16 00:05:14 +03:00
unknown
23cce6c266 os0thread.c:
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
2002-10-11 15:44:45 +03:00
unknown
03af773b7b os0file.c:
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
2002-10-06 14:53:49 +03:00
unknown
25b2d47517 btr0cur.c:
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
2002-10-05 22:23:51 +03:00
unknown
ed175a5ebd 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


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
2002-10-03 23:07:32 +03:00
unknown
28ebf117dd os0thread.h:
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
2002-10-03 18:10:34 +03:00
unknown
821c77c79d lock0lock.c:
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
2002-10-01 13:47:58 +03:00
unknown
3b7333b484 row0ins.c, ha_innodb.cc:
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
2002-09-22 01:38:48 +03:00
unknown
01be46e20e dict0dict.c:
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
2002-09-21 18:47:56 +03:00
unknown
a8b221addb srv0srv.c:
Fix typo


innobase/srv/srv0srv.c:
  Fix typo
2002-09-20 05:50:25 +03:00
unknown
010a8b922e srv0srv.h, srv0srv.c, row0mysql.c:
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
2002-09-20 05:44:41 +03:00
unknown
ce62618ca7 trx0trx.ic, trx0trx.h, srv0srv.h, row0sel.h, dict0mem.h:
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
2002-09-20 05:18:55 +03:00