diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-04-02 10:45:51 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-04-02 10:45:51 +0200 |
| commit | 74a32b0f2d2db6096c74e42bc5c5d8f9ff0cd01b (patch) | |
| tree | 28eeb0a6e1e314775d6e93504322b9f5c1d14948 /client/client_priv.h | |
| parent | a0699cd89c72083577565a32999f8f6cb3afcb4a (diff) | |
| parent | 44d4940fcc001a6606c63e8900d9e2bf41ea4e67 (diff) | |
| download | mariadb-git-74a32b0f2d2db6096c74e42bc5c5d8f9ff0cd01b.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
mysql-test/t/create.test:
Auto merged
sql/table.cc:
Auto merged
storage/myisam/mi_open.c:
Auto merged
mysql-test/mysql-test-run.pl:
Manual merge
mysql-test/r/create.result:
Manual merge of revert
Diffstat (limited to 'client/client_priv.h')
0 files changed, 0 insertions, 0 deletions