mariadb/innobase
unknown f095274fe8 merge with 4.1
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/triggers/post-commit:
  Auto merged
Docs/Support/texi2html:
  Auto merged
Makefile.am:
  Auto merged
client/Makefile.am:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
include/my_base.h:
  Auto merged
include/my_global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
include/my_sys.h:
  Auto merged
include/my_time.h:
  Auto merged
include/mysql.h:
  Auto merged
include/mysql_com.h:
  Auto merged
innobase/buf/buf0buf.c:
  Auto merged
innobase/include/row0mysql.h:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/examples/Makefile.am:
  Auto merged
myisam/mi_check.c:
  Auto merged
mysql-test/include/ps_modify.inc:
  Auto merged
mysql-test/install_test_db.sh:
  Auto merged
mysql-test/r/alter_table.result:
  Auto merged
mysql-test/r/auto_increment.result:
  Auto merged
mysql-test/r/bdb.result:
  Auto merged
mysql-test/r/ctype_latin1_de.result:
  Auto merged
mysql-test/r/ctype_recoding.result:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/r/func_group.result:
  Auto merged
mysql-test/r/func_if.result:
  Auto merged
mysql-test/t/derived.test:
  Auto merged
mysql-test/t/insert.test:
  merge with 4.1
  Fixed test case to not use 'if exists' when it shouldn't
mysql-test/t/range.test:
  merge with 4.1
  Added missing drop table
sql/ha_ndbcluster.cc:
  merge with 4.1
  Simple optimization: use max() instead of ? :
sql/item_func.cc:
  merge with 4.1
  (Added back old variable names for easier merges)
sql/opt_range.cc:
  merge with 4.1
  Removed argument 'parent_alloc' from QUICK_RANGE_SELECT as this was not used
  Added assert if using QUICK_GROUP_MIN_MAX_SELECT with parent_alloc as the init() function can't handle this
  Changed back get_quick_select_for_ref() to use it's own alloc root becasue this function may be called several times for one query
sql/sql_handler.cc:
  merge with 4.1
  change variable 'err' to 'error' as same function had a label named 'err'
sql/sql_update.cc:
  Use multi-update code from 5.0 instead of 4.1
  We will fix the locking code shortly in 5.0 to be faster than in 4.1
2004-10-29 19:26:52 +03:00
..
btr merge with 4.1 2004-10-29 19:26:52 +03:00
buf merge with 4.1 2004-10-29 19:26:52 +03:00
data Many files: 2004-10-01 20:01:25 +03:00
db Added Innobase to source distribution 2001-02-17 14:19:19 +02:00
dict Fix compiler warnings (detected by Intel's C++ compiler) 2004-10-22 18:44:51 +03:00
dyn Remove unnecessary files 2004-02-19 11:32:07 +02:00
eval New MYSQL_SERVER_SUFFIX usage (for easier compilation) 2004-05-25 02:28:44 +03:00
fil fil0fil.c: 2004-10-26 20:47:23 +03:00
fsp Merge with 4.0 for 4.1 release 2004-10-06 19:14:33 +03:00
fut Merge with 4.0.21 2004-06-18 04:38:58 +03:00
ha btr0sea.c, buf0lru.c, buf0buf.c, ha0ha.c, hash0hash.h, ha0ha.h, buf0buf.h: 2004-10-27 15:45:10 +03:00
ibuf InnoDB: quote identifiers according to MySQL settings (Bug #5292) 2004-10-01 11:51:59 +03:00
include merge with 4.1 2004-10-29 19:26:52 +03:00
lock Correct an 'unresolved identifier' problem caused by an "inline" 2004-10-07 12:02:22 +02:00
log srv0srv.c, log0log.c, srv0srv.h, ha_innodb.cc, ha_innodb.h: 2004-10-13 20:04:52 +03:00
mach merge with 4.0 to get security fixes and latest bug fixes 2004-02-20 17:43:02 +02:00
mem Many files: 2004-10-07 20:53:20 +03:00
mtr Merge with 4.0.21 2004-06-18 04:38:58 +03:00
os row0mysql.c: 2004-10-26 20:29:11 +03:00
page InnoDB: quote identifiers according to MySQL settings (Bug #5292) 2004-10-01 11:51:59 +03:00
pars Merge with 4.0 for 4.1 release 2004-10-06 19:14:33 +03:00
que Merge with 4.0.21 2004-06-18 04:38:58 +03:00
read merge with 4.0 2004-03-16 22:41:30 +02:00
rem Fixed unique prefix key bug for multibyte character sets (BUG #4521) for 2004-09-03 15:26:29 +03:00
row merge with 4.1 2004-10-29 19:26:52 +03:00
srv Fixed access to freed memory 2004-10-27 21:56:17 +03:00
sync Merge 2004-10-08 15:43:27 +03:00
thr Cset exclude: marko@hundin.mysql.fi|ChangeSet|20040311211202|05613 2004-06-17 13:25:06 +03:00
trx Merge with 4.0 2004-10-27 19:52:41 +03:00
usr Cset exclude: marko@hundin.mysql.fi|ChangeSet|20040525171209|56870 2004-06-17 11:57:45 +03:00
ut InnoDB: Treat UTF-8 strings properly in case insensitive operations 2004-10-18 16:00:57 +03:00
configure.in - added AC_PROG_LIBTOOL to innobase/configure.in to be able to compile 2004-04-29 14:48:49 +02:00
Makefile.am Remove unneeded module "com" 2004-03-11 12:55:28 +02:00
makefilewin Added Innobase to source distribution 2001-02-17 14:19:19 +02:00
my_cnf Added Innobase to source distribution 2001-02-17 14:19:19 +02:00