July 2010 - Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_5RC1-8-g049fc7f
by Michal Čihař 26 Jul '10

26 Jul '10

The branch, QA_3_3 has been updated via 049fc7fef7548c2ba603196937c6dcaf9ff9bf00 (commit) via 83d458aa05286397198bcd0674eeeb610849ef5a (commit) from 053d6ca88e1a72a839f517b22f3389f59575baf7 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 3 ++- libraries/common.lib.php | 3 ++- libraries/dbi/mysqli.dbi.lib.php | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index d7cb453..748e243 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,8 +6,9 @@ $Id$ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/… $ 3.3.6.0 (not yet released) -- bug #3031705 [core] Do not use CONCAT for DECIMAL fields. - bug #3033063 [core] Navi gets wrong db name +- bug #3031705 [core] Fix generating condition for real numbers by comparing + them to string. 3.3.5.0 (not yet released) - patch #2932113 [information_schema] Slow export when having lots of diff --git a/libraries/common.lib.php b/libraries/common.lib.php index c62d518..8118598 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -2025,7 +2025,8 @@ function PMA_getUniqueCondition($handle, $fields_cnt, $fields_meta, $row, $force $condition .= 'IS NULL AND'; } else { // timestamp is numeric on some MySQL 4.1 - if ($meta->numeric && $meta->type != 'timestamp') { + // for real we use CONCAT above and it should compare to string + if ($meta->numeric && $meta->type != 'timestamp' && $meta->type != 'real') { $condition .= '= ' . $row[$i] . ' AND'; } elseif (($meta->type == 'blob' || $meta->type == 'string') // hexify only if this is a true not empty BLOB or a BINARY diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php index fd35eb4..913bce6 100644 --- a/libraries/dbi/mysqli.dbi.lib.php +++ b/libraries/dbi/mysqli.dbi.lib.php @@ -493,8 +493,8 @@ function PMA_DBI_get_fields_meta($result) { // Build an associative array for a type look up $typeAr = array(); - $typeAr[MYSQLI_TYPE_DECIMAL] = 'decimal'; - $typeAr[MYSQLI_TYPE_NEWDECIMAL] = 'decimal'; + $typeAr[MYSQLI_TYPE_DECIMAL] = 'real'; + $typeAr[MYSQLI_TYPE_NEWDECIMAL] = 'real'; $typeAr[MYSQLI_TYPE_BIT] = 'int'; $typeAr[MYSQLI_TYPE_TINY] = 'int'; $typeAr[MYSQLI_TYPE_SHORT] = 'int'; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5RC1-5936-g15dfc48
by Michal Čihař 26 Jul '10

26 Jul '10

