diff options
| author | unknown <lenz@mysql.com> | 2005-05-09 00:51:05 +0200 |
|---|---|---|
| committer | unknown <lenz@mysql.com> | 2005-05-09 00:51:05 +0200 |
| commit | 76cfd9c0753bf6f0e9b0f277afde710b0f0b546e (patch) | |
| tree | f2920538152e14f7863242681fb7e7290012e7db | |
| parent | d808b76db5b5fedda598e7e9368439472e5aef15 (diff) | |
| parent | 6706b9fac95d46abdc7523c3f052d6972248d829 (diff) | |
| download | mariadb-git-76cfd9c0753bf6f0e9b0f277afde710b0f0b546e.tar.gz | |
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
| -rw-r--r-- | cmd-line-utils/libedit/Makefile.am | 2 | ||||
| -rw-r--r-- | mysql-test/t/range.test | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/cmd-line-utils/libedit/Makefile.am b/cmd-line-utils/libedit/Makefile.am index 9ff005c7156..03f3eb65fbc 100644 --- a/cmd-line-utils/libedit/Makefile.am +++ b/cmd-line-utils/libedit/Makefile.am @@ -24,7 +24,7 @@ pkginclude_HEADERS = readline/readline.h noinst_HEADERS = chared.h el.h el_term.h histedit.h key.h parse.h refresh.h sig.h \ sys.h tokenizer.h config.h hist.h map.h prompt.h read.h \ - search.h tty.h libedit_term.h + search.h tty.h libedit_term.h vis.h EXTRA_DIST = makelist.sh np/unvis.c np/strlcpy.c np/vis.c np/vis.h np/strlcat.c np/fgetln.c diff --git a/mysql-test/t/range.test b/mysql-test/t/range.test index 3d3d4748fe3..b8412b6624e 100644 --- a/mysql-test/t/range.test +++ b/mysql-test/t/range.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc + # # Problem with range optimizer # |