diff options
| author | unknown <tsmith@siva.hindu.god> | 2007-01-11 13:50:48 -0700 |
|---|---|---|
| committer | unknown <tsmith@siva.hindu.god> | 2007-01-11 13:50:48 -0700 |
| commit | 44318bbbddf0eec0f7b4b0fc9d11678750600f7c (patch) | |
| tree | d5ad489509eb68843615a2f7425506f6d90d1fef /sql/sql_parse.cc | |
| parent | e64f4fdebb11a60bed4d8e367d9c99ab50e6e89d (diff) | |
| parent | a4817aced500feede54a9548b650650e513b69d9 (diff) | |
| download | mariadb-git-44318bbbddf0eec0f7b4b0fc9d11678750600f7c.tar.gz | |
Merge siva.hindu.god:/home/tsmith/m/bk/mysql-5.0-build
into siva.hindu.god:/home/tsmith/m/bk/mysql-5.1-build
BitKeeper/deleted/.del-CMakeLists.txt~3:
Auto merged
BitKeeper/deleted/.del-README~1:
Auto merged
BitKeeper/deleted/.del-configure.js:
Auto merged
BitKeeper/deleted/.del-mysql_test_run_new.c~a23ab2c4b28b25ad:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
scripts/mysql_install_db.sh:
Auto merged
configure.in:
Manual merge
mysql-test/install_test_db.sh:
Manual merge
sql/mysqld.cc:
Manual merge
Diffstat (limited to 'sql/sql_parse.cc')
0 files changed, 0 insertions, 0 deletions