diff options
| author | unknown <mats@romeo.(none)> | 2006-09-19 13:47:15 +0200 |
|---|---|---|
| committer | unknown <mats@romeo.(none)> | 2006-09-19 13:47:15 +0200 |
| commit | 21263710affc1c7acb5371625a8d066cb9bf9c26 (patch) | |
| tree | 4f26f8910eb8aa64708e803a81f81e937cc9171b /mysql-test/r/status.result | |
| parent | c323a2cbe2cee7a43afcb5d2ea34c39eedaf7f08 (diff) | |
| parent | 3936ce19d20e085cb5317d2fc024ee6818e4bbf4 (diff) | |
| download | mariadb-git-21263710affc1c7acb5371625a8d066cb9bf9c26.tar.gz | |
Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl
into romeo.(none):/home/bk/w3259-mysql-5.1-new-rpl
mysql-test/r/rpl_row_tabledefs_2myisam.result:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
mysql-test/t/disabled.def:
SCCS merged
Diffstat (limited to 'mysql-test/r/status.result')
0 files changed, 0 insertions, 0 deletions