diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-09-01 17:29:49 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-09-01 17:29:49 +0200 |
| commit | 1fba6e0043bf8924b14701a79c9ff39859ce3b18 (patch) | |
| tree | 6819cd93d4b471938969ab3357572a2be26f7801 /sql/sql_parse.cc | |
| parent | 4fed17727655091622b0244c9a127010cab719a9 (diff) | |
| parent | 6ee54d733ce5a85c82a0c054fa3198caa65512d0 (diff) | |
| download | mariadb-git-1fba6e0043bf8924b14701a79c9ff39859ce3b18.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
client/mysqltest.c:
Auto merged
mysql-test/lib/mtr_report.pl:
Auto merged
mysql-test/lib/mtr_timer.pl:
Auto merged
mysql-test/t/create.test:
Auto merged
mysql-test/t/create_select_tmp.test:
Auto merged
mysql-test/t/drop.test:
Auto merged
mysql-test/t/flush.test:
Auto merged
mysql-test/t/handler.test:
Auto merged
mysql-test/t/innodb-deadlock.test:
Auto merged
mysql-test/t/innodb-lock.test:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
mysql-test/t/ndb_autodiscover2.test:
Auto merged
mysql-test/t/rpl000001.test:
Auto merged
mysql-test/t/rpl_EE_error.test:
Auto merged
mysql-test/t/rpl_change_master.test:
Auto merged
mysql-test/t/rpl_deadlock.test:
Auto merged
mysql-test/t/rpl_drop.test:
Auto merged
mysql-test/t/rpl_drop_temp.test:
Auto merged
mysql-test/t/rpl_error_ignored_table.test:
Auto merged
mysql-test/t/rpl_flush_log_loop.test:
Auto merged
mysql-test/t/rpl_insert_id.test:
Auto merged
mysql-test/t/rpl_loaddata.test:
Auto merged
mysql-test/t/rpl_rotate_logs.test:
Auto merged
mysql-test/t/rpl_until.test:
Auto merged
sql/examples/ha_archive.cc:
Auto merged
mysql-test/lib/mtr_process.pl:
Manual merge
mysql-test/mysql-test-run.pl:
Manual merge
Diffstat (limited to 'sql/sql_parse.cc')
0 files changed, 0 insertions, 0 deletions