Skip to content

Commit 1681ed8

Browse files
sanikolaevdjklim87
andauthored
fix: remove the pre-filled .mysql_history file (#124)
* fix: remove the pre-filled .mysql_history file, which contains example queries, because it is more confusing than helpful. * fix tests --------- Co-authored-by: djklim87 <klim@manticoresearch.com>
1 parent 25fd1af commit 1681ed8

4 files changed

Lines changed: 2 additions & 49 deletions

File tree

.mysql_history

Lines changed: 0 additions & 12 deletions
This file was deleted.

Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,6 @@ RUN apt-get update && apt-get install -y software-properties-common curl && \
111111
COPY manticore.conf.sh /etc/manticoresearch/
112112
RUN sed -i '/log = \/var\/log\/manticore\/searchd.log/d;/query_log = \/var\/log\/manticore\/query.log/d' /etc/manticoresearch/manticore.conf
113113
RUN md5sum /etc/manticoresearch/manticore.conf | awk '{print $1}' > /manticore.conf.md5
114-
COPY sandbox.sql /sandbox.sql
115-
COPY .mysql_history /root/.mysql_history
116114
COPY component-licenses /licenses
117115

118116
COPY docker-entrypoint.sh /usr/local/bin/

clt_tests/tests/test-one-liner.rec

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -6,35 +6,11 @@ docker run --name manticore --rm -d manticoresoftware/manticore:current && echo
66
Waiting for Manticore docker to start. Consider mapping the data_dir to make it start faster next time
77
#!/.*\.0$/!#
88
––– input –––
9-
docker exec manticore mysql -e "source /sandbox.sql"
9+
docker exec manticore mysql -e "CREATE TABLE films (title text, description text, category_id integer, release_year integer, rental_rate float);"
1010
––– output –––
1111
––– input –––
1212
docker exec manticore mysql -e "SHOW TABLES\G"
1313
––– output –––
1414
*************************** 1. row ***************************
1515
Table: films
16-
Type: rt
17-
––– input –––
18-
docker exec manticore mysql -e "SELECT * FROM films LIMIT 3\G"
19-
––– output –––
20-
*************************** 1. row ***************************
21-
id: 19
22-
title: AMADEUS HOLY
23-
description: A Emotional Display of a Pioneer And a Technical Writer who must Battle a Man in A Baloon
24-
category_id: 1
25-
release_year: 2008
26-
rental_rate: 0.990000
27-
*************************** 2. row ***************************
28-
id: 21
29-
title: AMERICAN CIRCUS
30-
description: A Insightful Drama of a Girl And a Astronaut who must Face a Database Administrator in A Shark Tank
31-
category_id: 1
32-
release_year: 2009
33-
rental_rate: 4.990000
34-
*************************** 3. row ***************************
35-
id: 29
36-
title: ANTITRUST TOMATOES
37-
description: A Fateful Yarn of a Womanizer And a Feminist who must Succumb a Database Administrator in Ancient India
38-
category_id: 1
39-
release_year: 2005
40-
rental_rate: 2.990000
16+
Type: rt

sandbox.sql

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)