diff options
| author | unknown <istruewing@chilla.local> | 2007-04-24 11:23:12 +0200 |
|---|---|---|
| committer | unknown <istruewing@chilla.local> | 2007-04-24 11:23:12 +0200 |
| commit | 04c015fbda381128d058619527908aac57dcae09 (patch) | |
| tree | bc6385166c3aa5ff88d45808ed6737a1f4a0e108 /sql/mysqld.cc | |
| parent | 66acd82f19ecb49229bb1070deda3c70f1b99e0f (diff) | |
| parent | ac0fb49f187d05747ea2a834f310cec2f4c8a27f (diff) | |
| download | mariadb-git-04c015fbda381128d058619527908aac57dcae09.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-wl2936
into chilla.local:/home/mydev/mysql-5.1-wl2936-two
sql/sql_plugin.cc:
Auto merged
Diffstat (limited to 'sql/mysqld.cc')
0 files changed, 0 insertions, 0 deletions