diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-03-30 12:48:42 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-03-30 12:48:42 +0200 |
| commit | da4d71d10d23c1ac2d10b72baee14991ccb7a146 (patch) | |
| tree | 7cdf3a8c8e72ca7c1c8105427c04123f025bd870 /sql/sql_connect.cc | |
| parent | 9ec85009985d644ce7ae797bc3572d0ad0f69bb0 (diff) | |
| parent | a00517ac9707ffd51c092f5af5d198c5ee789bb4 (diff) | |
| download | mariadb-git-da4d71d10d23c1ac2d10b72baee14991ccb7a146.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'sql/sql_connect.cc')
| -rw-r--r-- | sql/sql_connect.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sql/sql_connect.cc b/sql/sql_connect.cc index 157e59c2446..5cb4cd87296 100644 --- a/sql/sql_connect.cc +++ b/sql/sql_connect.cc @@ -832,11 +832,7 @@ bool init_new_connection_handler_thread() statistic_increment(connection_errors_internal, &LOCK_status); return 1; } - DBUG_EXECUTE_IF("simulate_failed_connection_1", - { - DBUG_SET("-d,simulate_failed_connection_1"); - return(1); - }); + DBUG_EXECUTE_IF("simulate_failed_connection_1", return(1); ); return 0; } |