From a846ab811e4eb3f77f3b365f98cea50bfa79f400 Mon Sep 17 00:00:00 2001
From: Magnus Svensson <msvensson@mysql.com>
Date: Fri, 29 Aug 2008 12:33:02 +0200
Subject: [PATCH] Bug#33337, silently convert --gdb(etc.) to --client-gdb in
 embedded mode

---
 mysql-test/mysql-test-run.pl | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index d07738fc29c..dbc108d4fb2 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -1048,6 +1048,28 @@ sub command_line_setup {
       mtr_error("Can't use --extern with --embedded-server");
     }
 
+
+    if ($opt_gdb)
+    {
+      mtr_warning("Silently converting --gdb to --client-gdb in embedded mode");
+      $opt_client_gdb= $opt_gdb;
+      $opt_gdb= undef;
+    }
+
+    if ($opt_ddd)
+    {
+      mtr_warning("Silently converting --ddd to --client-ddd in embedded mode");
+      $opt_client_ddd= $opt_ddd;
+      $opt_ddd= undef;
+    }
+
+    if ($opt_debugger)
+    {
+      mtr_warning("Silently converting --debugger to --client-debugger in embedded mode");
+      $opt_client_debugger= $opt_debugger;
+      $opt_debugger= undef;
+    }
+
     if ( $opt_gdb || $opt_ddd || $opt_manual_gdb || $opt_manual_ddd ||
 	 $opt_manual_debug || $opt_debugger )
     {