bzr push into mysql-6.0-rpl branch (alfranio.correia:2853 to 2854) WL#4828

[Alfranio Correia]

 2854 Alfranio Correia	2009-05-15
      Post-fix for WL#4828.

    modified:
      dbug/dbug.c
      include/my_dbug.h
 2853 Luis Soares	2009-05-15 [merge]
      merge: 6.0 --> 6.0-rpl
      manually resolved conflicts: none
      reverted changes: .bzr-mysql/default.conf

    modified:
      README
      mysql-test/include/mtr_check.sql
      mysql-test/lib/My/File/Path.pm
      mysql-test/lib/My/SafeProcess.pm
      mysql-test/lib/My/SafeProcess/Base.pm
      mysql-test/lib/mtr_cases.pm
      mysql-test/lib/mtr_process.pl
      mysql-test/lib/mtr_report.pm
      mysql-test/lib/mtr_unique.pm
      mysql-test/mysql-test-run.pl
      mysql-test/r/init_file.result
      mysql-test/suite/funcs_1/datadict/is_routines.inc
      mysql-test/suite/funcs_1/r/is_routines.result
      mysql-test/t/init_file.test
      mysys/safemalloc.c
=== modified file 'dbug/dbug.c'
--- a/dbug/dbug.c	2009-05-15 10:06:26 +0000
+++ b/dbug/dbug.c	2009-05-15 13:43:56 +0000
@@ -1845,7 +1845,7 @@ BOOLEAN _db_keyword_(CODE_STATE *cs, con
  *      be concatenated in order to make the keyword to be compared.
  */
 
-BOOLEAN _db_keywords_(CODE_STATE *cs, int strict, char *function, char *type)
+BOOLEAN _db_keywords_(CODE_STATE *cs, int strict, const char *function, const char *type)
 {
   char dest[_DBUG_MAX_FUNC_NAME_ + 1];
 

=== modified file 'include/my_dbug.h'
--- a/include/my_dbug.h	2009-05-15 10:06:26 +0000
+++ b/include/my_dbug.h	2009-05-15 13:43:56 +0000
@@ -31,7 +31,8 @@ struct _db_stack_frame_ {
 struct  _db_code_state_;
 extern  my_bool _dbug_on_;
 extern  my_bool _db_keyword_(struct _db_code_state_ *, const char *, int);
-extern  my_bool _db_keywords_(struct _db_code_state_ *, int, char *, char *);
+extern  my_bool _db_keywords_(struct _db_code_state_ *, int, const char *,
+                              const char *);
 extern  int _db_explain_(struct _db_code_state_ *cs, char *buf, size_t len);
 extern  int _db_explain_init_(char *buf, size_t len);
 extern	int _db_is_pushed_(void);


Attachment: [text/bzr-bundle]