summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <paul@teton.kitebird.com>2004-06-12 14:38:45 -0500
committerunknown <paul@teton.kitebird.com>2004-06-12 14:38:45 -0500
commit400648ebd0757caf9ef1831aa8de01570f5fb8fe (patch)
tree2472a7c58d794844a78f68bd3ac362f776d0e367
parentf573ee08871ce04d43d7e309e3f3d5e540dd59a1 (diff)
parente1917c88f68d428fd5128495499b16886bf14c0d (diff)
downloadmariadb-git-400648ebd0757caf9ef1831aa8de01570f5fb8fe.tar.gz
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into teton.kitebird.com:/home/paul/bk/mysql-4.1
-rw-r--r--include/sql_state.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/sql_state.h b/include/sql_state.h
index 5c4b1c50745..52a359405e1 100644
--- a/include/sql_state.h
+++ b/include/sql_state.h
@@ -23,10 +23,10 @@
the second column is the ODBC state (which the 4.1 server sends out by
default) and the last is the state used by the JDBC driver.
If the last column is "" then it means that the JDBC driver is using the
- ODBC state
+ ODBC state.
- The errors in this file is sorted in the same order as in mysqld_error.h
- to allow on to do binary searches for the sqlstate.
+ The errors in this file are sorted in the same order as in mysqld_error.h
+ to allow one to do binary searches for the sqlstate.
*/
ER_DUP_KEY, "23000", "",