diff options
| author | ninadsp <ninadsp16289@gmail.com> | 2010-07-29 17:47:25 +0400 |
|---|---|---|
| committer | ninadsp <ninadsp16289@gmail.com> | 2010-07-29 17:47:25 +0400 |
| commit | a2f78a6d38f74f0cc62f2a5837e682901331c21e (patch) | |
| tree | ceab0c3ae4efe05fe345f270bdf4d236d24ef63d /db_create.php | |
| parent | 2bec345a46d11293b93c2b06bf8009c913cde8fb (diff) | |
| parent | d0fc397fe1c474150883e85a791a012a7ae03380 (diff) | |
Resolve merge conflicts for upstream merge
Diffstat (limited to 'db_create.php')
| -rwxr-xr-x | db_create.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/db_create.php b/db_create.php index 8d67dde49c..69e12153da 100755 --- a/db_create.php +++ b/db_create.php @@ -11,6 +11,7 @@ require_once './libraries/common.inc.php'; $GLOBALS['js_include'][] = 'functions.js'; $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js'; + require_once './libraries/mysql_charsets.lib.php'; PMA_checkParameters(array('new_db')); |