diff options
author | Joerg Bruehe <joerg@mysql.com> | 2008-10-10 19:20:42 +0200 |
---|---|---|
committer | Joerg Bruehe <joerg@mysql.com> | 2008-10-10 19:20:42 +0200 |
commit | 194d6875c6a8a5f7b478d429e18e63c983dc11ef (patch) | |
tree | d9e285009d6b05e9bd854534e3c05592ef73cfb0 /zlib | |
parent | 55abed4afd22e7e29f6579a67efad52f0b800278 (diff) | |
parent | 0b38c93d6e1cc66eb798a59be817f744936b1505 (diff) | |
download | mariadb-git-194d6875c6a8a5f7b478d429e18e63c983dc11ef.tar.gz |
Merge from main 5.0 branch -> 5.0-build
Merge conflicts in test "create:
- for "create.result", handled correctly by "bzr extmerge" (using "kdiff3"),
- for "create.test", not reported as a conflict, but merged wrong
(new block at the test end got duplicated), fixed manually.
Test on Linux (Debian, PowerPC) was ok.
Diffstat (limited to 'zlib')
0 files changed, 0 insertions, 0 deletions