Revert "Revert "Merge remote branch 'origin/master'""

This reverts commit 4214d83e12.

ChangeLog

@@ -85,6 +85,10 @@ $Id$
 - patch #2999595, rfe #2998130 [interface] Cleanup navigation frame.
 - [core] Update library PHPExcel to version 1.7.3c
 
+3.3.5.0 (not yet released)
+- patch #2932113 [information_schema] Slow export when having lots of
+  databases, thanks to Stéphane Pontier - shadow_walker
+
 3.3.4.0 (not yet released)
 - bug #2996161 [import] properly escape import value
 - bug #2998889 [import] Import button does not work in Catalan

js/functions.js

@@ -1893,7 +1893,7 @@ $(document).ready(function() {
 
         var curr_table_name = window.parent.table;
         var curr_column_name = $(this).parents('tr').children('th').children('label').text();
-        var question = PMA_message['strDoYouReally'] + ' :\n ALTER TABLE `' + curr_table_name + '` DROP `' + curr_column_name + '`';
+        var question = PMA_messages['strDoYouReally'] + ' :\n ALTER TABLE `' + curr_table_name + '` DROP `' + curr_column_name + '`';
 
         $(this).PMA_confirm(question, $(this).attr('href'), function(url) {
 
@@ -1943,6 +1943,8 @@ $(document).ready(function() {
  * libraries/display_create_table.lib.php is used)
  */
 $(document).ready(function() {
+
+    //make Ajax call and create the dialog with the full create table form
     $("#create_table_form_minimal").live('submit', function(event) {
         event.preventDefault();
 
@@ -1957,13 +1959,40 @@ $(document).ready(function() {
             .dialog({
                 title: PMA_messages['strCreateTable'],
                 width: 900,
-                buttons : {
+                buttons : {"Cancel" : function() {$(this).dialog('close').remove() ;}
-                            "Create Table" : function() {
-                                $('#create_table_form').trigger("submit");
-                            },
-                            "Cancel" : function() {$(this).dialog('close').remove() ;}
                 }
-            });
+            }); // end dialog options
-        })
+        }) // end $.get()
-    })
+        
-}, 'top.frame_content');
+    });
+
+    $("#create_table_form").find("input[name=submit_num_fields], input[name=do_save_data]").live('click', function(event) {
+        event.preventDefault();
+
+        var the_form = $("#create_table_form");
+
+        PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']);
+        $(the_form).append('<input type="hidden" name="ajax_request" value="true" />');
+
+        if($(this).attr('name') == 'submit_num_fields') {
+            //User wants to add more fields to the table
+            $.post($(the_form).attr('action'), $(the_form).serialize() + "&submit_num_fields=" + $(this).val(), function(data) {
+                $("#create_table_dialog").html(data);
+                
+            }) //end $.post()
+        }
+        else if($(this).attr('name') == 'do_save_data') {
+            //User wants to submit the form
+            $.post($(the_form).attr('action'), $(the_form).serialize() + "&do_save_data=" + $(this).val(), function(data) {
+                if(data.success == true) {
+                    PMA_ajaxShowMessage(data.message);
+                    $("#create_table_dialog").dialog("close").remove();
+                }
+                else {
+                    PMA_ajaxShowMessage(data.error);
+                }
+            }) // end $.post()
+        }
+    }) // end create table form submit button actions
+
+}, 'top.frame_content'); //end $(document).ready for 'Create Table'

js/tbl_operations.js

