aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2012-02-21 20:33:13 +0100
committerNils Adermann <naderman@naderman.de>2012-02-21 20:33:13 +0100
commitc9b36c5a2e8466f88aa42d0e6736a461db356628 (patch)
tree25671d48d478bbd4024c875d6c4cb0d06ae2d6bb
parenta4090ba07c44000cf25c08c81b6e54bab88521c7 (diff)
parentcbd20c1bbe3b8b8c628dde77f8ddf1c159eedb1c (diff)
downloadforums-c9b36c5a2e8466f88aa42d0e6736a461db356628.tar
forums-c9b36c5a2e8466f88aa42d0e6736a461db356628.tar.gz
forums-c9b36c5a2e8466f88aa42d0e6736a461db356628.tar.bz2
forums-c9b36c5a2e8466f88aa42d0e6736a461db356628.tar.xz
forums-c9b36c5a2e8466f88aa42d0e6736a461db356628.zip
Merge remote-tracking branch 'github-igorw/extensions-tests-mysq55' into develop
* github-igorw/extensions-tests-mysq55: [ticket/10667] Fix tests under MySQL 5.5 strict mode
-rw-r--r--tests/extension/fixtures/extensions.xml3
-rw-r--r--tests/group_positions/fixtures/group_positions.xml4
2 files changed, 7 insertions, 0 deletions
diff --git a/tests/extension/fixtures/extensions.xml b/tests/extension/fixtures/extensions.xml
index 65cb71c7a4..6eb6fd11a5 100644
--- a/tests/extension/fixtures/extensions.xml
+++ b/tests/extension/fixtures/extensions.xml
@@ -3,13 +3,16 @@
<table name="phpbb_ext">
<column>ext_name</column>
<column>ext_active</column>
+ <column>ext_state</column>
<row>
<value>foo</value>
<value>1</value>
+ <value></value>
</row>
<row>
<value>vendor/moo</value>
<value>0</value>
+ <value></value>
</row>
</table>
</dataset>
diff --git a/tests/group_positions/fixtures/group_positions.xml b/tests/group_positions/fixtures/group_positions.xml
index 55b1c2e08d..00ea18fe4f 100644
--- a/tests/group_positions/fixtures/group_positions.xml
+++ b/tests/group_positions/fixtures/group_positions.xml
@@ -4,20 +4,24 @@
<column>group_id</column>
<column>group_teampage</column>
<column>group_legend</column>
+ <column>group_desc</column>
<row>
<value>1</value>
<value>0</value>
<value>0</value>
+ <value></value>
</row>
<row>
<value>2</value>
<value>1</value>
<value>0</value>
+ <value></value>
</row>
<row>
<value>3</value>
<value>2</value>
<value>1</value>
+ <value></value>
</row>
</table>
</dataset>