Commit 0d5caaa4 authored by unknown's avatar unknown

Merge stella.local:/home2/mydev/mysql-5.0-axmrg

into  stella.local:/home2/mydev/mysql-5.1-axmrg


mysql-test/t/merge.test:
  Auto merged
parents 573353c2 0ced2a4d
#
# test of MERGE TABLES
# Test of MERGE TABLES
#
--disable_warnings
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment