diff options
| author | unknown <jimw@mysql.com> | 2006-05-19 16:17:24 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2006-05-19 16:17:24 -0700 |
| commit | 719bfafc2f1086d5a2eaf9c91b386d4efd41f1a7 (patch) | |
| tree | 7c33cbe46adf4c8f526f3f2de68fb9c3701071d3 /sql/sql_view.h | |
| parent | 8dff422f0bf901c0d8cc8f975df635df0fe03762 (diff) | |
| parent | c06972bf2a9e9739c0eb926c6f750b8990fd4c17 (diff) | |
| download | mariadb-git-719bfafc2f1086d5a2eaf9c91b386d4efd41f1a7.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-5.0-1039
into mysql.com:/home/jimw/my/mysql-5.0-clean
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
include/sslopt-longopts.h:
Resolve conflict
include/sslopt-vars.h:
Resolve conflict
mysql-test/r/variables.result:
Resolve conflict
mysql-test/t/variables.test:
Resolve conflict
Diffstat (limited to 'sql/sql_view.h')
0 files changed, 0 insertions, 0 deletions