Skip to content

Commit 69d1606

Browse files
PavelShilin89PavelShilin89
authored
Merge 2238ad1 into a62163c 
2 parents a62163c + 2238ad1 commit 69d1606

File tree

4 files changed

+557
-21
lines changed

4 files changed

+557
-21
lines changed

‎test/clt-tests/base/searchd-with-flexible-ports.conf

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
cat << EOF
33
common {
44
plugin_dir = /usr/local/lib/manticore
5-
lemmatizer_base = /usr/share/manticore/morph/
5+
lemmatizer_base = /usr/share/manticore/
66
}
77
searchd {
88
listen = 127.0.0.1:${INSTANCE}306:mysql41
@@ -14,7 +14,6 @@ searchd {
1414
data_dir = /var/log/manticore-${INSTANCE}
1515
query_log_format = sphinxql
1616
query_log_commands = 1
17-
diskchunk_flush_write_timeout = -1
1817
}
1918
2019
EOF

‎test/clt-tests/core/show-settings.rec

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,21 @@ export INSTANCE=1
55
––– input –––
66
mysql -h0 -P1306 -e "SHOW SETTINGS;"
77
––– output –––
8-
+---------------------------------------+------------------------------------------------------------+
9-
| Setting_name | Value |
10-
+---------------------------------------+------------------------------------------------------------+
11-
| configuration_file | /.clt/test/clt-tests/base/searchd-with-flexible-ports.conf |
12-
| worker_pid | %{NUMBER} |
13-
| searchd.listen | %{IPADDR}:%{NUMBER}:mysql41 |
14-
| searchd.listen | %{IPADDR}:%{NUMBER} |
15-
| searchd.listen | %{IPADDR}:%{NUMBER}:http |
16-
| searchd.log | /var/log/manticore-1/searchd.log |
17-
| searchd.query_log | /var/log/manticore-1/query.log |
18-
| searchd.pid_file | /var/log/manticore-1/searchd.pid |
19-
| searchd.data_dir | /var/log/manticore-1 |
20-
| searchd.query_log_format | sphinxql |
21-
| searchd.query_log_commands | 1 |
22-
| searchd.diskchunk_flush_write_timeout | -1 |
23-
| searchd.binlog_path | /var/log/manticore-1/binlog |
24-
| common.plugin_dir | /usr/local/lib/manticore |
25-
| common.lemmatizer_base | /usr/share/manticore/morph/ |
26-
+---------------------------------------+------------------------------------------------------------+
8+
+----------------------------+------------------------------------------------------------+
9+
| Setting_name | Value |
10+
+----------------------------+------------------------------------------------------------+
11+
| configuration_file | /.clt/test/clt-tests/base/searchd-with-flexible-ports.conf |
12+
| worker_pid | %{NUMBER} |
13+
| searchd.listen | %{IPADDR}:%{NUMBER}:mysql41 |
14+
| searchd.listen | %{IPADDR}:%{NUMBER} |
15+
| searchd.listen | %{IPADDR}:%{NUMBER}:http |
16+
| searchd.log | /var/log/manticore-1/searchd.log |
17+
| searchd.query_log | /var/log/manticore-1/query.log |
18+
| searchd.pid_file | /var/log/manticore-1/searchd.pid |
19+
| searchd.data_dir | /var/log/manticore-1 |
20+
| searchd.query_log_format | sphinxql |
21+
| searchd.query_log_commands | 1 |
22+
| searchd.binlog_path | /var/log/manticore-1/binlog |
23+
| common.plugin_dir | /usr/local/lib/manticore |
24+
| common.lemmatizer_base | /usr/share/manticore/ |
25+
+----------------------------+------------------------------------------------------------+

0 commit comments

Comments
 (0)