diff options
| author | unknown <istruewing@stella.local> | 2007-11-28 11:06:40 +0100 |
|---|---|---|
| committer | unknown <istruewing@stella.local> | 2007-11-28 11:06:40 +0100 |
| commit | df722475e7e8bcfb8c86939eba63cbc640518c5a (patch) | |
| tree | 8f706db4638e6abc5122cf6cbadbd020dd279646 /sql/protocol.h | |
| parent | c0ecd863b87afec0d73a946cdcaa84e0d92cfe38 (diff) | |
| parent | 7991e6a61dac3dd741e25712d51701b1c6537cc7 (diff) | |
| download | mariadb-git-df722475e7e8bcfb8c86939eba63cbc640518c5a.tar.gz | |
Merge stella.local:/home2/mydev/mysql-5.0-axmrg
into stella.local:/home2/mydev/mysql-5.1-axmrg
mysql-test/t/disabled.def:
Manual merge from 5.0.
Diffstat (limited to 'sql/protocol.h')
0 files changed, 0 insertions, 0 deletions