diff options
| author | Thomas Steur <thomas.steur@gmail.com> | 2014-07-12 04:26:02 +0400 |
|---|---|---|
| committer | Thomas Steur <thomas.steur@gmail.com> | 2014-07-12 04:26:02 +0400 |
| commit | 3dcf8c383f95211a14344899221800aa55b742f6 (patch) | |
| tree | 9846ebb264f57c05ecf434d00c9ab31a37b9d7b8 /core/Db | |
| parent | 730766125728453808281d61bb0740fcba591dec (diff) | |
| parent | 305f16508662713f2e1247d5a1ee7708fa656d97 (diff) | |
Merge remote-tracking branch 'origin/master' into report_and_dimension_refactoring
Conflicts:
core/Updates/0.4.2.php
core/Updates/0.6.3.php
core/Updates/1.2-rc1.php
core/Updates/1.9-b9.php
core/Version.php
tests/PHPUnit/Fixture.php
tests/PHPUnit/Fixtures/UITestFixture.php
tests/PHPUnit/Integration/Core/JsProxyTest.php
Diffstat (limited to 'core/Db')
| -rw-r--r-- | core/Db/Schema/Mysql.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/Db/Schema/Mysql.php b/core/Db/Schema/Mysql.php index 80356c1794..76c7f17ce7 100644 --- a/core/Db/Schema/Mysql.php +++ b/core/Db/Schema/Mysql.php @@ -408,7 +408,7 @@ class Mysql implements SchemaInterface Db::exec($statement); } catch (Exception $e) { // mysql code error 1050:table already exists - // see bug #153 http://dev.piwik.org/trac/ticket/153 + // see bug #153 https://github.com/piwik/piwik/issues/153 if (!Db::get()->isErrNo($e, '1050')) { throw $e; } |