bk commit into maria tree (guilhem:1.2615)

[Guilhem Bichot]

Below is the list of changes that have just been committed into a local
maria repository of guilhem.  When guilhem does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-03-04 18:00:59+01:00, guilhem@stripped +1 -0
  fix for compilation failure in non-debug builds

  sql/mysqld.cc@stripped, 2008-03-04 18:00:55+01:00, guilhem@stripped +2 -0
    option -# and --debug, and default_dbug_option, do not exist in non-debug builds

diff -Nrup a/sql/mysqld.cc b/sql/mysqld.cc
--- a/sql/mysqld.cc	2008-03-04 16:13:32 +01:00
+++ b/sql/mysqld.cc	2008-03-04 18:00:55 +01:00
@@ -7444,6 +7444,7 @@ mysqld_get_one_option(int optid,
                       char *argument)
 {
   switch(optid) {
+#ifndef DBUG_OFF
   case '#':
     if (!argument)
       argument= (char*) default_dbug_option;
@@ -7458,6 +7459,7 @@ mysqld_get_one_option(int optid,
     DBUG_SET_INITIAL(argument);
     opt_endinfo=1;				/* unireg: memory allocation */
     break;
+#endif
   case 'a':
     global_system_variables.sql_mode= fix_sql_mode(MODE_ANSI);
     global_system_variables.tx_isolation= ISO_SERIALIZABLE;