List:Commits« Previous MessageNext Message »
From:paul Date:September 5 2007 1:12am
Subject:svn commit - mysqldoc@docsrva: r7668 - in trunk: . refman-5.0 refman-5.1 refman-5.2
View as plain text  
Author: paul
Date: 2007-09-05 03:12:06 +0200 (Wed, 05 Sep 2007)
New Revision: 7668

Log:
 r24493@frost:  paul | 2007-09-04 20:10:59 -0500
 Update example.


Modified:
   trunk/refman-5.0/views.xml
   trunk/refman-5.1/views.xml
   trunk/refman-5.2/views.xml

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:29825
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:24491
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:20005
   + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:29825
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:24493
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:20005


Modified: trunk/refman-5.0/views.xml
===================================================================
--- trunk/refman-5.0/views.xml	2007-09-04 23:39:09 UTC (rev 7667)
+++ trunk/refman-5.0/views.xml	2007-09-05 01:12:06 UTC (rev 7668)
Changed blocks: 1, Lines Added: 20, Lines Deleted: 16; 1708 bytes

@@ -335,29 +335,33 @@
     </para>
 
 <programlisting>
-mysql&gt; <userinput>CREATE VIEW v AS SELECT CHARSET(CHAR(65)), COLLATION(CHAR(65));</userinput>
+<!--
+mysql> DROP VIEW IF EXISTS v;
 Query OK, 0 rows affected (0.00 sec)
+-->
+mysql&gt; <userinput>CREATE VIEW v (mycol) AS SELECT 'abc';</userinput>
+Query OK, 0 rows affected (0.01 sec)
 
-mysql&gt; <userinput>SET NAMES 'latin1';</userinput>
+mysql&gt; <userinput>SET sql_mode = '';</userinput>
 Query OK, 0 rows affected (0.00 sec)
 
-mysql&gt; <userinput>SELECT * FROM v;</userinput>
-+-------------------+---------------------+
-| CHARSET(CHAR(65)) | COLLATION(CHAR(65)) |
-+-------------------+---------------------+
-| latin1            | latin1_swedish_ci   |
-+-------------------+---------------------+
-1 row in set (0.00 sec)
+mysql&gt; <userinput>SELECT "mycol" FROM v;</userinput>
++-------+
+| mycol |
++-------+
+| mycol | 
++-------+
+1 row in set (0.01 sec)
 
-mysql&gt; <userinput>SET NAMES 'utf8';</userinput>
+mysql&gt; <userinput>SET sql_mode = 'ANSI_QUOTES';</userinput>
 Query OK, 0 rows affected (0.00 sec)
 
-mysql&gt; <userinput>SELECT * FROM v;</userinput>
-+-------------------+---------------------+
-| CHARSET(CHAR(65)) | COLLATION(CHAR(65)) |
-+-------------------+---------------------+
-| utf8              | utf8_general_ci     |
-+-------------------+---------------------+
+mysql&gt; <userinput>SELECT "mycol" FROM v;</userinput>
++-------+
+| mycol |
++-------+
+| abc   | 
++-------+
 1 row in set (0.00 sec)
 </programlisting>
 


Modified: trunk/refman-5.1/views.xml
===================================================================
--- trunk/refman-5.1/views.xml	2007-09-04 23:39:09 UTC (rev 7667)
+++ trunk/refman-5.1/views.xml	2007-09-05 01:12:06 UTC (rev 7668)
Changed blocks: 1, Lines Added: 20, Lines Deleted: 16; 1708 bytes

@@ -327,29 +327,33 @@
     </para>
 
 <programlisting>
-mysql&gt; <userinput>CREATE VIEW v AS SELECT CHARSET(CHAR(65)), COLLATION(CHAR(65));</userinput>
+<!--
+mysql> DROP VIEW IF EXISTS v;
 Query OK, 0 rows affected (0.00 sec)
+-->
+mysql&gt; <userinput>CREATE VIEW v (mycol) AS SELECT 'abc';</userinput>
+Query OK, 0 rows affected (0.01 sec)
 
