MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Alexey Botchkov Date:December 1 2008 11:15am
Subject:bzr commit into mysql-6.0-bugteam branch (holyfoot:2760) Bug#41103
View as plain text  
#At file:///home/hf/work/mysql_common/dst/

 2760 Alexey Botchkov	2008-12-01
      Bug #41103 6.0 Windows embedded-server tests fail 
        additional fix
modified:
  client/mysqltest.c
  include/m_ctype.h
  libmysqld/libmysqld.def

=== modified file 'client/mysqltest.c'
--- a/client/mysqltest.c	2008-11-03 17:51:36 +0000
+++ b/client/mysqltest.c	2008-12-01 11:00:18 +0000
@@ -147,7 +147,7 @@ static struct st_test_file* cur_file;
 static struct st_test_file* file_stack_end;
 
 
-static CHARSET_INFO *charset_info= &my_charset_latin1; /* Default charset */
+static CHARSET_INFO *charset_info; /* Default charset */
 
 static const char *embedded_server_groups[]=
 {
@@ -497,6 +497,9 @@ void handle_no_error(struct st_command*)
 
 #ifdef EMBEDDED_LIBRARY
 
+#define my_fopen(name, mode, flags) fopen(name, "rb")
+#define my_fclose(file, flags) fclose(file)
+
 /* attributes of the query thread */
 pthread_attr_t cn_thd_attrib;
 
@@ -7255,6 +7258,7 @@ int main(int argc, char **argv)
   MY_STAT res_info;
   MY_INIT(argv[0]);
 
+  charset_info= &my_charset_latin1;
   save_file[0]= 0;
   TMPDIR[0]= 0;
 

=== modified file 'include/m_ctype.h'
--- a/include/m_ctype.h	2008-07-23 09:43:50 +0000
+++ b/include/m_ctype.h	2008-12-01 11:00:18 +0000
@@ -321,7 +321,7 @@ typedef struct charset_info_st
 #define ILLEGAL_CHARSET_INFO_NUMBER (~0U)
 
 
-extern CHARSET_INFO my_charset_bin;
+MY_DLLEXPORT CHARSET_INFO my_charset_bin;
 extern CHARSET_INFO my_charset_big5_chinese_ci;
 extern CHARSET_INFO my_charset_big5_bin;
 extern CHARSET_INFO my_charset_cp932_japanese_ci;
@@ -336,7 +336,7 @@ extern CHARSET_INFO my_charset_gb2312_ch
 extern CHARSET_INFO my_charset_gb2312_bin;
 extern CHARSET_INFO my_charset_gbk_chinese_ci;
 extern CHARSET_INFO my_charset_gbk_bin;
-extern CHARSET_INFO my_charset_latin1;
+MY_DLLEXPORT CHARSET_INFO my_charset_latin1;
 extern CHARSET_INFO my_charset_latin1_german2_ci;
 extern CHARSET_INFO my_charset_latin1_bin;
 extern CHARSET_INFO my_charset_latin2_czech_ci;

=== modified file 'libmysqld/libmysqld.def'
--- a/libmysqld/libmysqld.def	2008-11-28 14:50:36 +0000
+++ b/libmysqld/libmysqld.def	2008-12-01 11:00:18 +0000
@@ -177,7 +177,7 @@ EXPORTS
 	mysql_sqlstate
 	charsets_dir
 	disabled_my_option
-	my_charset_latin1
+	my_charset_latin1 DATA
 	init_alloc_root
 	my_progname DATA
 	get_charset_name
@@ -228,7 +228,7 @@ EXPORTS
 	mysql_stmt_attr_set
 	mysql_stmt_field_count
 	get_defaults_options
-	my_charset_bin
+	my_charset_bin DATA
 	my_charset_same
 	modify_defaults_file
         mysql_stmt_next_result

Thread
bzr commit into mysql-6.0-bugteam branch (holyfoot:2760) Bug#41103Alexey Botchkov1 Dec