The branch, master has been updated via 15dfc4879ec8f8273bdec711597e118bd938653c (commit) from 412bdd6515420d7410c8265e7ce4a99a0787d438 (commit) - Log ----------------------------------------------------------------- commit 15dfc4879ec8f8273bdec711597e118bd938653c Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Jul 26 13:29:29 2010 +0200 Drop collation description cache. It really does not improve performance much and it just consumes memory. Anyway on most pages this function is called just once for each collation, so all it does is filling up the cache but never using it. ----------------------------------------------------------------------- Summary of changes: libraries/mysql_charsets.lib.php | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/libraries/mysql_charsets.lib.php b/libraries/mysql_charsets.lib.php index 303c637..db31ece 100644 --- a/libraries/mysql_charsets.lib.php +++ b/libraries/mysql_charsets.lib.php @@ -198,14 +198,6 @@ function PMA_getServerCollation() { * @return string collation description */ function PMA_getCollationDescr($collation) { - static $collation_cache; - - if (!is_array($collation_cache)) { - $collation_cache = array(); - } elseif (isset($collation_cache[$collation])) { - return $collation_cache[$collation]; - } - if ($collation == 'binary') { return __('Binary'); } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5RC1-5935-g412bdd6
by Michal Čihař 26 Jul '10

26 Jul '10

The branch, master has been updated via 412bdd6515420d7410c8265e7ce4a99a0787d438 (commit) via 815aceda7b01a36423d205cc12332e26204ede25 (commit) via 3954599b68df96ac017abb26213ff11e97e593a9 (commit) via d18869b2c93272efe86a693df5fddc3c43a23882 (commit) via 35171f4c887bbc06818b8f68d7682b3a165805bc (commit) via e1e57f4a0d127221faa223e2c2b4b83246ea62d6 (commit) via 73eaafe0c6bc40f4c6746ad28d4017cc464c33ec (commit) via 0617cdb0c564bcb52858f34c5977316f4a07c47b (commit) via f37c7cb55cecbf9b7c68ff3c93b135b9d23afbc5 (commit) via 0a11d949cb603a07f4b9aee9ed2dfe37ddbfeaa1 (commit) via c0560b64f5b28c35d5597fb4fc7e8fb4238dfdc0 (commit) via e491ab718de9d6cc8828e041881bd79bae7bf9c1 (commit) via 629af6d8cec049860bc79d403abde036e35b1b48 (commit) via 21d4df09ba520cefa0a9b202734d11e7800d2408 (commit) via 16d651fa09a00323d09c24734126903eba0b53b5 (commit) from cdcc5d74437e0cf21e797fb5935bce39cbf540f7 (commit) - Log ----------------------------------------------------------------- commit 412bdd6515420d7410c8265e7ce4a99a0787d438 Author: gheni <gheni(a)yahoo.cn> Date: Mon Jul 26 05:01:31 2010 +0200 Translation update done using Pootle. commit 815aceda7b01a36423d205cc12332e26204ede25 Author: gheni <gheni(a)yahoo.cn> Date: Mon Jul 26 05:00:08 2010 +0200 Translation update done using Pootle. commit 3954599b68df96ac017abb26213ff11e97e593a9 Author: gheni <gheni(a)yahoo.cn> Date: Mon Jul 26 04:59:59 2010 +0200 Translation update done using Pootle. commit d18869b2c93272efe86a693df5fddc3c43a23882 Author: gheni <gheni(a)yahoo.cn> Date: Mon Jul 26 04:59:54 2010 +0200 Translation update done using Pootle. commit 35171f4c887bbc06818b8f68d7682b3a165805bc Author: gheni <gheni(a)yahoo.cn> Date: Mon Jul 26 04:58:23 2010 +0200 Translation update done using Pootle. commit e1e57f4a0d127221faa223e2c2b4b83246ea62d6 Author: gheni <gheni(a)yahoo.cn> Date: Mon Jul 26 04:56:36 2010 +0200 Translation update done using Pootle. commit 73eaafe0c6bc40f4c6746ad28d4017cc464c33ec Author: gheni <gheni(a)yahoo.cn> Date: Mon Jul 26 04:54:47 2010 +0200 Translation update done using Pootle. commit 0617cdb0c564bcb52858f34c5977316f4a07c47b Author: gheni <gheni(a)yahoo.cn> Date: Mon Jul 26 04:53:44 2010 +0200 Translation update done using Pootle. commit f37c7cb55cecbf9b7c68ff3c93b135b9d23afbc5 Author: gheni <gheni(a)yahoo.cn> Date: Mon Jul 26 04:53:15 2010 +0200 Translation update done using Pootle. commit 0a11d949cb603a07f4b9aee9ed2dfe37ddbfeaa1 Author: gheni <gheni(a)yahoo.cn> Date: Mon Jul 26 04:52:34 2010 +0200 Translation update done using Pootle. commit c0560b64f5b28c35d5597fb4fc7e8fb4238dfdc0 Author: gheni <gheni(a)yahoo.cn> Date: Mon Jul 26 04:52:29 2010 +0200 Translation update done using Pootle. commit e491ab718de9d6cc8828e041881bd79bae7bf9c1 Author: gheni <gheni(a)yahoo.cn> Date: Mon Jul 26 04:52:02 2010 +0200 Translation update done using Pootle. commit 629af6d8cec049860bc79d403abde036e35b1b48 Author: gheni <gheni(a)yahoo.cn> Date: Mon Jul 26 04:51:03 2010 +0200 Translation update done using Pootle. commit 21d4df09ba520cefa0a9b202734d11e7800d2408 Author: gheni <gheni(a)yahoo.cn> Date: Mon Jul 26 04:50:04 2010 +0200 Translation update done using Pootle. commit 16d651fa09a00323d09c24734126903eba0b53b5 Author: gheni <gheni(a)yahoo.cn> Date: Mon Jul 26 04:49:38 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/ug.po | 29 +++++++++++++++++------------ 1 files changed, 17 insertions(+), 12 deletions(-) diff --git a/po/ug.po b/po/ug.po index db747c5..be7308d 100644 --- a/po/ug.po +++ b/po/ug.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-07-21 13:53+0200\n" -"PO-Revision-Date: 2010-07-23 08:08+0200\n" +"PO-Revision-Date: 2010-07-26 05:01+0200\n" "Last-Translator: <gheni(a)yahoo.cn>\n" "Language-Team: Uyghur <ug(a)li.org>\n" "Language: ug\n" @@ -1348,6 +1348,8 @@ msgid "" "The indexes %1$s and %2$s seem to be equal and one of them could possibly be " "removed." msgstr "" +"The indexes %1$s and %2$s seem to be equal and one of them could possibly be " +"removed." #: libraries/List_Database.class.php:430 libraries/server_links.inc.php:40 #: server_databases.php:87 server_privileges.php:1652 @@ -1366,22 +1368,19 @@ msgstr "خاتالىق" #, php-format msgid "%1$d row affected." msgid_plural "%1$d rows affected." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%1$d row affected." #: libraries/Message.class.php:300 #, php-format msgid "%1$d row deleted." msgid_plural "%1$d rows deleted." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%1$d row deleted." #: libraries/Message.class.php:319 #, php-format msgid "%1$d row inserted." msgid_plural "%1$d rows inserted." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%1$d قۇر قوشۇلدى." #: libraries/StorageEngine.class.php:196 msgid "" @@ -1424,7 +1423,7 @@ msgstr "%1$s بۇ جەدۋەل ئىسمىنى %2$s غا ئۆزگەرتىش غە #: libraries/Theme.class.php:160 #, php-format msgid "No valid image path for theme %s found!" -msgstr "" +msgstr "No valid image path for theme %s found!" #: libraries/Theme.class.php:380 msgid "No preview available." @@ -1447,7 +1446,7 @@ msgstr "تېما %s تېپىلمىدى!" #: libraries/Theme_Manager.class.php:220 #, php-format msgid "Theme path not found for theme %s!" -msgstr "" +msgstr "ماۋزۇ %s تېپىلمىدى." #: libraries/Theme_Manager.class.php:296 test/theme.php:160 themes.php:20 #: themes.php:40 @@ -1456,7 +1455,7 @@ msgstr "تېما \\ ئۇسلۇب" #: libraries/auth/config.auth.lib.php:76 msgid "Cannot connect: invalid settings." -msgstr "" +msgstr "ئۇلىنالمىدى: ئۈنۈمسىز تەڭشەك." #: libraries/auth/config.auth.lib.php:91 #: libraries/auth/cookie.auth.lib.php:205 libraries/auth/http.auth.lib.php:64 @@ -1471,6 +1470,8 @@ msgid "" "You probably did not create a configuration file. You might want to use the " "%1$ssetup script%2$s to create one." msgstr "" +"You probably did not create a configuration file. You might want to use the " +"%1$ssetup script%2$s to create one." #: libraries/auth/config.auth.lib.php:115 msgid "" @@ -1479,6 +1480,10 @@ msgid "" "configuration and make sure that they correspond to the information given by " "the administrator of the MySQL server." msgstr "" +"phpMyAdmin tried to connect to the MySQL server, and the server rejected the " +"connection. You should check the host, username and password in your " +"configuration and make sure that they correspond to the information given by " +"the administrator of the MySQL server." #: libraries/auth/cookie.auth.lib.php:230 msgid "Log in" @@ -1494,7 +1499,7 @@ msgstr "phpMyAdmin ھۆججىتى" #: libraries/auth/cookie.auth.lib.php:244 #: libraries/auth/cookie.auth.lib.php:245 msgid "You can enter hostname/IP address and port separated by space." -msgstr "" +msgstr "You can enter hostname/IP address and port separated by space." #: libraries/auth/cookie.auth.lib.php:244 msgid "Server:" @@ -1514,7 +1519,7 @@ msgstr "مۇلازىمىتېر تاللاش" #: libraries/auth/cookie.auth.lib.php:306 libraries/header.inc.php:58 msgid "Cookies must be enabled past this point." -msgstr "" +msgstr "Cookies نى قوزغاتقاندىن كېيىن ئاندىن كېرىڭ." #: libraries/auth/cookie.auth.lib.php:638 #: libraries/auth/signon.auth.lib.php:180 hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5RC1-5920-gcdcc5d7
by Marc Delisle 25 Jul '10

25 Jul '10

The branch, master has been updated via cdcc5d74437e0cf21e797fb5935bce39cbf540f7 (commit) via 053d6ca88e1a72a839f517b22f3389f59575baf7 (commit) via 368cf8d74f77cf71d279c1c87f4feac4c862c44f (commit) from 0a05b396b366460ca1ffaae2cc3ba3bd5404e1de (commit) - Log ----------------------------------------------------------------- commit cdcc5d74437e0cf21e797fb5935bce39cbf540f7 Merge: 0a05b396b366460ca1ffaae2cc3ba3bd5404e1de 053d6ca88e1a72a839f517b22f3389f59575baf7 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Jul 25 13:33:03 2010 -0400 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + server_privileges.php | 5 +++++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4e2e9ae..dfdf92f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -98,6 +98,7 @@ $Id$ 3.3.6.0 (not yet released) - bug #3031705 [core] Do not use CONCAT for DECIMAL fields. +- bug #3033063 [core] Navi gets wrong db name 3.3.5.0 (not yet released) - patch #2932113 [information_schema] Slow export when having lots of diff --git a/server_privileges.php b/server_privileges.php index bd2ddb3..9577d77 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -971,6 +971,8 @@ if (isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) { $message = PMA_Message::rawError(PMA_DBI_getError()); break; } + // this is needed in case tracking is on: + $GLOBALS['db'] = $username; $GLOBALS['reload'] = TRUE; PMA_reloadNavigation(); @@ -1284,6 +1286,9 @@ if (isset($_REQUEST['delete']) || (isset($_REQUEST['change_copy']) && $_REQUEST[ } } } + // tracking sets this, causing the deleted db to be shown in navi + unset($GLOBALS['db']); + $sql_query = join("\n", $queries); if (! empty($drop_user_error)) { $message = PMA_Message::rawError($drop_user_error); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_5RC1-6-g053d6ca
by Marc Delisle 25 Jul '10

25 Jul '10

The branch, QA_3_3 has been updated via 053d6ca88e1a72a839f517b22f3389f59575baf7 (commit) from 368cf8d74f77cf71d279c1c87f4feac4c862c44f (commit) - Log ----------------------------------------------------------------- commit 053d6ca88e1a72a839f517b22f3389f59575baf7 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Jul 25 13:32:35 2010 -0400 bug #3033063 [core] Navi gets wrong db name ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + server_privileges.php | 5 +++++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index fc317e9..d7cb453 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA 3.3.6.0 (not yet released) - bug #3031705 [core] Do not use CONCAT for DECIMAL fields. +- bug #3033063 [core] Navi gets wrong db name 3.3.5.0 (not yet released) - patch #2932113 [information_schema] Slow export when having lots of diff --git a/server_privileges.php b/server_privileges.php index fd2796f..3f14c3f 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -942,6 +942,8 @@ if (isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) { $message = PMA_Message::rawError(PMA_DBI_getError()); break; } + // this is needed in case tracking is on: + $GLOBALS['db'] = $username; $GLOBALS['reload'] = TRUE; PMA_reloadNavigation(); @@ -1255,6 +1257,9 @@ if (isset($_REQUEST['delete']) || (isset($_REQUEST['change_copy']) && $_REQUEST[ } } } + // tracking sets this, causing the deleted db to be shown in navi + unset($GLOBALS['db']); + $sql_query = join("\n", $queries); if (! empty($drop_user_error)) { $message = PMA_Message::rawError($drop_user_error); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5RC1-5917-g0a05b39
by Marc Delisle 25 Jul '10

25 Jul '10

The branch, master has been updated via 0a05b396b366460ca1ffaae2cc3ba3bd5404e1de (commit) via 58021a8e6c5c9fe7963864480c365f8f49f390b4 (commit) from 084c0dbcf51dea488d99b7bfffffa23832ace4f3 (commit) - Log ----------------------------------------------------------------- commit 0a05b396b366460ca1ffaae2cc3ba3bd5404e1de Merge: 084c0dbcf51dea488d99b7bfffffa23832ace4f3 58021a8e6c5c9fe7963864480c365f8f49f390b4 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Jul 25 07:54:43 2010 -0400 Merge branch 'MAINT_3_3_5' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + scripts/create_tables.sql | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index bc2ec78..4e2e9ae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -114,6 +114,7 @@ $Id$ - bug [export] CSV for MS Excel (Windows) should have semi-colon as separator - [core] Update library PHPExcel to version 1.7.3c - bug #2994885, bug #3029168 [import] Convert Excel column name correctly +- bug [scripts] MySQL 5.5.5 does not accept TIMESTAMP(14) in create_tables.sql 3.3.4.0 (2010-06-28) - bug #2996161 [import] properly escape import value diff --git a/scripts/create_tables.sql b/scripts/create_tables.sql index bcb8b35..e4d0fc8 100644 --- a/scripts/create_tables.sql +++ b/scripts/create_tables.sql @@ -80,7 +80,7 @@ CREATE TABLE IF NOT EXISTS `pma_history` ( `username` varchar(64) NOT NULL default '', `db` varchar(64) NOT NULL default '', `table` varchar(64) NOT NULL default '', - `timevalue` timestamp(14) NOT NULL, + `timevalue` timestamp NOT NULL, `sqlquery` text NOT NULL, PRIMARY KEY (`id`), KEY `username` (`username`,`db`,`table`,`timevalue`) hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_5RC1-5-g368cf8d
by Marc Delisle 25 Jul '10

25 Jul '10

The branch, QA_3_3 has been updated via 368cf8d74f77cf71d279c1c87f4feac4c862c44f (commit) via 58021a8e6c5c9fe7963864480c365f8f49f390b4 (commit) from 8b592a365bc46992223ea041dce3e992dba3c839 (commit) - Log ----------------------------------------------------------------- commit 368cf8d74f77cf71d279c1c87f4feac4c862c44f Merge: 8b592a365bc46992223ea041dce3e992dba3c839 58021a8e6c5c9fe7963864480c365f8f49f390b4 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Jul 25 07:53:41 2010 -0400 Merge branch 'MAINT_3_3_5' into QA_3_3 ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + scripts/create_tables.sql | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5323907..fc317e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23,6 +23,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug [export] CSV for MS Excel (Windows) should have semi-colon as separator - [core] Update library PHPExcel to version 1.7.3c - bug #2994885, bug #3029168 [import] Convert Excel column name correctly +- bug [scripts] MySQL 5.5.5 does not accept TIMESTAMP(14) in create_tables.sql 3.3.4.0 (2010-06-28) - bug #2996161 [import] properly escape import value diff --git a/scripts/create_tables.sql b/scripts/create_tables.sql index bcb8b35..e4d0fc8 100644 --- a/scripts/create_tables.sql +++ b/scripts/create_tables.sql @@ -80,7 +80,7 @@ CREATE TABLE IF NOT EXISTS `pma_history` ( `username` varchar(64) NOT NULL default '', `db` varchar(64) NOT NULL default '', `table` varchar(64) NOT NULL default '', - `timevalue` timestamp(14) NOT NULL, + `timevalue` timestamp NOT NULL, `sqlquery` text NOT NULL, PRIMARY KEY (`id`), KEY `username` (`username`,`db`,`table`,`timevalue`) hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_3_5, updated. RELEASE_3_3_5RC1-1-g58021a8
by Marc Delisle 25 Jul '10

25 Jul '10

The branch, MAINT_3_3_5 has been updated via 58021a8e6c5c9fe7963864480c365f8f49f390b4 (commit) from 31c18cbe11c929b8ff7b95d2bcf478c8c6212d65 (commit) - Log ----------------------------------------------------------------- commit 58021a8e6c5c9fe7963864480c365f8f49f390b4 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Jul 25 07:53:07 2010 -0400 bug [scripts] MySQL 5.5.5 does not accept TIMESTAMP(14) in create_tables.sql ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + scripts/create_tables.sql | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2b0c93f..555c6f2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug [export] CSV for MS Excel (Windows) should have semi-colon as separator - [core] Update library PHPExcel to version 1.7.3c - bug #2994885, bug #3029168 [import] Convert Excel column name correctly +- bug [scripts] MySQL 5.5.5 does not accept TIMESTAMP(14) in create_tables.sql 3.3.4.0 (2010-06-28) - bug #2996161 [import] properly escape import value diff --git a/scripts/create_tables.sql b/scripts/create_tables.sql index bcb8b35..e4d0fc8 100644 --- a/scripts/create_tables.sql +++ b/scripts/create_tables.sql @@ -80,7 +80,7 @@ CREATE TABLE IF NOT EXISTS `pma_history` ( `username` varchar(64) NOT NULL default '', `db` varchar(64) NOT NULL default '', `table` varchar(64) NOT NULL default '', - `timevalue` timestamp(14) NOT NULL, + `timevalue` timestamp NOT NULL, `sqlquery` text NOT NULL, PRIMARY KEY (`id`), KEY `username` (`username`,`db`,`table`,`timevalue`) hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5RC1-5915-g084c0db
by Marc Delisle 24 Jul '10

24 Jul '10

The branch, master has been updated via 084c0dbcf51dea488d99b7bfffffa23832ace4f3 (commit) from aec1adb0e077f2a9521bfa9ed367e9d5b6911042 (commit) - Log ----------------------------------------------------------------- commit 084c0dbcf51dea488d99b7bfffffa23832ace4f3 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jul 24 08:11:48 2010 -0400 functions.js included automatically ----------------------------------------------------------------------- Summary of changes: chk_rel.php | 1 - db_create.php | 1 - export.php | 5 ----- import.php | 1 - libraries/db_common.inc.php | 1 - libraries/header_scripts.inc.php | 1 + libraries/mult_submits.inc.php | 1 - libraries/tbl_links.inc.php | 1 - querywindow.php | 1 - server_databases.php | 2 -- server_export.php | 2 -- server_privileges.php | 1 - server_replication.php | 1 - server_sql.php | 1 - server_synchronize.php | 1 - sql.php | 5 ----- tbl_addfield.php | 1 - tbl_alter.php | 1 - tbl_create.php | 1 - tbl_indexes.php | 1 - tbl_replace.php | 2 -- tbl_row_action.php | 1 - tbl_tracking.php | 1 - 23 files changed, 1 insertions(+), 33 deletions(-) diff --git a/chk_rel.php b/chk_rel.php index 38ca5c1..323befd 100644 --- a/chk_rel.php +++ b/chk_rel.php @@ -9,7 +9,6 @@ * Gets some core libraries */ require_once './libraries/common.inc.php'; -$GLOBALS['js_include'][] = 'functions.js'; require_once './libraries/header.inc.php'; require_once './libraries/relation.lib.php'; diff --git a/db_create.php b/db_create.php index 9b1959a..50e4cf6 100644 --- a/db_create.php +++ b/db_create.php @@ -9,7 +9,6 @@ * Gets some core libraries */ require_once './libraries/common.inc.php'; -$GLOBALS['js_include'][] = 'functions.js'; require_once './libraries/mysql_charsets.lib.php'; PMA_checkParameters(array('new_db')); diff --git a/export.php b/export.php index 2db992d..64ae7d3 100644 --- a/export.php +++ b/export.php @@ -59,7 +59,6 @@ if (empty($_REQUEST['asfile'])) { // Does export require to be into file? if (isset($export_list[$type]['force_file']) && ! $asfile) { $message = PMA_Message::error(__('Selected export type has to be saved in file!')); - $GLOBALS['js_include'][] = 'functions.js'; require_once './libraries/header.inc.php'; if ($export_type == 'server') { $active_page = 'server_export.php'; @@ -298,7 +297,6 @@ if ($save_on_server) { } } if (isset($message)) { - $GLOBALS['js_include'][] = 'functions.js'; require_once './libraries/header.inc.php'; if ($export_type == 'server') { $active_page = 'server_export.php'; @@ -350,7 +348,6 @@ if (!$save_on_server) { $num_tables = count($tables); if ($num_tables == 0) { $message = PMA_Message::error(__('No tables found in database.')); - $GLOBALS['js_include'][] = 'functions.js'; require_once './libraries/header.inc.php'; $active_page = 'db_export.php'; require './db_export.php'; @@ -565,7 +562,6 @@ if (!PMA_exportFooter()) { // End of fake loop if ($save_on_server && isset($message)) { - $GLOBALS['js_include'][] = 'functions.js'; require_once './libraries/header.inc.php'; if ($export_type == 'server') { $active_page = 'server_export.php'; @@ -622,7 +618,6 @@ if (!empty($asfile)) { $message = new PMA_Message(__('Dump has been saved to file %s.'), PMA_Message::SUCCESS, $save_filename); } - $GLOBALS['js_include'][] = 'functions.js'; require_once './libraries/header.inc.php'; if ($export_type == 'server') { $active_page = 'server_export.php'; diff --git a/import.php b/import.php index b123064..dbc4d56 100644 --- a/import.php +++ b/import.php @@ -12,7 +12,6 @@ */ require_once './libraries/common.inc.php'; //require_once './libraries/display_import_functions.lib.php'; -$GLOBALS['js_include'][] = 'functions.js'; // reset import messages for ajax request $_SESSION['Import_message']['message'] = null; diff --git a/libraries/db_common.inc.php b/libraries/db_common.inc.php index b9a4a97..ea019cb 100644 --- a/libraries/db_common.inc.php +++ b/libraries/db_common.inc.php @@ -65,7 +65,6 @@ if (isset($submitcollation) && !empty($db_collation)) { unset($db_charset, $db_collation); } -$GLOBALS['js_include'][] = 'functions.js'; require_once './libraries/header.inc.php'; /** diff --git a/libraries/header_scripts.inc.php b/libraries/header_scripts.inc.php index a292d0f..8021c34 100644 --- a/libraries/header_scripts.inc.php +++ b/libraries/header_scripts.inc.php @@ -30,6 +30,7 @@ $title = PMA_expandUserString( // here, the function does not exist with this configuration: $cfg['ServerDefault'] = 0; $is_superuser = function_exists('PMA_isSuperuser') && PMA_isSuperuser(); +$GLOBALS['js_include'][] = 'functions.js'; $GLOBALS['js_include'][] = 'tooltip.js'; $params = array('lang' => $GLOBALS['lang']); if (isset($GLOBALS['db'])) { diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php index 0b3413b..2fab680 100644 --- a/libraries/mult_submits.inc.php +++ b/libraries/mult_submits.inc.php @@ -127,7 +127,6 @@ if (! empty($submit_mult) * Displays the confirmation form if required */ if (!empty($submit_mult) && !empty($what)) { - $GLOBALS['js_include'][] = 'functions.js'; unset($message); require_once './libraries/header.inc.php'; diff --git a/libraries/tbl_links.inc.php b/libraries/tbl_links.inc.php index 1f695a5..ef61293 100644 --- a/libraries/tbl_links.inc.php +++ b/libraries/tbl_links.inc.php @@ -37,7 +37,6 @@ $err_url = $cfg['DefaultTabTable'] . PMA_generate_common_url($url_params); /** * Displays headers */ -$GLOBALS['js_include'][] = 'functions.js'; require_once './libraries/header.inc.php'; /** diff --git a/querywindow.php b/querywindow.php index 7b2b08d..84b0e82 100644 --- a/querywindow.php +++ b/querywindow.php @@ -155,7 +155,6 @@ $sql_query = ''; * prepare JavaScript functionality */ $js_include[] = 'common.js'; -$js_include[] = 'functions.js'; $js_include[] = 'querywindow.js'; if (PMA_isValid($_REQUEST['auto_commit'], 'identical', 'true')) { diff --git a/server_databases.php b/server_databases.php index 0c7d598..16b2cdc 100644 --- a/server_databases.php +++ b/server_databases.php @@ -10,8 +10,6 @@ */ require_once './libraries/common.inc.php'; - -$GLOBALS['js_include'][] = 'functions.js'; require './libraries/server_common.inc.php'; require './libraries/replication.inc.php'; diff --git a/server_export.php b/server_export.php index 9d78ce7..f9808d8 100644 --- a/server_export.php +++ b/server_export.php @@ -10,8 +10,6 @@ */ require_once './libraries/common.inc.php'; -$GLOBALS['js_include'][] = 'functions.js'; - /** * Displays the links */ diff --git a/server_privileges.php b/server_privileges.php index a909ef5..bd2ddb3 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -14,7 +14,6 @@ require_once './libraries/common.inc.php'; * Does the common work */ $GLOBALS['js_include'][] = 'server_privileges.js'; -$GLOBALS['js_include'][] = 'functions.js'; $GLOBALS['js_include'][] = 'password_generation.js'; require './libraries/server_common.inc.php'; diff --git a/server_replication.php b/server_replication.php index 1dbd42e..9ac1816 100644 --- a/server_replication.php +++ b/server_replication.php @@ -14,7 +14,6 @@ require_once './libraries/common.inc.php'; * Does the common work */ $GLOBALS['js_include'][] = 'server_privileges.js'; -$GLOBALS['js_include'][] = 'functions.js'; $GLOBALS['js_include'][] = 'replication.js'; require './libraries/server_common.inc.php'; diff --git a/server_sql.php b/server_sql.php index 1b8027c..73c1379 100644 --- a/server_sql.php +++ b/server_sql.php @@ -13,7 +13,6 @@ require_once './libraries/common.inc.php'; /** * Does the common work */ -$GLOBALS['js_include'][] = 'functions.js'; require_once './libraries/server_common.inc.php'; require_once './libraries/sql_query_form.lib.php'; diff --git a/server_synchronize.php b/server_synchronize.php index 1272dda..6f0941b 100644 --- a/server_synchronize.php +++ b/server_synchronize.php @@ -14,7 +14,6 @@ require_once './libraries/common.inc.php'; /** * Does the common work */ -$GLOBALS['js_include'][] = 'functions.js'; $GLOBALS['js_include'][] = 'server_synchronize.js'; require_once './libraries/server_common.inc.php'; diff --git a/sql.php b/sql.php index c4ae9ff..9175532 100644 --- a/sql.php +++ b/sql.php @@ -545,10 +545,6 @@ if (0 == $num_rows || $is_affected) { $goto = 'main.php'; } // Loads to target script - if (strpos($goto, 'db_') === 0 - || strpos($goto, 'tbl_') === 0) { - $GLOBALS['js_include'][] = 'functions.js'; - } if ($goto != 'main.php') { require_once './libraries/header.inc.php'; } @@ -573,7 +569,6 @@ else { if (isset($printview) && $printview == '1') { require_once './libraries/header_printview.inc.php'; } else { - $GLOBALS['js_include'][] = 'functions.js'; unset($message); if (strlen($table)) { require './libraries/tbl_common.php'; diff --git a/tbl_addfield.php b/tbl_addfield.php index b61327f..6d6c14a 100644 --- a/tbl_addfield.php +++ b/tbl_addfield.php @@ -11,7 +11,6 @@ require_once './libraries/common.inc.php'; require_once './libraries/Table.class.php'; -$GLOBALS['js_include'][] = 'functions.js'; require_once './libraries/header.inc.php'; // Check parameters diff --git a/tbl_alter.php b/tbl_alter.php index 7f81c41..423156e 100644 --- a/tbl_alter.php +++ b/tbl_alter.php @@ -15,7 +15,6 @@ require_once './libraries/common.inc.php'; require_once './libraries/Table.class.php'; -$GLOBALS['js_include'][] = 'functions.js'; require_once './libraries/header.inc.php'; // Check parameters diff --git a/tbl_create.php b/tbl_create.php index 8f77bb3..fc1119b 100644 --- a/tbl_create.php +++ b/tbl_create.php @@ -36,7 +36,6 @@ require_once './libraries/common.inc.php'; require_once './libraries/Table.class.php'; -$GLOBALS['js_include'][] = 'functions.js'; $action = 'tbl_create.php'; require_once './libraries/header.inc.php'; diff --git a/tbl_indexes.php b/tbl_indexes.php index 172191a..eb6deb9 100644 --- a/tbl_indexes.php +++ b/tbl_indexes.php @@ -111,7 +111,6 @@ if (isset($_REQUEST['do_save_data'])) { */ // Displays headers (if needed) -$GLOBALS['js_include'][] = 'functions.js'; $GLOBALS['js_include'][] = 'indexes.js'; require_once './libraries/tbl_info.inc.php'; diff --git a/tbl_replace.php b/tbl_replace.php index bcf64af..92331b9 100644 --- a/tbl_replace.php +++ b/tbl_replace.php @@ -328,7 +328,6 @@ if ($is_insert && count($value_sets) > 0) { } elseif (empty($query)) { // No change -> move back to the calling script $message = PMA_Message::success(__('No change')); - $GLOBALS['js_include'][] = 'functions.js'; $active_page = $goto_include; require_once './libraries/header.inc.php'; require './' . PMA_securePath($goto_include); @@ -428,7 +427,6 @@ if (isset($return_to_sql_query)) { } $GLOBALS['js_include'][] = 'tbl_change.js'; -$GLOBALS['js_include'][] = 'functions.js'; // in case we call sql.php which needs those: $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js'; diff --git a/tbl_row_action.php b/tbl_row_action.php index 356ad57..62fc204 100644 --- a/tbl_row_action.php +++ b/tbl_row_action.php @@ -71,7 +71,6 @@ switch($submit_mult) { } $GLOBALS['js_include'][] = 'tbl_change.js'; -$GLOBALS['js_include'][] = 'functions.js'; require_once './libraries/header.inc.php'; diff --git a/tbl_tracking.php b/tbl_tracking.php index 698076a..6312262 100644 --- a/tbl_tracking.php +++ b/tbl_tracking.php @@ -233,7 +233,6 @@ if (isset($_REQUEST['report_export']) && $_REQUEST['export_type'] == 'sqldump') $table_temp = $table; $db = $table = ''; - $GLOBALS['js_include'][] = 'functions.js'; require_once './libraries/sql_query_form.lib.php'; PMA_sqlQueryForm($new_query, 'sql'); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5RC1-5914-gaec1adb
by Marc Delisle 23 Jul '10

23 Jul '10

The branch, master has been updated via aec1adb0e077f2a9521bfa9ed367e9d5b6911042 (commit) from 790b52857d269aac40282c85e24845e1fd27b924 (commit) - Log ----------------------------------------------------------------- commit aec1adb0e077f2a9521bfa9ed367e9d5b6911042 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Jul 23 10:13:49 2010 -0400 credit for new BLOB streaming support ----------------------------------------------------------------------- Summary of changes: Documentation.html | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/Documentation.html b/Documentation.html index a62413f..3e5edee 100644 --- a/Documentation.html +++ b/Documentation.html @@ -4855,6 +4855,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA <li>Replication support</li> </ul></li> +<li>Barrie Leslie +<ul> + <li>BLOBstreaming support with PBMS PHP extension</li> +</ul></li> + </ul> <p> hooks/post-receive -- phpMyAdmin

1 0