diff options
| author | unknown <kostja@bodhi.(none)> | 2007-06-19 15:02:08 +0400 |
|---|---|---|
| committer | unknown <kostja@bodhi.(none)> | 2007-06-19 15:02:08 +0400 |
| commit | a790eb7570b27a041d9895e7967b3a074caaa5af (patch) | |
| tree | 049f115bcc8030374070b78c1c92774b66dfb47c /sql/sql_acl.cc | |
| parent | 7d16183bd88bc8bef933d575a7eb1b47efc87056 (diff) | |
| parent | 85962e0cbedf74d77adc89ef86f92174e893437f (diff) | |
| download | mariadb-git-a790eb7570b27a041d9895e7967b3a074caaa5af.tar.gz | |
Manual merge.
mysql-test/r/sp.result:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
sql/handler.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_acl.cc')
0 files changed, 0 insertions, 0 deletions