diff options
| author | unknown <ingo@mysql.com> | 2005-01-26 15:51:46 +0100 |
|---|---|---|
| committer | unknown <ingo@mysql.com> | 2005-01-26 15:51:46 +0100 |
| commit | 01e845989558236340b14c3a4b17c8d171736203 (patch) | |
| tree | 529f781833794ea64fd20c882773a307e9bf1095 /mysql-test/t/archive.test | |
| parent | a496ad3fb69fe5db76f1bd73b8c06199bc1bcb6d (diff) | |
| parent | fee6edd9645a0e0dd461efd2618a5f189cf170f3 (diff) | |
| download | mariadb-git-01e845989558236340b14c3a4b17c8d171736203.tar.gz | |
Merge from 4.1
Archive fix by Ingo.
Innodb compile fix by Monty.
configure.in:
Auto merged
innobase/include/univ.i:
Auto merged
BUILD/SETUP.sh:
Auto merged
mysql-test/t/archive.test:
Auto merged
sql/examples/ha_archive.cc:
Auto merged
sql/examples/ha_archive.h:
Auto merged
sql/handler.cc:
Auto merged
sql/sql_select.cc:
Auto merged
innobase/fil/fil0fil.c:
Merged Montys fix.
Diffstat (limited to 'mysql-test/t/archive.test')
| -rw-r--r-- | mysql-test/t/archive.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/archive.test b/mysql-test/t/archive.test index 8cf54610914..f7ec603ca79 100644 --- a/mysql-test/t/archive.test +++ b/mysql-test/t/archive.test @@ -1,6 +1,6 @@ # # Simple test for archive example -# Taken fromm the select test +# Taken from the select test # -- source include/have_archive.inc |