diff options
| author | monty@mysql.com <> | 2004-11-03 12:39:38 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-11-03 12:39:38 +0200 |
| commit | 47bbf768d4bdb9ca0abd2ef94bd9a734dafeed50 (patch) | |
| tree | 85bce6df7d0ce9d809ff3fc13fa4486590463d00 /sql-common | |
| parent | afbe601302fc59c498437321b296ed6c8d360564 (diff) | |
| download | mariadb-git-47bbf768d4bdb9ca0abd2ef94bd9a734dafeed50.tar.gz | |
Fixes after merge with 4.1
FOUND is not a reserved keyword anymore
Added Item_field::set_no_const_sub() to be able to mark fields that can't be substituted
Added 'simple_select' method to be able to quickly determinate if a select_result is a normal SELECT
Note that the 5.0 tree is not yet up to date: Sanja will have to fix multi-update-locks for this merge to be complete
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/client.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index ef025d1853a..fa1488f4f11 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -647,6 +647,7 @@ cli_advanced_command(MYSQL *mysql, enum enum_server_command command, } if (mysql->status != MYSQL_STATUS_READY) { + DBUG_PRINT("error",("state: %d", mysql->status)); set_mysql_error(mysql, CR_COMMANDS_OUT_OF_SYNC, unknown_sqlstate); return 1; } |