diff options
| author | Andrey Andreev <narf@devilix.net> | 2016-10-28 17:34:05 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2016-10-28 17:34:05 +0200 |
| commit | 67b40a561111a5a65faa245cd4c575e8d945cfb8 (patch) | |
| tree | 4c9d3c66d666f3a781299e11806a5ff1d11fc3ba /user_guide_src/source/libraries | |
| parent | df34b547c97ba1ce1ddb819495d299cb845a87de (diff) | |
| parent | 499c6080cd41927df088206155e4055d4da3e58e (diff) | |
Merge branch '3.1-stable' into develop
Resolved conflicts:
system/core/CodeIgniter.php
user_guide_src/source/changelog.rst
user_guide_src/source/conf.py
user_guide_src/source/installation/downloads.rst
user_guide_src/source/installation/upgrading.rst
user_guide_src/source/libraries/form_validation.rst
Diffstat (limited to 'user_guide_src/source/libraries')
| -rw-r--r-- | user_guide_src/source/libraries/sessions.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/user_guide_src/source/libraries/sessions.rst b/user_guide_src/source/libraries/sessions.rst index 082828c4e..a95cd5a19 100644 --- a/user_guide_src/source/libraries/sessions.rst +++ b/user_guide_src/source/libraries/sessions.rst @@ -594,7 +594,7 @@ And then of course, create the database table ... For MySQL:: CREATE TABLE IF NOT EXISTS `ci_sessions` ( - `id` varchar(40) NOT NULL, + `id` varchar(128) NOT NULL, `ip_address` varchar(45) NOT NULL, `timestamp` int(10) unsigned DEFAULT 0 NOT NULL, `data` blob NOT NULL, @@ -604,7 +604,7 @@ For MySQL:: For PostgreSQL:: CREATE TABLE "ci_sessions" ( - "id" varchar(40) NOT NULL, + "id" varchar(128) NOT NULL, "ip_address" varchar(45) NOT NULL, "timestamp" bigint DEFAULT 0 NOT NULL, "data" text DEFAULT '' NOT NULL |