unknown bf541d14f2 Merge ramayana.hindu.god:/home/tsmith/m/bk/51 ...

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51


client/mysqldump.c:
  Auto merged
configure.in:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/handler.cc:
  Manual merge
sql/item.cc:
  Manual merge

2008-01-25 10:37:29 -07:00

..

binlog

after-merge fix:

2007-11-29 22:32:34 +04:00

funcs_1

post merge fix for bug#32496.

2007-11-26 22:50:12 +01:00

funcs_2

Merge four.local.lan:/WORK2/merge/mysql-5.0-31556

2007-10-18 13:13:21 +02:00

im

Move instance manager tests to it's own suite

2007-08-29 19:02:33 +02:00

jp

Many files:

2005-01-07 14:32:05 +02:00

large_tests

Bug#27029 alter table ... enable keys crashes mysqld on large table

2007-06-21 12:45:56 -04:00

manual

manual merge for bug_29136, bug#29309.

2007-10-13 23:12:50 +03:00

ndb

Merge host.loc:/home/uchum/work/5.1-opt-33699

2008-01-11 21:39:45 +04:00

ndb_team

move randomly failing tests to ndb_team suite

2007-12-11 19:57:26 +01:00

parts

additional after merge fix

2007-12-13 21:34:05 +04:00

rpl

Merge ramayana.hindu.god:/home/tsmith/m/bk/51

2008-01-25 10:37:29 -07:00

rpl_ndb

Enabled test rpl_ndb_ddl

2007-12-11 11:51:14 +01:00

stress

Additional tests checking for symptoms observed within

2007-07-13 18:32:22 +02:00