From a02f6f3f6f1502641aa9ea6d03d53d1180fbb84e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 9 Nov 2012 16:36:09 +0100 Subject: [PATCH] Use MySQL specific highlighter if available --- config.rst | 2 +- faq.rst | 18 +++++++++--------- setup.rst | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/config.rst b/config.rst index e6496c0e07..8bf24e2b84 100644 --- a/config.rst +++ b/config.rst @@ -558,7 +558,7 @@ Server connection settings :config:option:`$cfg['Servers'][$i]['column\_comments']` to :config:option:`$cfg['Servers'][$i]['column\_info']` - .. code-block:: sql + .. code-block:: mysql ALTER TABLE `pma_column_comments` ADD `mimetype` VARCHAR( 255 ) NOT NULL, diff --git a/faq.rst b/faq.rst index 39c69c1d0d..af86233c73 100644 --- a/faq.rst +++ b/faq.rst @@ -88,7 +88,7 @@ servers running in safe mode, to enable uploads of files while being reasonably secure: * create a separate directory for uploads: :command:`mkdir /tmp/php` -* give ownership to the Apache server's user.group: :comand:`chown +* give ownership to the Apache server's user.group: :command:`chown apache.apache /tmp/php` * give proper permission: :command:`chmod 600 /tmp/php` * put ``upload_tmp_dir = /tmp/php`` in :file:`php.ini` @@ -181,7 +181,7 @@ hosting provider is unwilling to change the settings: directly. You can do this by issuing the "source" command from within MySQL: - .. code-block:: sql + .. code-block:: mysql source filename.sql; @@ -282,7 +282,7 @@ directory and add the following line to the group [mysqld]: Next, save the file and restart the MySQL service. You can always check the value of this directive using the query -.. code-block:: sql +.. code-block:: mysql SHOW VARIABLES LIKE 'lower_case_table_names'; @@ -837,7 +837,7 @@ This is an InnoDB bug, see . The problem is that older versions of ``mysqldump`` created invalid comments like this: -.. code-block:: sql +.. code-block:: mysql -- MySQL dump 8.22 @@ -1381,7 +1381,7 @@ located in the database mydb. If you don't have a ``pma_relation`` table, create it as explained in the configuration section. Then create the example tables: -.. code-block:: sql +.. code-block:: mysql CREATE TABLE REL_countries ( @@ -1635,13 +1635,13 @@ Also remember, that everything else inside the **/\*[VARIABLE]\*/** string for your query will remain the way it is, but will be stripped of the /\*\*/ chars. So you can use: -.. code-block:: sql +.. code-block:: mysql /\*, [VARIABLE] AS myname \*/ which will be expanded to -.. code-block:: sql +.. code-block:: mysql , VARIABLE as myname @@ -1651,14 +1651,14 @@ empty string is provided, no replacements are made. A more complex example. Say you have stored this query: -.. code-block:: sql +.. code-block:: mysql SELECT Name, Address FROM addresses WHERE 1 /\* AND Name LIKE '%[VARIABLE]%' \*/ Say, you now enter "phpMyAdmin" as the variable for the stored query, the full query will be: -.. code-block:: sql +.. code-block:: mysql SELECT Name, Address FROM addresses WHERE 1 AND Name LIKE '%phpMyAdmin%' diff --git a/setup.rst b/setup.rst index 9b62030744..57a0a5ef6c 100644 --- a/setup.rst +++ b/setup.rst @@ -277,7 +277,7 @@ MySQL server's one. If you want to use the many new relation and bookmark features: (this of course requires that your :ref:`linked-tables` be set up). -.. code-block:: sql +.. code-block:: mysql GRANT USAGE ON mysql.* TO 'pma'@'localhost' IDENTIFIED BY 'pmapass'; GRANT SELECT ( @@ -294,7 +294,7 @@ course requires that your :ref:`linked-tables` be set up). If you want to use the many new relation and bookmark features: -.. code-block:: sql +.. code-block:: mysql GRANT SELECT, INSERT, UPDATE, DELETE ON .* TO 'pma'@'localhost'; @@ -308,7 +308,7 @@ privileges (for example, you are creating a superuser). For example, to grant the user *real_user* with all privileges on the database *user_base*: -.. code-block:: sql +.. code-block:: mysql GRANT ALL PRIVILEGES ON user_base.* TO 'real_user'@localhost IDENTIFIED BY 'real_password';