diff options
| author | monty@mashka.mysql.fi <> | 2003-01-09 03:55:26 +0200 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2003-01-09 03:55:26 +0200 |
| commit | f8e660d88ca64d2f7a1be58acbe57d777d20b122 (patch) | |
| tree | af09adc5a3ec6814545553d72fda1d33e443d162 /sql/protocol.cc | |
| parent | a10178493005b3fa69163ef39c6a58fe9ff6658b (diff) | |
| parent | 2ea43f3c53573a6482ea84556e11e5db6cedddef (diff) | |
| download | mariadb-git-f8e660d88ca64d2f7a1be58acbe57d777d20b122.tar.gz | |
merge with 4.0.9
To get bug fixes for TCP/IP connections, FORCE INDEX and OPTIMIZE TABLE with NULL keys
Diffstat (limited to 'sql/protocol.cc')
| -rw-r--r-- | sql/protocol.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/protocol.cc b/sql/protocol.cc index 15f4ca9ad94..48ef9ecb71e 100644 --- a/sql/protocol.cc +++ b/sql/protocol.cc @@ -171,7 +171,10 @@ net_printf(THD *thd, uint errcode, ...) { if (thd->bootstrap) { - /* In bootstrap it's ok to print on stderr */ + /* + In bootstrap it's ok to print on stderr + This may also happen when we get an error from a slave thread + */ fprintf(stderr,"ERROR: %d %s\n",errcode,text_pos); thd->fatal_error=1; } |