diff options
author | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2011-03-29 10:38:26 +0200 |
---|---|---|
committer | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2011-03-29 10:38:26 +0200 |
commit | f239fa302cd4acc97c406ae071cefc903bb5de79 (patch) | |
tree | 933a2e38215ded596bb3163a66b32b6dade9d72d /extra | |
parent | e65b3b86f0e7b43de60ce4472bcc24cec851a51c (diff) | |
parent | 4e26a41f3e2cac5ec5016b862944c0116a18b0f6 (diff) | |
download | mariadb-git-f239fa302cd4acc97c406ae071cefc903bb5de79.tar.gz |
Null merge from mysql-5.1 to mysql-5.5
Diffstat (limited to 'extra')
0 files changed, 0 insertions, 0 deletions