diff options
| author | unknown <kaa@kaamos.(none)> | 2008-02-17 15:57:28 +0300 |
|---|---|---|
| committer | unknown <kaa@kaamos.(none)> | 2008-02-17 15:57:28 +0300 |
| commit | 1e62af865bae69c71bb650fede309d5b9ea6ba44 (patch) | |
| tree | f5ec046e5ee62fa13aef53404367f0bcdebaf293 /sql/mysql_priv.h | |
| parent | e31806674f134f456af312b62b981bf2735768e2 (diff) | |
| parent | b546edb41ddf8f6063949b4841e2c476cfcdff19 (diff) | |
| download | mariadb-git-1e62af865bae69c71bb650fede309d5b9ea6ba44.tar.gz | |
Merge kaamos.(none):/data/src/opt/mysql-5.0-opt
into kaamos.(none):/data/src/opt/mysql-5.1-opt
mysql-test/r/variables.result:
Auto merged
mysql-test/t/variables.test:
Auto merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/r/sp.result:
Null merge.
mysql-test/t/sp.test:
Null merge.
Diffstat (limited to 'sql/mysql_priv.h')
0 files changed, 0 insertions, 0 deletions