Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1

into  hynda.mysql.fi:/home/my/mysql-maria


BitKeeper/etc/ignore:
  auto-union
Makefile.am:
  Auto merged
BUILD/SETUP.sh:
  Auto merged
BitKeeper/deleted/.del-init_db.sql~a77d572c39d5a1f8:
  Auto merged
client/mysqldump.c:
  Auto merged
include/Makefile.am:
  Auto merged
include/m_string.h:
  Auto merged
include/my_base.h:
  Auto merged
include/my_dbug.h:
  Auto merged
libmysql/CMakeLists.txt:
  Auto merged
libmysql/Makefile.shared:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
mysql-test/include/varchar.inc:
  Auto merged
mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/lib/mtr_io.pl:
  Auto merged
mysql-test/lib/mtr_misc.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/r/events_logs_tests.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/events_logs_tests.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
mysys/Makefile.am:
  Auto merged
mysys/my_create.c:
  Auto merged
mysys/my_handler.c:
  Auto merged
mysys/my_init.c:
  Auto merged
mysys/my_open.c:
  Auto merged
mysys/safemalloc.c:
  Auto merged
plugin/daemon_example/daemon_example.cc:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/gen_lex_hash.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_test.cc:
  Auto merged
sql/udf_example.c:
  Auto merged
sql/uniques.cc:
  Auto merged
sql/unireg.cc:
  Auto merged
storage/csv/ha_tina.cc:
  Auto merged
storage/myisam/ft_boolean_search.c:
  Auto merged
storage/myisam/ft_nlq_search.c:
  Auto merged
storage/myisam/ft_parser.c:
  Auto merged
storage/myisam/ft_stopwords.c:
  Auto merged
storage/myisam/ft_update.c:
  Auto merged
storage/myisam/fulltext.h:
  Auto merged
storage/myisam/ha_myisam.h:
  Auto merged
storage/myisam/mi_checksum.c:
  Auto merged
storage/myisam/mi_create.c:
  Auto merged
storage/myisam/mi_delete.c:
  Auto merged
storage/myisam/mi_delete_all.c:
  Auto merged
storage/myisam/mi_key.c:
  Auto merged
storage/myisam/mi_log.c:
  Auto merged
storage/myisam/mi_open.c:
  Auto merged
storage/myisam/mi_range.c:
  Auto merged
storage/myisam/mi_rkey.c:
  Auto merged
storage/myisam/mi_rsamepos.c:
  Auto merged
storage/myisam/mi_search.c:
  Auto merged
storage/myisam/mi_test1.c:
  Auto merged
storage/myisam/mi_test2.c:
  Auto merged
storage/myisam/mi_unique.c:
  Auto merged
storage/myisam/mi_update.c:
  Auto merged
storage/myisam/myisamlog.c:
  Auto merged
storage/myisam/myisampack.c:
  Auto merged
storage/myisam/rt_index.c:
  Auto merged
storage/myisam/sort.c:
  Auto merged
storage/myisam/sp_test.c:
  Auto merged
storage/myisammrg/ha_myisammrg.h:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
unittest/Makefile.am:
  Auto merged
BitKeeper/triggers/post-commit:
  Manual merge from mysql-5.1 to mysql-maria
configure.in:
  Manual merge from mysql-5.1 to mysql-maria
include/ft_global.h:
  Manual merge from mysql-5.1 to mysql-maria
include/keycache.h:
  Manual merge from mysql-5.1 to mysql-maria
include/my_atomic.h:
  Manual merge from mysql-5.1 to mysql-maria
include/my_global.h:
  Manual merge from mysql-5.1 to mysql-maria
include/my_sys.h:
  Manual merge from mysql-5.1 to mysql-maria
include/myisam.h:
  Manual merge from mysql-5.1 to mysql-maria
mysys/array.c:
  Manual merge from mysql-5.1 to mysql-maria
mysys/mf_keycache.c:
  Manual merge from mysql-5.1 to mysql-maria
mysys/mf_keycaches.c:
  Manual merge from mysql-5.1 to mysql-maria
mysys/my_pread.c:
  Manual merge from mysql-5.1 to mysql-maria
sql/mysqld.cc:
  Manual merge from mysql-5.1 to mysql-maria
sql/net_serv.cc:
  Manual merge from mysql-5.1 to mysql-maria
sql/set_var.cc:
  Manual merge from mysql-5.1 to mysql-maria
sql/set_var.h:
  Manual merge from mysql-5.1 to mysql-maria
sql/sql_class.h:
  Manual merge from mysql-5.1 to mysql-maria
storage/myisam/ft_static.c:
  Manual merge from mysql-5.1 to mysql-maria
storage/myisam/ha_myisam.cc:
  Manual merge from mysql-5.1 to mysql-maria
storage/myisam/mi_check.c:
  Manual merge from mysql-5.1 to mysql-maria
storage/myisam/mi_dynrec.c:
  Manual merge from mysql-5.1 to mysql-maria
storage/myisam/mi_packrec.c:
  Manual merge from mysql-5.1 to mysql-maria
storage/myisam/mi_write.c:
  Manual merge from mysql-5.1 to mysql-maria
storage/myisam/myisamchk.c:
  Manual merge from mysql-5.1 to mysql-maria
storage/myisam/myisamdef.h:
  Manual merge from mysql-5.1 to mysql-maria
storage/myisammrg/ha_myisammrg.cc:
  Manual merge from mysql-5.1 to mysql-maria
unittest/mysys/Makefile.am:
  Manual merge from mysql-5.1 to mysql-maria
unittest/mysys/my_atomic-t.c:
  Manual merge from mysql-5.1 to mysql-maria

1 files changed, 1 insertions, 1 deletions

diff --git a/include/my_dbug.h b/include/my_dbug.h
index 514cd17099b..a77e439b5db 100644
--- a/include/my_dbug.h
+++ b/include/my_dbug.h
@@ -101,7 +101,7 @@ extern FILE *_db_fp_(void);
 #define DBUG_LONGJMP(a1) longjmp(a1)
 #define DBUG_DUMP(keyword,a1,a2)
 #define DBUG_END()
-#define DBUG_ASSERT(A)
+#define DBUG_ASSERT(A)              do { } while(0)
 #define DBUG_LOCK_FILE
 #define DBUG_FILE (stderr)
 #define DBUG_UNLOCK_FILE