diff options
| author | unknown <monty@mysql.com> | 2005-02-15 16:45:00 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-02-15 16:45:00 +0200 |
| commit | 67b16d202b6e6912d6018685a0f7b0bb55cfbbad (patch) | |
| tree | 16b9cc851452c212c3d986a1f88c4ae9a2f5d862 /client | |
| parent | 40ffce74eb09dc1fd59d9d67fd44688be7f92fca (diff) | |
| download | mariadb-git-67b16d202b6e6912d6018685a0f7b0bb55cfbbad.tar.gz | |
Fixed failing test cases 'row.test' when running with --ps-protocol
Simple optimzations done while reviewing code
client/mysqltest.c:
Added options --enable-ps-warnings and --disable-ps-warnings
(to fix failing test case)
mysql-test/t/row.test:
Disable warnings that comes from 'parse' parth
sql/field.cc:
Removed calls to is_null() in field functions.
(Not needed as NULL handling is done on the level above fields)
Indentation fixes
Removed calls to alloca() as buffer needed was quite small.
sql/field.h:
Indentation changes and comment fixes
sql/filesort.cc:
Simple optimization during code review
sql/item.cc:
Indentation fixes
Removed some unnecessary tests (added DBUG_ASSERTS() instead)
sql/item_buff.cc:
Indentation fixes
sql/my_decimal.cc:
Indentation fixes
Simple optimization
Fixed compiler warning
sql/sql_update.cc:
Removed unnessessary assignment
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqltest.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c index 7bdcf6db3e5..4050dd7a029 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -253,6 +253,7 @@ VAR var_reg[10]; /*Perl/shell-like variable registers */ HASH var_hash; my_bool disable_query_log=0, disable_result_log=0, disable_warnings=0; +my_bool disable_ps_warnings= 0; my_bool disable_info= 1; /* By default off */ my_bool abort_on_error= 1; @@ -283,6 +284,7 @@ Q_ENABLE_RESULT_LOG, Q_DISABLE_RESULT_LOG, Q_SERVER_START, Q_SERVER_STOP,Q_REQUIRE_MANAGER, Q_WAIT_FOR_SLAVE_TO_STOP, Q_ENABLE_WARNINGS, Q_DISABLE_WARNINGS, +Q_ENABLE_PS_WARNINGS, Q_DISABLE_PS_WARNINGS, Q_ENABLE_INFO, Q_DISABLE_INFO, Q_ENABLE_METADATA, Q_DISABLE_METADATA, Q_EXEC, Q_DELIMITER, @@ -360,6 +362,8 @@ const char *command_names[]= "wait_for_slave_to_stop", "enable_warnings", "disable_warnings", + "enable_ps_warnings", + "disable_ps_warnings", "enable_info", "disable_info", "enable_metadata", @@ -3021,7 +3025,8 @@ static int run_query_stmt(MYSQL *mysql, struct st_query *q, int flags) /* We may have got warnings already, collect them if any */ /* FIXME we only want this if the statement succeeds I think */ - run_query_stmt_handle_warnings(mysql, ds); + if (!disable_ps_warnings) + run_query_stmt_handle_warnings(mysql, ds); /* No need to call mysql_stmt_bind_param() because we have no @@ -3711,6 +3716,8 @@ int main(int argc, char **argv) case Q_DISABLE_RESULT_LOG: disable_result_log=1; break; case Q_ENABLE_WARNINGS: disable_warnings=0; break; case Q_DISABLE_WARNINGS: disable_warnings=1; break; + case Q_ENABLE_PS_WARNINGS: disable_ps_warnings=0; break; + case Q_DISABLE_PS_WARNINGS: disable_ps_warnings=1; break; case Q_ENABLE_INFO: disable_info=0; break; case Q_DISABLE_INFO: disable_info=1; break; case Q_ENABLE_METADATA: display_metadata=1; break; |