Commit 1a520c7a authored by unknown's avatar unknown

Merge bk-internal.mysql.com:/home/bk/mysql-4.1

into mysql.com:/home/pem/work/mysql-4.1

parents d1cb8d6d ec923b80
...@@ -308,7 +308,5 @@ character-set=latin2 ...@@ -308,7 +308,5 @@ character-set=latin2
"Incorrect table definition; There can only be one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause" "Incorrect table definition; There can only be one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause"
"Invalid ON UPDATE clause for '%-.64s' field", "Invalid ON UPDATE clause for '%-.64s' field",
"This command is not supported in the prepared statement protocol yet", "This command is not supported in the prepared statement protocol yet",
"Got NDB error %d '%-.100s'",
"Got temporary NDB error %d '%-.100s'",
"Got error %d '%-.100s' from %s", "Got error %d '%-.100s' from %s",
"Got temporary error %d '%-.100s' from %s", "Got temporary error %d '%-.100s' from %s",
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment