Commit 03f97c19 authored by peter@mysql.com's avatar peter@mysql.com

Merge mysql.com:/home/pz/mysql/mysql-4.1-root

into mysql.com:/home/pz/mysql/mysql-4.1
parents 20cbe47a 1c0f1712
...@@ -252,4 +252,4 @@ ...@@ -252,4 +252,4 @@
"Subselect returns more than 1 field", "Subselect returns more than 1 field",
"Subselect returns more than 1 record", "Subselect returns more than 1 record",
"Unknown prepared statement handler (%ld) given to %s", "Unknown prepared statement handler (%ld) given to %s",
"Help database is corrupt or does not exists", "Help database is corrupt or does not exist",
\ No newline at end of file \ No newline at end of file
...@@ -246,4 +246,4 @@ ...@@ -246,4 +246,4 @@
"Subselect returns more than 1 field", "Subselect returns more than 1 field",
"Subselect returns more than 1 record", "Subselect returns more than 1 record",
"Unknown prepared statement handler (%ld) given to %s", "Unknown prepared statement handler (%ld) given to %s",
"Help database is corrupt or does not exists", "Help database is corrupt or does not exist",
\ No newline at end of file \ No newline at end of file
...@@ -254,4 +254,4 @@ ...@@ -254,4 +254,4 @@
"Subselect returns more than 1 field", "Subselect returns more than 1 field",
"Subselect returns more than 1 record", "Subselect returns more than 1 record",
"Unknown prepared statement handler (%ld) given to %s", "Unknown prepared statement handler (%ld) given to %s",
"Help database is corrupt or does not exists", "Help database is corrupt or does not exist",
\ No newline at end of file \ No newline at end of file
...@@ -243,4 +243,4 @@ ...@@ -243,4 +243,4 @@
"Subselect returns more than 1 field", "Subselect returns more than 1 field",
"Subselect returns more than 1 record", "Subselect returns more than 1 record",
"Unknown prepared statement handler (%ld) given to %s", "Unknown prepared statement handler (%ld) given to %s",
"Help database is corrupt or does not exists", "Help database is corrupt or does not exist",
\ No newline at end of file \ No newline at end of file
...@@ -248,4 +248,4 @@ ...@@ -248,4 +248,4 @@
"Subselect returns more than 1 field", "Subselect returns more than 1 field",
"Subselect returns more than 1 record", "Subselect returns more than 1 record",
"Unknown prepared statement handler (%ld) given to %s", "Unknown prepared statement handler (%ld) given to %s",
"Help database is corrupt or does not exists", "Help database is corrupt or does not exist",
\ No newline at end of file \ No newline at end of file
...@@ -243,4 +243,4 @@ ...@@ -243,4 +243,4 @@
"Subselect returns more than 1 field", "Subselect returns more than 1 field",
"Subselect returns more than 1 record", "Subselect returns more than 1 record",
"Unknown prepared statement handler (%ld) given to %s", "Unknown prepared statement handler (%ld) given to %s",
"Help database is corrupt or does not exists", "Help database is corrupt or does not exist",
\ No newline at end of file \ No newline at end of file
...@@ -246,4 +246,4 @@ ...@@ -246,4 +246,4 @@
"Subselect return more than 1 field", "Subselect return more than 1 field",
"Subselect return more than 1 record", "Subselect return more than 1 record",
"Unknown prepared statement handler (%ld) given to %s", "Unknown prepared statement handler (%ld) given to %s",
"Help database is corrupt or does not exists", "Help database is corrupt or does not exist",
\ No newline at end of file \ No newline at end of file
...@@ -243,4 +243,4 @@ ...@@ -243,4 +243,4 @@
"Subselect returns more than 1 field", "Subselect returns more than 1 field",
"Subselect returns more than 1 record", "Subselect returns more than 1 record",
"Unknown prepared statement handler (%ld) given to %s", "Unknown prepared statement handler (%ld) given to %s",
"Help database is corrupt or does not exists", "Help database is corrupt or does not exist",
\ No newline at end of file \ No newline at end of file
...@@ -245,4 +245,4 @@ ...@@ -245,4 +245,4 @@
"Subselect returns more than 1 field", "Subselect returns more than 1 field",
"Subselect returns more than 1 record", "Subselect returns more than 1 record",
"Unknown prepared statement handler (%ld) given to %s", "Unknown prepared statement handler (%ld) given to %s",
"Help database is corrupt or does not exists", "Help database is corrupt or does not exist",
\ No newline at end of file \ No newline at end of file
...@@ -243,4 +243,4 @@ ...@@ -243,4 +243,4 @@
"Subselect returns more than 1 field", "Subselect returns more than 1 field",
"Subselect returns more than 1 record", "Subselect returns more than 1 record",
"Unknown prepared statement handler (%ld) given to %s", "Unknown prepared statement handler (%ld) given to %s",
"Help database is corrupt or does not exists", "Help database is corrupt or does not exist",
\ No newline at end of file \ No newline at end of file
...@@ -245,4 +245,4 @@ ...@@ -245,4 +245,4 @@
"Subselect returns more than 1 field", "Subselect returns more than 1 field",
"Subselect returns more than 1 record", "Subselect returns more than 1 record",
"Unknown prepared statement handler (%ld) given to %s", "Unknown prepared statement handler (%ld) given to %s",
"Help database is corrupt or does not exists", "Help database is corrupt or does not exist",
\ No newline at end of file \ No newline at end of file
...@@ -243,4 +243,4 @@ ...@@ -243,4 +243,4 @@
"Subselect returns more than 1 field", "Subselect returns more than 1 field",
"Subselect returns more than 1 record", "Subselect returns more than 1 record",
"Unknown prepared statement handler (%ld) given to %s", "Unknown prepared statement handler (%ld) given to %s",
"Help database is corrupt or does not exists", "Help database is corrupt or does not exist",
\ No newline at end of file \ No newline at end of file
...@@ -245,4 +245,4 @@ ...@@ -245,4 +245,4 @@
"Subselect returns more than 1 field", "Subselect returns more than 1 field",
"Subselect returns more than 1 record", "Subselect returns more than 1 record",
"Unknown prepared statement handler (%ld) given to %s", "Unknown prepared statement handler (%ld) given to %s",
"Help database is corrupt or does not exists", "Help database is corrupt or does not exist",
\ No newline at end of file \ No newline at end of file
...@@ -245,4 +245,4 @@ ...@@ -245,4 +245,4 @@
"Subselect returns more than 1 field", "Subselect returns more than 1 field",
"Subselect returns more than 1 record", "Subselect returns more than 1 record",
"Unknown prepared statement handler (%ld) given to %s", "Unknown prepared statement handler (%ld) given to %s",
"Help database is corrupt or does not exists", "Help database is corrupt or does not exist",
\ No newline at end of file \ No newline at end of file
...@@ -247,4 +247,4 @@ ...@@ -247,4 +247,4 @@
"Subselect returns more than 1 field", "Subselect returns more than 1 field",
"Subselect returns more than 1 record", "Subselect returns more than 1 record",
"Unknown prepared statement handler (%ld) given to %s", "Unknown prepared statement handler (%ld) given to %s",
"Help database is corrupt or does not exists", "Help database is corrupt or does not exist",
\ No newline at end of file \ No newline at end of file
...@@ -243,4 +243,4 @@ ...@@ -243,4 +243,4 @@
"Subselect returns more than 1 field", "Subselect returns more than 1 field",
"Subselect returns more than 1 record", "Subselect returns more than 1 record",
"Unknown prepared statement handler (%ld) given to %s", "Unknown prepared statement handler (%ld) given to %s",
"Help database is corrupt or does not exists", "Help database is corrupt or does not exist",
\ No newline at end of file \ No newline at end of file
...@@ -247,4 +247,4 @@ ...@@ -247,4 +247,4 @@
"Subselect returns more than 1 field", "Subselect returns more than 1 field",
"Subselect returns more than 1 record", "Subselect returns more than 1 record",
"Unknown prepared statement handler (%ld) given to %s", "Unknown prepared statement handler (%ld) given to %s",
"Help database is corrupt or does not exists", "Help database is corrupt or does not exist",
\ No newline at end of file \ No newline at end of file
...@@ -246,4 +246,4 @@ ...@@ -246,4 +246,4 @@
" ", " ",
" ", " ",
"Unknown prepared statement handler (%ld) given to %s", "Unknown prepared statement handler (%ld) given to %s",
"Help database is corrupt or does not exists", "Help database is corrupt or does not exist",
\ No newline at end of file \ No newline at end of file
...@@ -239,4 +239,4 @@ ...@@ -239,4 +239,4 @@
"Subselect returns more than 1 field", "Subselect returns more than 1 field",
"Subselect returns more than 1 record", "Subselect returns more than 1 record",
"Unknown prepared statement handler (%ld) given to %s", "Unknown prepared statement handler (%ld) given to %s",
"Help database is corrupt or does not exists", "Help database is corrupt or does not exist",
\ No newline at end of file \ No newline at end of file
...@@ -251,4 +251,4 @@ ...@@ -251,4 +251,4 @@
"Subselect returns more than 1 field", "Subselect returns more than 1 field",
"Subselect returns more than 1 record", "Subselect returns more than 1 record",
"Unknown prepared statement handler (%ld) given to %s", "Unknown prepared statement handler (%ld) given to %s",
"Help database is corrupt or does not exists", "Help database is corrupt or does not exist",
\ No newline at end of file \ No newline at end of file
...@@ -244,4 +244,4 @@ ...@@ -244,4 +244,4 @@
"Subselect returns more than 1 field", "Subselect returns more than 1 field",
"Subselect returns more than 1 record", "Subselect returns more than 1 record",
"Unknown prepared statement handler (%ld) given to %s", "Unknown prepared statement handler (%ld) given to %s",
"Help database is corrupt or does not exists", "Help database is corrupt or does not exist",
\ No newline at end of file \ No newline at end of file
...@@ -243,4 +243,4 @@ ...@@ -243,4 +243,4 @@
"Subselect returns more than 1 field", "Subselect returns more than 1 field",
"Subselect returns more than 1 record", "Subselect returns more than 1 record",
"Unknown prepared statement handler (%ld) given to %s", "Unknown prepared statement handler (%ld) given to %s",
"Help database is corrupt or does not exists", "Help database is corrupt or does not exist",
\ No newline at end of file \ No newline at end of file
...@@ -248,4 +248,4 @@ ...@@ -248,4 +248,4 @@
"i i i 1 ", "i i i 1 ",
"i i i 1 ", "i i i 1 ",
"Unknown prepared statement handler (%ld) given to %s", "Unknown prepared statement handler (%ld) given to %s",
"Help database is corrupt or does not exists", "Help database is corrupt or does not exist",
\ No newline at end of file \ No newline at end of file
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