From: paul
Date: December 29 2005 7:54pm
Subject: svn commit - mysqldoc@docsrva: r634 - in trunk: . refman-4.1 refman-5.0 refman-5.1 tools
List-Archive: http://lists.mysql.com/commits/462
Message-Id: <200512291954.jBTJsU83016216@docsrva.mysql.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: paul
Date: 2005-12-29 20:54:21 +0100 (Thu, 29 Dec 2005)
New Revision: 634
Log:
r5192@frost: paul | 2005-12-29 13:50:27 -0600
The option is --character-set-client-handshake (which has a --skip form),
not --skip-character-set-client-handshake.
Modified:
trunk/
trunk/refman-4.1/database-administration.xml
trunk/refman-5.0/database-administration.xml
trunk/refman-5.1/database-administration.xml
trunk/tools/update-reserved-words.pl
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:4975
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:1848
+ b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:5192
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:1848
Modified: trunk/refman-4.1/database-administration.xml
===================================================================
--- trunk/refman-4.1/database-administration.xml 2005-12-29 01:06:12 UTC (rev 633)
+++ trunk/refman-4.1/database-administration.xml 2005-12-29 19:54:21 UTC (rev 634)
@@ -856,6 +856,20 @@
+
+
+
+
+ Don't ignore character set information sent by the
+ client. To ignore client information and use the default
+ server character set, use
+ ;
+ this makes MySQL 4.1 and higher behave like MySQL 4.0.
+
+
+
+
+
@@ -1029,18 +1043,6 @@
-
-
-
-
- Ignore character set information sent by the client and
- use the default server character set. This option makes
- MySQL 4.1 and higher behave like MySQL 4.0.
-
-
-
-
-
Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml 2005-12-29 01:06:12 UTC (rev 633)
+++ trunk/refman-5.0/database-administration.xml 2005-12-29 19:54:21 UTC (rev 634)
@@ -851,6 +851,20 @@
+
+
+
+
+ Don't ignore character set information sent by the
+ client. To ignore client information and use the default
+ server character set, use
+ ;
+ this makes MySQL behave like MySQL 4.0.
+
+
+
+
+
@@ -1012,18 +1026,6 @@
-
-
-
-
- Ignore character set information sent by the client and
- use the default server character set. (This option makes
- MySQL behave like MySQL 4.0.)
-
-
-
-
-
Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml 2005-12-29 01:06:12 UTC (rev 633)
+++ trunk/refman-5.1/database-administration.xml 2005-12-29 19:54:21 UTC (rev 634)
@@ -851,6 +851,20 @@
+
+
+
+
+ Don't ignore character set information sent by the
+ client. To ignore client information and use the default
+ server character set, use
+ ;
+ this makes MySQL behave like MySQL 4.0.
+
+
+
+
+
@@ -1012,18 +1026,6 @@
-
-
-
-
- Ignore character set information sent by the client and
- use the default server character set. (This option makes
- MySQL behave like MySQL 4.0.)
-
-
-
-
-
Modified: trunk/tools/update-reserved-words.pl
===================================================================
--- trunk/tools/update-reserved-words.pl 2005-12-29 01:06:12 UTC (rev 633)
+++ trunk/tools/update-reserved-words.pl 2005-12-29 19:54:21 UTC (rev 634)
@@ -172,13 +172,24 @@
# Build hash keyed on tokens. Hash value for each key is the
# list of keyword string(s) that map to the token.
if(/\{\s*\"([A-Z0-9_]+)\",\s*SYM\(([A-Z0-9_]+)\)/) {
+warn "key: $2, value: $1\n" if $debug;
push @{$words{$2}}, $1;
} elsif(/sql_functions/) {
- last;
+ #last;
};
};
close LEX;
+if ($debug)
+{
+ warn "Symbols from lex.h:\n";
+ foreach my $key (sort (keys (%words)))
+ {
+ warn "$key: ", join (@{$words{$key}}, " "), "\n";
+ }
+}
+exit (0);
+
# sql_yacc.yy has a keyword: production that lists non-reserved words.
# In 5.0 and up, this production also includes the keyword_sp: production,
# so look for them both.