unknown 05480a8863 Merge buzz.(none):/home/davi/mysql-5.0-runtime ...

into  buzz.(none):/home/davi/mysql-5.1-runtime


mysql-test/r/ps.result:
  Auto merged
mysql-test/t/limit.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/item.cc:
  Auto merged
mysql-test/suite/rpl/r/rpl_user_variables.result:
  Manual merge
mysql-test/suite/rpl/t/rpl_user_variables.test:
  Manual merge
sql/sql_yacc.yy:
  Manual merge

2008-02-28 20:22:50 -03:00

..

binlog

Update new test results after merge (Bug#12713)

2008-02-22 21:49:16 +03:00

bugs

Test case for bug#12691

2008-01-31 16:23:27 +03:00

funcs_1

Fixed differences in STATE in result file for bug#34190.

2008-02-06 11:02:45 +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 poseidon.ndb.mysql.com:/home/tomas/cge-5.1

2008-02-11 17:38:34 +01:00

ndb_team

Merge trift2.:/MySQL/M51/mysql-5.1

2008-02-22 16:14:27 +01:00

parts

Disabling various tests and reporting bugs for them.

2008-02-02 08:15:36 +01:00

rpl

Merge buzz.(none):/home/davi/mysql-5.0-runtime

2008-02-28 20:22:50 -03:00

rpl_ndb

Merge quad.:/mnt/raid/alik/MySQL/devel/5.1

2008-02-26 19:34:02 +03:00

stress

Merge trift2.:/MySQL/M51/mysql-5.1

2008-02-22 16:14:27 +01:00