=== modified file 'setupgui/windows/odbcdialogparams.cpp' --- setupgui/windows/odbcdialogparams.cpp 2010-01-31 00:29:06 +0000 +++ setupgui/windows/odbcdialogparams.cpp 2010-02-12 16:12:59 +0000 @@ -260,6 +260,7 @@ GET_BOOL(CURSORS_TAB, pad_char_to_full_length); GET_BOOL(CURSORS_TAB, dont_cache_result); GET_BOOL(CURSORS_TAB, force_use_of_forward_only_cursors); + GET_BOOL(CURSORS_TAB, zero_date_to_min); /* 4 - debug*/ GET_BOOL(DEBUG_TAB,save_queries); @@ -278,6 +279,7 @@ GET_BOOL(MISC_TAB, ignore_space_after_function_names); GET_BOOL(MISC_TAB, read_options_from_mycnf); GET_BOOL(MISC_TAB, disable_transactions); + GET_BOOL(MISC_TAB, min_date_to_zero); } void syncTabs(HWND hwnd, DataSource ¶ms) @@ -314,6 +316,7 @@ SET_BOOL(CURSORS_TAB, pad_char_to_full_length); SET_BOOL(CURSORS_TAB, dont_cache_result); SET_BOOL(CURSORS_TAB, force_use_of_forward_only_cursors); + SET_BOOL(CURSORS_TAB, zero_date_to_min); /* 4 - debug*/ SET_BOOL(DEBUG_TAB,save_queries); @@ -337,6 +340,7 @@ SET_BOOL(MISC_TAB, ignore_space_after_function_names); SET_BOOL(MISC_TAB, read_options_from_mycnf); SET_BOOL(MISC_TAB, disable_transactions); + SET_BOOL(MISC_TAB, min_date_to_zero); } void FillParameters(HWND hwnd, DataSource & params) @@ -771,7 +775,7 @@ if (driver_lookup_name(driver)) { wchar_t msg[256]; - swprintf(msg, L"Failure to lookup driver entry at path '%ls'", + swprintf(msg, 256, L"Failure to lookup driver entry at path '%ls'", driver->lib); MessageBox(ParentWnd, msg, L"Cannot find driver entry", MB_OK); driver_delete(driver); === modified file 'setupgui/windows/odbcdialogparams.rc' --- setupgui/windows/odbcdialogparams.rc 2010-01-31 00:29:06 +0000 +++ setupgui/windows/odbcdialogparams.rc 2010-02-12 15:54:03 +0000 @@ -1,5 +1,5 @@ -///////////////////////////////////////////////////////////////////////////// -// Copyright 2007-2008 MySQL AB, 2009 Sun Microsystems Inc. +//////////////////////////////////////////////////////////////////////////// +// Copyright 2007-2008 MySQL AB, 2009-2010 Sun Microsystems Inc. // // The MySQL Connector/ODBC is licensed under the terms of the // GPL, like most MySQL Connectors. There are special exceptions @@ -121,28 +121,27 @@ CONTROL "Disable catalog support",IDC_CHECK_no_catalog,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,72,91,10 CONTROL "Limit column size to signed 32-bit range",IDC_CHECK_limit_column_size, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,87,141,10 - END IDD_TAB3 DIALOGEX 0, 0, 209, 151 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - CONTROL "Enable dynamic cursors",IDC_CHECK_dynamic_cursor, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,12,91,10 + CONTROL "Enable dynamic cursors",IDC_CHECK_dynamic_cursor,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,12,91,10 CONTROL "Disable driver-provided cursor support",IDC_CHECK_user_manager_cursor, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,27,139,10 CONTROL "Don't cache results of forward-only cursors",IDC_CHECK_dont_cache_result, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,42,154,10 CONTROL "Force use of forward-only cursors",IDC_CHECK_force_use_of_forward_only_cursors, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,57,125,10 - CONTROL "Return matched rows instead of affected rows",IDC_CHECK_return_matching_rows, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,75,165,10 CONTROL "Enable SQL_AUTO_IS_NULL",IDC_CHECK_auto_increment_null_search, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,90,105,10 CONTROL "Pad CHAR to full length with space",IDC_CHECK_pad_char_to_full_length, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,105,127,10 + CONTROL "Return SQL_NULL_DATA for zero date",IDC_CHECK_zero_date_to_min, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,120,138,10 END IDD_TAB4 DIALOGEX 0, 0, 209, 151 @@ -174,7 +173,6 @@ CONTROL "Verify SSL Certificate",IDC_CHECK_sslverify,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,90,109,87,10 END - IDD_TAB6 DIALOGEX 0, 0, 209, 151 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD FONT 8, "MS Shell Dlg", 400, 0, 0x1 @@ -189,8 +187,11 @@ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,57,99,10 CONTROL "Disable transaction support",IDC_CHECK_disable_transactions, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,72,103,10 + CONTROL "Bind minimal date as zero date",IDC_CHECK_min_date_to_zero, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,87,138,10 END + #ifdef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// // === modified file 'setupgui/windows/resource.h' --- setupgui/windows/resource.h 2010-01-31 00:29:06 +0000 +++ setupgui/windows/resource.h 2010-02-12 15:53:49 +0000 @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Copyright 2006-2008 MySQL AB, 2009 Sun Microsystems Inc. +// Copyright 2006-2008 MySQL AB, 2009-2010 Sun Microsystems Inc. // // The MySQL Connector/ODBC is licensed under the terms of the // GPL, like most MySQL Connectors. There are special exceptions @@ -67,6 +67,7 @@ #define IDC_SSLCACHOOSER 1026 #define IDC_SSLCAPATHCHOOSER 1027 #define IDC_CHECK_sslverify 1028 +#define IDC_CHECK_min_date_to_zero 1029 #define IDC_EDIT_drvname 10000 #define IDC_EDIT_name 10000 #define IDC_EDIT_drvdesc 10001 @@ -80,8 +81,6 @@ #define IDC_EDIT_pwd 10005 #define IDC_EDIT_dbname 10006 #define IDC_EDIT_database 10006 -#define IDC_EDIT_charset 10038 -#define IDC_EDIT_initstmt 10039 #define IDC_CHECK_dont_optimize_column_width 10007 #define IDC_CHECK_return_matching_rows 10008 #define IDC_CHECK_allow_big_results 10009 @@ -98,6 +97,8 @@ #define IDC_CHECK_pad_char_to_full_length 10020 #define IDC_CHECK_dont_cache_result 10021 #define IDC_CHECK_return_table_names_for_SqlDescribeCol 10022 +#define IDC_CHECK_pad_char_to_full_length2 10022 +#define IDC_CHECK_zero_date_to_min 10022 #define IDC_CHECK_ignore_space_after_function_names 10023 #define IDC_CHECK_force_use_of_named_pipes 10024 #define IDC_CHECK_no_catalog 10025 @@ -113,6 +114,8 @@ #define IDC_EDIT_sslcipher 10035 #define IDC_CHECK_handle_binary_as_char 10036 #define IDC_CHECK_save_queries 10037 +#define IDC_EDIT_charset 10038 +#define IDC_EDIT_initstmt 10039 #define IDC_BUTTON_TEST 11014 #define IDC_BUTTON_HELP 11015 #define IDC_STATIC -1 @@ -124,7 +127,7 @@ #define _APS_NO_MFC 1 #define _APS_NEXT_RESOURCE_VALUE 137 #define _APS_NEXT_COMMAND_VALUE 32771 -#define _APS_NEXT_CONTROL_VALUE 1029 +#define _APS_NEXT_CONTROL_VALUE 1030 #define _APS_NEXT_SYMED_VALUE 110 #endif #endif