merge from 1.5.2.5 ( ~ r10673)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@10674 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2012-05-14 08:04:10 +00:00
parent f0c12f5756
commit ea84468e7d
19 changed files with 173 additions and 49 deletions

View file

@ -5,7 +5,9 @@
<columns>
<column name="*" />
</columns>
<index_hint name="idx_list_order" type="use" />
<index_hint for="MYSQL">
<index table="documents" name="idx_list_order" type="USE" />
</index_hint>
<conditions>
<condition operation="in" column="module_srl" var="module_srl" filter="number" />
<condition operation="notin" column="module_srl" var="exclude_module_srl" filter="number" pipe="and" />