mariadb/heap
unknown 0cbd58c52b Merge with 4.1
BitKeeper/etc/ignore:
  auto-union
Build-tools/Do-compile:
  Auto merged
client/mysqladmin.cc:
  Auto merged
heap/hp_create.c:
  Auto merged
heap/hp_write.c:
  Auto merged
include/my_sys.h:
  Auto merged
innobase/data/data0type.c:
  Auto merged
innobase/include/row0mysql.h:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/rem/rem0cmp.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
mysql-test/r/ctype_latin1_de.result:
  Auto merged
mysql-test/r/ctype_tis620.result:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/r/ctype_ujis.result:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/r/func_sapdb.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/type_float.result.es:
  Auto merged
mysql-test/r/type_float.result:
  Auto merged
mysql-test/r/type_timestamp.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/t/func_sapdb.test:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
mysql-test/t/type_float.test:
  Auto merged
mysql-test/t/type_timestamp.test:
  Auto merged
mysys/mf_iocache.c:
  Auto merged
ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-bin.c:
  Auto merged
strings/ctype-czech.c:
  Auto merged
strings/ctype-gbk.c:
  Auto merged
strings/ctype-latin1.c:
  Auto merged
strings/ctype-mb.c:
  Auto merged
strings/ctype-simple.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-utf8.c:
  Auto merged
strings/ctype-win1250ch.c:
  Auto merged
configure.in:
  Use local values
mysql-test/r/ps_1general.result:
  Update results
mysql-test/t/func_gconcat.test:
  no changes
mysql-test/t/ps_1general.test:
  Use local code
ndb/src/common/util/version.c:
  Use local code
sql/filesort.cc:
  Empty line changes
sql/ha_heap.cc:
  Merge
sql/item_timefunc.cc:
  Keep local code
sql/mysql_priv.h:
  Update to 5.0
sql/sql_show.cc:
  Hand merge
support-files/mysql.spec.sh:
  No changes
2005-01-15 14:09:45 +02:00
..
.cvsignore
_check.c Add 0x before pointers (to help with debugging) 2004-12-18 05:19:21 +02:00
_rectest.c
ChangeLog
heapdef.h Add support for up to VARCHAR (size up to 65535) 2004-12-06 02:00:37 +02:00
hp_block.c
hp_clear.c
hp_close.c
hp_create.c Merge with 4.1 2005-01-15 14:09:45 +02:00
hp_delete.c Add 0x before pointers (to help with debugging) 2004-12-18 05:19:21 +02:00
hp_extra.c
hp_hash.c Add 0x before pointers (to help with debugging) 2004-12-18 05:19:21 +02:00
hp_info.c
hp_open.c Add 0x before pointers (to help with debugging) 2004-12-18 05:19:21 +02:00
hp_panic.c
hp_rename.c
hp_rfirst.c
hp_rkey.c Add 0x before pointers (to help with debugging) 2004-12-18 05:19:21 +02:00
hp_rlast.c
hp_rnext.c
hp_rprev.c
hp_rrnd.c Add 0x before pointers (to help with debugging) 2004-12-18 05:19:21 +02:00
hp_rsame.c
hp_scan.c
hp_static.c
hp_test1.c
hp_test2.c
hp_update.c Add support for up to VARCHAR (size up to 65535) 2004-12-06 02:00:37 +02:00
hp_write.c Merge with 4.1 2005-01-15 14:09:45 +02:00
make-ccc
Makefile.am