diff options
| author | unknown <joerg@mysql.com> | 2005-09-08 12:07:36 +0200 |
|---|---|---|
| committer | unknown <joerg@mysql.com> | 2005-09-08 12:07:36 +0200 |
| commit | cd470bc3a35a7bc48dfb6cdcc5a5415e57a4fb22 (patch) | |
| tree | 23b251cee4d3f6105094fb37c0e3fa71c73f0c0e /sql/examples | |
| parent | 4ec11b2797755ef6151c9a56b1fa8f756425223d (diff) | |
| parent | a46d6b0c0c05b5c6275abec1bd861105bd5b88f6 (diff) | |
| download | mariadb-git-cd470bc3a35a7bc48dfb6cdcc5a5415e57a4fb22.tar.gz | |
Auto / manual merge from 4.0.26 (bypassing intermediate trees, due to unmerged changes).
include/my_global.h:
Auto merged
configure.in:
Manual merge from 4.0.26 (bypassing intermediate trees, due to unmerged changes):
Use "local" (= existing 5.1) version.
Diffstat (limited to 'sql/examples')
0 files changed, 0 insertions, 0 deletions