diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-11-10 10:31:33 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-11-10 10:31:33 +0300 |
| commit | b712dce3d57335d3957afe94d1c3200880aebe99 (patch) | |
| tree | b118b585c21710f0fef58c3d009fdd39a4578791 /client | |
| parent | 49bb8cba8e964bec96c1ca9cdc486b3a468dd822 (diff) | |
| parent | d476bbb0becb27d7d3cb1fc5cc0ac4d401622893 (diff) | |
| download | mariadb-git-b712dce3d57335d3957afe94d1c3200880aebe99.tar.gz | |
Auto-merge from mysql-next-mr.
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqltest.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 1acf4da8d53..f185c775e90 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -1161,7 +1161,6 @@ void free_used_memory() mysql_server_end(); /* Don't use DBUG after mysql_server_end() */ - DBUG_VIOLATION_HELPER_LEAVE; return; } |