diff options
| author | unknown <lars/lthalmann@mysql.com/dl145k.mysql.com> | 2006-09-23 07:37:41 +0200 |
|---|---|---|
| committer | unknown <lars/lthalmann@mysql.com/dl145k.mysql.com> | 2006-09-23 07:37:41 +0200 |
| commit | 0d9242cefbb490cc24f84928ab8f8aa064f1a264 (patch) | |
| tree | 8f08f2a216b6f977b2f95b708720cae7c2ff1b30 /sql/mysql_priv.h | |
| parent | dccc792452992b3481bfad5acfb7835cc1e93df8 (diff) | |
| parent | 2bac6da1da08b7146e0b4222de047042e8ca6e70 (diff) | |
| download | mariadb-git-0d9242cefbb490cc24f84928ab8f8aa064f1a264.tar.gz | |
Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
BitKeeper/etc/ignore:
auto-union
mysql-test/r/myisam.result:
Auto merged
mysql-test/t/myisam.test:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/mysql_priv.h')
0 files changed, 0 insertions, 0 deletions