database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Automerge from mysql-next-mr.

Browse Source
This commit is contained in:
Alexander Nozdrin
2009-10-23 00:20:44 +04:00
parent 99eae48a97 2f5413ebc5
commit 08ecfb9a8b
351 changed files with 12988 additions and 3364 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/mysql.cc
View File

@ -2861,7 +2861,7 @@ com_help(String *buffer __attribute__((unused)),
"For developer information, including the MySQL Reference Manual, "
"visit:\n"
" http://dev.mysql.com/\n"
"To buy MySQL Network Support, training, or other products, visit:\n"
"To buy MySQL Enterprise support, training, or other products, visit:\n"
" https://shop.mysql.com/\n", INFO_INFO);
put_info("List of all MySQL commands:", INFO_INFO);
if (!named_cmds)
@ -3558,7 +3558,7 @@ static void print_warnings()
messages. To be safe, skip printing the duplicate only if it is the only
warning.
*/
if (!cur || num_rows == 1 && error == (uint) strtoul(cur[1], NULL, 10))
if (!cur || (num_rows == 1 && error == (uint) strtoul(cur[1], NULL, 10)))
goto end;
/* Print the warnings */