-mysql&gt; <userinput>SET NAMES 'latin1';</userinput>
+mysql&gt; <userinput>SET sql_mode = '';</userinput>
 Query OK, 0 rows affected (0.00 sec)
 
-mysql&gt; <userinput>SELECT * FROM v;</userinput>
-+-------------------+---------------------+
-| CHARSET(CHAR(65)) | COLLATION(CHAR(65)) |
-+-------------------+---------------------+
-| latin1            | latin1_swedish_ci   |
-+-------------------+---------------------+
-1 row in set (0.00 sec)
+mysql&gt; <userinput>SELECT "mycol" FROM v;</userinput>
++-------+
+| mycol |
++-------+
+| mycol | 
++-------+
+1 row in set (0.01 sec)
 
-mysql&gt; <userinput>SET NAMES 'utf8';</userinput>
+mysql&gt; <userinput>SET sql_mode = 'ANSI_QUOTES';</userinput>
 Query OK, 0 rows affected (0.00 sec)
 
-mysql&gt; <userinput>SELECT * FROM v;</userinput>
-+-------------------+---------------------+
-| CHARSET(CHAR(65)) | COLLATION(CHAR(65)) |
-+-------------------+---------------------+
-| utf8              | utf8_general_ci     |
-+-------------------+---------------------+
+mysql&gt; <userinput>SELECT "mycol" FROM v;</userinput>
++-------+
+| mycol |
++-------+
+| abc   | 
++-------+
 1 row in set (0.00 sec)
 </programlisting>
 


Modified: trunk/refman-5.2/views.xml
===================================================================
--- trunk/refman-5.2/views.xml	2007-09-04 23:39:09 UTC (rev 7667)
+++ trunk/refman-5.2/views.xml	2007-09-05 01:12:06 UTC (rev 7668)
Changed blocks: 1, Lines Added: 20, Lines Deleted: 16; 1708 bytes

@@ -327,29 +327,33 @@
     </para>
 
 <programlisting>
-mysql&gt; <userinput>CREATE VIEW v AS SELECT CHARSET(CHAR(65)), COLLATION(CHAR(65));</userinput>
+<!--
+mysql> DROP VIEW IF EXISTS v;
 Query OK, 0 rows affected (0.00 sec)
+-->
+mysql&gt; <userinput>CREATE VIEW v (mycol) AS SELECT 'abc';</userinput>
+Query OK, 0 rows affected (0.01 sec)
 
-mysql&gt; <userinput>SET NAMES 'latin1';</userinput>
+mysql&gt; <userinput>SET sql_mode = '';</userinput>
 Query OK, 0 rows affected (0.00 sec)
 
-mysql&gt; <userinput>SELECT * FROM v;</userinput>
-+-------------------+---------------------+
-| CHARSET(CHAR(65)) | COLLATION(CHAR(65)) |
-+-------------------+---------------------+
-| latin1            | latin1_swedish_ci   |
-+-------------------+---------------------+
-1 row in set (0.00 sec)
+mysql&gt; <userinput>SELECT "mycol" FROM v;</userinput>
++-------+
+| mycol |
++-------+
+| mycol | 
++-------+
+1 row in set (0.01 sec)
 
-mysql&gt; <userinput>SET NAMES 'utf8';</userinput>
+mysql&gt; <userinput>SET sql_mode = 'ANSI_QUOTES';</userinput>
 Query OK, 0 rows affected (0.00 sec)
 
-mysql&gt; <userinput>SELECT * FROM v;</userinput>
-+-------------------+---------------------+
-| CHARSET(CHAR(65)) | COLLATION(CHAR(65)) |
-+-------------------+---------------------+
-| utf8              | utf8_general_ci     |
-+-------------------+---------------------+
+mysql&gt; <userinput>SELECT "mycol" FROM v;</userinput>
++-------+
+| mycol |
++-------+
+| abc   | 
++-------+
 1 row in set (0.00 sec)
 </programlisting>
 


Thread
svn commit - mysqldoc@docsrva: r7668 - in trunk: . refman-5.0 refman-5.1 refman-5.2paul5 Sep