diff options
| author | unknown <igor@rurik.mysql.com> | 2006-06-15 18:36:46 -0700 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2006-06-15 18:36:46 -0700 |
| commit | eb219834537d6e344fa53e8f0b95c8ad225a60d6 (patch) | |
| tree | e9b0d1955170a7f853668a4183241ebd78c6c533 /mysql-test/r/packet.result | |
| parent | 69e344e0b2a349e159455aa6eaa48c2eab23fa12 (diff) | |
| parent | 02b9f5b554f756c274d1bd6beb409efdbdfa4771 (diff) | |
| download | mariadb-git-eb219834537d6e344fa53e8f0b95c8ad225a60d6.tar.gz | |
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into rurik.mysql.com:/home/igor/mysql-5.0-opt
sql/field.cc:
Auto merged
sql/opt_sum.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/packet.result')
0 files changed, 0 insertions, 0 deletions