mariadb/storage
unknown cac6be1949 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch


client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_subselect.h:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
2006-12-03 21:19:35 +01:00
..
archive Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2006-11-30 23:27:16 +02:00
blackhole Merge willster.(none):/home/stewart/Documents/MySQL/5.0/bug19914-mk2-merge 2006-10-18 18:51:39 +10:00
csv Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2006-11-30 23:27:16 +02:00
example Refactored a number of engines to have correct init/deinit. Added pass support for "data" from plugin to plugin generic init to use memory location. 2006-11-19 18:01:54 -08:00
federated Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2006-11-30 23:27:16 +02:00
heap Merge mysql.com:/home/my/mysql-5.0 2006-11-30 22:38:12 +02:00
innobase This finishes the work (someone) started to remove FIELD_ types and use the Enum MYSQL types. The second part to this is to actually deprecate the FIELD defines in mysql_com.h 2006-12-01 17:26:52 -08:00
myisam Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 2006-12-03 21:19:35 +01:00
myisammrg Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2006-11-30 23:27:16 +02:00
ndb Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 2006-12-01 21:12:13 +01:00
Makefile.am fixes for 'make dist' and 'make distcheck' 2006-04-12 14:08:24 +02:00