summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2016-01-07 16:52:20 +0100
committerAndrey Andreev <narf@devilix.net>2016-01-07 16:52:20 +0100
commit0a9cc835b4ec7e85e0ccac04000fa889a599126e (patch)
treec184424af29b1b2693ad4e5114863f4f381bb6b0
parent2d2880dfa6976fbd38ad033765473fd1a8f0bc85 (diff)
MySQL stricton again ... remove the version condition
Ref: #4349
-rw-r--r--system/database/drivers/mysql/mysql_driver.php2
-rw-r--r--system/database/drivers/mysqli/mysqli_driver.php2
-rw-r--r--system/database/drivers/pdo/subdrivers/pdo_mysql_driver.php2
3 files changed, 3 insertions, 3 deletions
diff --git a/system/database/drivers/mysql/mysql_driver.php b/system/database/drivers/mysql/mysql_driver.php
index 2573e3c17..3a450ec4c 100644
--- a/system/database/drivers/mysql/mysql_driver.php
+++ b/system/database/drivers/mysql/mysql_driver.php
@@ -153,7 +153,7 @@ class CI_DB_mysql_driver extends CI_DB {
{
$this->simple_query('SET SESSION sql_mode = CONCAT(@@sql_mode, ",", "STRICT_ALL_TABLES")');
}
- elseif (version_compare($this->version(), '5.7', '>='))
+ else
{
$this->simple_query(
'SET SESSION sql_mode =
diff --git a/system/database/drivers/mysqli/mysqli_driver.php b/system/database/drivers/mysqli/mysqli_driver.php
index 397368b72..323a67f63 100644
--- a/system/database/drivers/mysqli/mysqli_driver.php
+++ b/system/database/drivers/mysqli/mysqli_driver.php
@@ -143,7 +143,7 @@ class CI_DB_mysqli_driver extends CI_DB {
{
$this->_mysqli->options(MYSQLI_INIT_COMMAND, 'SET SESSION sql_mode = CONCAT(@@sql_mode, ",", "STRICT_ALL_TABLES")');
}
- elseif (version_compare($this->version(), '5.7', '>='))
+ else
{
$this->_mysqli->options(MYSQLI_INIT_COMMAND,
'SET SESSION sql_mode =
diff --git a/system/database/drivers/pdo/subdrivers/pdo_mysql_driver.php b/system/database/drivers/pdo/subdrivers/pdo_mysql_driver.php
index 0886216e4..c230651dc 100644
--- a/system/database/drivers/pdo/subdrivers/pdo_mysql_driver.php
+++ b/system/database/drivers/pdo/subdrivers/pdo_mysql_driver.php
@@ -139,7 +139,7 @@ class CI_DB_pdo_mysql_driver extends CI_DB_pdo_driver {
{
$sql = 'CONCAT(@@sql_mode, ",", "STRICT_ALL_TABLES")';
}
- elseif (version_compare($this->version(), '5.7', '>='))
+ else
{
$sql = 'REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(
@@sql_mode,