@@ -8,11 +8,11 @@
 /**
  * Add all AJAX scripts for tbl_operations.php page here.
  *
- * Alter table order
+ * Alter table order - #div_table_order form
- * Move Table
+ * Move Table - #div_table_rename form
- * Table Options
+ * Table Options - #div_table_options form
- * Copy Table
+ * Copy Table - #div_table_copy form
- * Table Maintenance
+ * Table Maintenance - #div_table_maintenance (need to id each anchor)
  *  Check
  *  Repair
  *  Analyze

libraries/display_create_table.lib.php

@@ -37,8 +37,7 @@ require_once './libraries/check_user_privileges.lib.php';
 $is_create_table_priv = true;
 
 ?>
-<form method="post" action="tbl_create.php"
+<form id="create_table_form_minimal" method="post" action="tbl_create.php">
-    onsubmit="return (emptyFormElements(this, 'table') &amp;&amp; checkFormElementInRange(this, 'num_fields', '<?php echo str_replace('\'', '\\\'', __('Table must have at least one column.')); ?>', 1))">
 <fieldset>
     <legend>
 <?php

libraries/mysql_charsets.lib.php

@@ -164,7 +164,17 @@ function PMA_getDbCollation($db) {
         return 'utf8_general_ci';
     }
 
-    return PMA_DBI_fetch_value('SELECT DEFAULT_COLLATION_NAME FROM information_schema.SCHEMATA WHERE SCHEMA_NAME = \'' . PMA_sqlAddSlashes($db) . '\' LIMIT 1;');
+    if (! $GLOBALS['cfg']['Server']['DisableIS']) {
+        // this is slow with thousands of databases
+        return PMA_DBI_fetch_value('SELECT DEFAULT_COLLATION_NAME FROM information_schema.SCHEMATA WHERE SCHEMA_NAME = \'' . PMA_sqlAddSlashes($db) . '\' LIMIT 1;');
+    } else {
+        PMA_DBI_select_db($db);
+        $return = PMA_DBI_fetch_value('SHOW VARIABLES LIKE \'collation_database\'', 0, 1);
+        if ($db !== $GLOBALS['db']) {
+            PMA_DBI_select_db($GLOBALS['db']);
+        }
+        return $return;
+    }
 }
 
 /**

libraries/tbl_properties.inc.php

@@ -607,7 +607,7 @@ document.onkeydown = onKeyDownArrowsHandler;
 }
 ?>
 
-<form method="post" action="<?php echo $action; ?>">
+<form id="create_table_form" method="post" action="<?php echo $action; ?>">
 <?php
 echo PMA_generate_common_hidden_inputs($_form_params);
 unset($_form_params);

po/cy.po

@@ -1942,7 +1942,7 @@ msgstr "Rheolweithiau"
 
 #: libraries/db_routines.inc.php:43
 msgid "Return type"
-msgstr ""
+msgstr "Dychwelyd math"
 
 #: libraries/db_structure.lib.php:57 libraries/display_tbl.lib.php:1848
 msgid ""
@@ -2044,8 +2044,9 @@ msgstr ""
 
 #: libraries/display_export.lib.php:107
 #, php-format
+#, possible-php-format
 msgid "Dump %s row(s) starting at row # %s"
-msgstr ""
+msgstr "Dympio %s rhes wrth ddechrau ar res #%s"
 
 #: libraries/display_export.lib.php:115
 msgid "Dump all rows"
@@ -2057,8 +2058,9 @@ msgstr "Cadw fel ffeil"
 
 #: libraries/display_export.lib.php:134
 #, php-format
+#, possible-php-format
 msgid "Save on server in %s directory"
-msgstr ""
+msgstr "Cadw ar weinydd mewn cyfeiriadur %s"
 
 #: libraries/display_export.lib.php:142 setup/lib/messages.inc.php:90
 msgid "Overwrite existing file(s)"
@@ -2638,7 +2640,7 @@ msgstr ""
 
 #: libraries/engines/pbxt.lib.php:63
 msgid "Log buffer size"
-msgstr ""
+msgstr "Maint log y byffer"
 
 #: libraries/engines/pbxt.lib.php:64
 msgid ""
@@ -2649,7 +2651,7 @@ msgstr ""
 
 #: libraries/engines/pbxt.lib.php:68
 msgid "Data file grow size"
-msgstr ""
+msgstr "Maint tyfu'r ffeil ddata"
 
 #: libraries/engines/pbxt.lib.php:69
 msgid "The grow size of the handle data (.xtd) files."
@@ -2657,7 +2659,7 @@ msgstr ""
 
 #: libraries/engines/pbxt.lib.php:73
 msgid "Row file grow size"
-msgstr ""
+msgstr "Maint tyfu'r ffeil rhes"
 
 #: libraries/engines/pbxt.lib.php:74
 msgid "The grow size of the row pointer (.xtr) files."
@@ -2665,7 +2667,7 @@ msgstr ""
 
 #: libraries/engines/pbxt.lib.php:78
 msgid "Log file count"
-msgstr ""
+msgstr "Cyfrif ffeiliau log"
 
 #: libraries/engines/pbxt.lib.php:79
 msgid ""
@@ -7766,16 +7768,17 @@ msgstr ""
 
 #: tbl_tracking.php:251 tbl_tracking.php:379
 msgid "Close"
-msgstr ""
+msgstr "Cau"
 
 #: tbl_tracking.php:262
 #, php-format
+#, possible-php-format
 msgid "Version %s snapshot (SQL code)"
-msgstr ""
+msgstr "Ciplun fersiwn %s (cod SQL)"
 
 #: tbl_tracking.php:381
 msgid "Tracking statements"
-msgstr ""
+msgstr "Datganiadau tracio"
 
 #: tbl_tracking.php:397 tbl_tracking.php:504
 #, php-format
@@ -7784,44 +7787,45 @@ msgstr ""
 
 #: tbl_tracking.php:410 tbl_tracking.php:461
 msgid "Date"
-msgstr ""
+msgstr "Dyddiad"
 
 #: tbl_tracking.php:411 tbl_tracking.php:462
 msgid "Username"
-msgstr ""
+msgstr "Enw defnyddiwr"
 
 #: tbl_tracking.php:412
 msgid "Data definition statement"
-msgstr ""
+msgstr "Datganiad diffiniad data"
 
 #: tbl_tracking.php:463
 msgid "Data manipulation statement"
-msgstr ""
+msgstr "Datganiad trin data"
 
 #: tbl_tracking.php:507
 msgid "SQL dump (file download)"
-msgstr ""
+msgstr "Dadlwythiad SQL (lawrlwytho ffeil)"
 
 #: tbl_tracking.php:508
 msgid "SQL dump"
-msgstr ""
+msgstr "Dadlwythiad SQL"
 
 #: tbl_tracking.php:509
 msgid "This option will replace your table and contained data."
-msgstr ""
+msgstr "Bydd yr opsiwn hwn yn disodli eich tabl a'r data sydd ynddo."
 
 #: tbl_tracking.php:509
 msgid "SQL execution"
-msgstr ""
+msgstr "Gweithrediad SQL"
 
 #: tbl_tracking.php:521
 #, php-format
+#, possible-php-format
 msgid "Export as %s"
-msgstr ""
+msgstr "Allforio fel %s"
 
 #: tbl_tracking.php:561
 msgid "Show versions"
-msgstr ""
+msgstr "Dangos fersiynau"
 
 #: tbl_tracking.php:593
 msgid "Version"

po/pt_BR.po

@@ -5390,7 +5390,7 @@ msgid ""
 "method is mainly used to optimize ORDER BY ... DESC."
 msgstr ""
 "O número de requisições para ler a linha precedente na ordem da chave. Este "
-"método de leitura é usado principalmente para otimizar ORDER B"
+"método de leitura é usado principalmente para otimizar ORDER BY ... DESC."
 
 #: server_status.php:56
 msgid ""

po/tr.po

@@ -3,9 +3,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-06-22 12:29+0530\n"
+"POT-Creation-Date: 2010-06-13 09:03-0400\n"
-"PO-Revision-Date: 2010-06-17 21:32+0200\n"
+"PO-Revision-Date: 2010-06-21 19:58+0200\n"
-"Last-Translator:  <hitowerdigit@hotmail.com>\n"
+"Last-Translator: Burak <hitowerdigit@hotmail.com>\n"
 "Language-Team: turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -96,7 +96,7 @@ msgstr "Veritabanı %1$s oluşturuldu."
 
 #: db_datadict.php:49 db_operations.php:387
 msgid "Database comment: "
-msgstr "Veritabanı yorumu: "
+msgstr "Veritabanı yorumu:"
 
 #: db_datadict.php:165 libraries/tbl_properties.inc.php:724
 #: pdf_schema.php:1236 tbl_operations.php:347 tbl_printview.php:130
@@ -1631,7 +1631,7 @@ msgstr "%s dosyası herhangi bir anahtar kimliği içermiyor"
 #: libraries/auth/swekey/swekey.auth.lib.php:157
 #: libraries/auth/swekey/swekey.auth.lib.php:180
 msgid "Hardware authentication failed"
-msgstr "Donanım kimlik denetimi başarısız"
+msgstr "Donanım kimlik doğrulama başarısız"
 
 #: libraries/auth/swekey/swekey.auth.lib.php:166
 msgid "No valid authentication key plugged"
@@ -1639,7 +1639,7 @@ msgstr "Geçerli kimlik denetimi anahtarı takılı değil"
 
 #: libraries/auth/swekey/swekey.auth.lib.php:202
 msgid "Authenticating..."
-msgstr "Kimlik denetleniyor..."
+msgstr "Kimlik doğrulanıyor..."
 
 #: libraries/blobstreaming.lib.php:689
 msgid "View image"
@@ -1651,7 +1651,7 @@ msgstr "Ses çal"
 
 #: libraries/blobstreaming.lib.php:698
 msgid "View video"
-msgstr "Videoyu göster"
+msgstr "Görüntüyü göster"
 
 #: libraries/blobstreaming.lib.php:702
 msgid "Download file"

tbl_create.php

@@ -249,6 +249,8 @@ if (isset($_REQUEST['do_save_data'])) {
         $message = PMA_Message::success(__('Table %1$s has been created.'));
         $message->addParam(PMA_backquote($db) . '.' . PMA_backquote($table));
 
+        PMA_ajaxResponse($message, $message->isSuccess());
+
         $display_query = $sql_query;
         $sql_query = '';