diff options
| author | unknown <istruewing@chilla.local> | 2007-06-16 13:16:09 +0200 |
|---|---|---|
| committer | unknown <istruewing@chilla.local> | 2007-06-16 13:16:09 +0200 |
| commit | ce28c41eb7b42bc02a471aa43eee1d1bee94a330 (patch) | |
| tree | e063d56f114609d27cc4a326f312c701ef90cded /sql/mysqld.cc | |
| parent | d69c6627ba277f9eee679d99842951ec61d5bc17 (diff) | |
| parent | 3e2e6ea9e310a0f283af6b8069674f858d0a8a1f (diff) | |
| download | mariadb-git-ce28c41eb7b42bc02a471aa43eee1d1bee94a330.tar.gz | |
Merge chilla.local:/home/mydev/mysql-5.0-axmrg
into chilla.local:/home/mydev/mysql-5.1-axmrg
configure.in:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'sql/mysqld.cc')
0 files changed, 0 insertions, 0 deletions