diff options
| author | unknown <ramil/ram@mysql.com/ramil.myoffice.izhnet.ru> | 2007-03-29 11:06:15 +0500 |
|---|---|---|
| committer | unknown <ramil/ram@mysql.com/ramil.myoffice.izhnet.ru> | 2007-03-29 11:06:15 +0500 |
| commit | df99063599fb02e2b79b6ddf1b4b758c414ce229 (patch) | |
| tree | 3c1a57c8db1a90caecbbf724533ecc2b1788d0ce /sql/sql_acl.cc | |
| parent | db9af0d82239e2ff016d565e54f2f541f05bb9a3 (diff) | |
| parent | 86010101e294559d83d0c99def8160eddcf4ce55 (diff) | |
| download | mariadb-git-df99063599fb02e2b79b6ddf1b4b758c414ce229.tar.gz | |
Merge mysql.com:/home/ram/work/mysql-5.0-maint
into mysql.com:/home/ram/work/b26359/b26359.5.0
mysql-test/r/strict.result:
Auto merged
mysql-test/t/strict.test:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
Diffstat (limited to 'sql/sql_acl.cc')
0 files changed, 0 insertions, 0 deletions