diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-03-20 21:24:20 +0100 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-03-20 21:24:20 +0100 |
| commit | 971f15f83f13dd61d967fffc8d305c3a2ff8f6d1 (patch) | |
| tree | 6509d1730f8a93c86fa133f78796b422b019dd01 /client/mysqltest.c | |
| parent | 60b7cfaf6e482fec94e468aeb202f0105bca762f (diff) | |
| parent | ec81cfdc0ca40f411324549c01b569534946222f (diff) | |
| download | mariadb-git-971f15f83f13dd61d967fffc8d305c3a2ff8f6d1.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
client/mysqltest.c:
Auto merged
Diffstat (limited to 'client/mysqltest.c')
| -rw-r--r-- | client/mysqltest.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c index 58a0e90824c..30f95dd4340 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -104,7 +104,7 @@ static my_bool cursor_protocol= 0, cursor_protocol_enabled= 0; static my_bool parsing_disabled= 0; static my_bool display_result_vertically= FALSE, display_metadata= FALSE; static my_bool disable_query_log= 0, disable_result_log= 0; -static my_bool disable_warnings= 0, disable_ps_warnings= 0; +static my_bool disable_warnings= 0; static my_bool disable_info= 1; static my_bool abort_on_error= 1; static my_bool server_initialized= 0; @@ -264,7 +264,6 @@ enum enum_commands { Q_ENABLE_RESULT_LOG, Q_DISABLE_RESULT_LOG, 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, @@ -328,8 +327,6 @@ 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", @@ -6078,8 +6075,6 @@ 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; |