=== modified file 'setup/MYODBCSetupDataSourceDialog.cpp'
--- setup/MYODBCSetupDataSourceDialog.cpp	2010-03-01 22:45:48 +0000
+++ setup/MYODBCSetupDataSourceDialog.cpp	2010-04-14 16:05:06 +0000
@@ -1,4 +1,4 @@
-/* Copyright (©) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
 
    The MySQL Connector/ODBC is licensed under the terms of the
    GPL, like most MySQL Connectors. There are special exceptions
@@ -67,7 +67,7 @@
 #if QT_VERSION >= 0x040000
     // Qt v4
     QProcess  * pprocess    = new QProcess( this );
-    QString     stringURL   = "http://dev.mysql.com/doc/mysql/en/ODBC_Connector.html";
+    QString     stringURL   = "http://dev.mysql.com/doc/refman/5.1/en/connector-odbc.html";
 
 #if defined( Q_WS_WIN )
     if ( pprocess->startDetached( "c:\\program files\\internet explorer\\IEXPLORE.EXE", QStringList() << stringURL ) )
@@ -96,7 +96,7 @@
 #else
     // Qt v3
     QProcess  * pprocess    = new QProcess( this );
-    QString     stringURL   = "http://dev.mysql.com/doc/mysql/en/ODBC_Connector.html";
+    QString     stringURL   = "http://dev.mysql.com/doc/refman/5.1/en/connector-odbc.html";
 
 #if defined( Q_WS_WIN )
     pprocess->addArgument( "c:\\program files\\internet explorer\\IEXPLORE.EXE" );
@@ -439,6 +439,9 @@
         ptab3->ptab3c->pcheckboxMultiStatements->setChecked( nOptions & (1 << 26) ? TRUE : FALSE );
         ptab3->ptab3c->pcheckboxCapColumnSize->setChecked( nOptions & (1 << 27) ? TRUE : FALSE );
         ptab3->ptab3a->pcheckboxDisableBinaryResult->setChecked( nOptions & (1 << 28) ? TRUE : FALSE );
+        ptab3->ptab3b->pcheckboxNoI_S->setChecked(nOptions & (1 << 30) ? TRUE : FALSE);
+        ptab3->ptab3b->pcheckboxZeroDate2Min->setChecked(nOptions & (1 << 24) ? TRUE : FALSE);
+        ptab3->ptab3b->pcheckboxMinDate2Zero->setChecked(nOptions & (1 << 25) ? TRUE : FALSE);
     }
 
     ptab3->ptab3a->pcheckboxInteractive->setChecked(pDataSource->bINTERACTIVE);
@@ -486,6 +489,9 @@
     connect( ptab3->ptab3b->pcheckboxDontUseSetLocale, SIGNAL(signalAssistText(const QString&)), ptextbrowserAssist, SLOT(setHtml(const QString&)) );
     connect( ptab3->ptab3b->pcheckboxPadCharToFullLen, SIGNAL(signalAssistText(const QString&)), ptextbrowserAssist, SLOT(setHtml(const QString&)) );
     connect( ptab3->ptab3b->pcheckboxDontCacheResults, SIGNAL(signalAssistText(const QString&)), ptextbrowserAssist, SLOT(setHtml(const QString&)) );
+    connect( ptab3->ptab3b->pcheckboxNoI_S, SIGNAL(signalAssistText(const QString&)), ptextbrowserAssist, SLOT(setHtml(const QString&)) );
+    connect( ptab3->ptab3b->pcheckboxZeroDate2Min, SIGNAL(signalAssistText(const QString&)), ptextbrowserAssist, SLOT(setHtml(const QString&)) );
+    connect( ptab3->ptab3b->pcheckboxMinDate2Zero, SIGNAL(signalAssistText(const QString&)), ptextbrowserAssist, SLOT(setHtml(const QString&)) );
     connect( ptab3->ptab3c->pcheckboxReturnTableNamesSQLDescribeCol, SIGNAL(signalAssistText(const QString&)), ptextbrowserAssist, SLOT(setHtml(const QString&)) );
     connect( ptab3->ptab3c->pcheckboxIgnoreSpaceAfterFunctionNames, SIGNAL(signalAssistText(const QString&)), ptextbrowserAssist, SLOT(setHtml(const QString&)) );
     connect( ptab3->ptab3c->pcheckboxForceUseOfNamedPipes, SIGNAL(signalAssistText(const QString&)), ptextbrowserAssist, SLOT(setHtml(const QString&)) );

=== modified file 'setup/MYODBCSetupDataSourceTab3.cpp'
--- setup/MYODBCSetupDataSourceTab3.cpp	2010-03-01 22:45:48 +0000
+++ setup/MYODBCSetupDataSourceTab3.cpp	2010-04-14 15:35:51 +0000
@@ -1,4 +1,4 @@
-/* Copyright (©) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
 
    The MySQL Connector/ODBC is licensed under the terms of the
    GPL, like most MySQL Connectors. There are special exceptions
@@ -99,12 +99,18 @@
         nFlags |= 1 << 22;
     if ( ptab3a->pcheckboxAutoIncrementIsNull->isChecked() )
         nFlags |= 1 << 23;
+    if ( ptab3b->pcheckboxZeroDate2Min->isChecked() )
+        nFlags |= 1 << 24;
+    if ( ptab3b->pcheckboxMinDate2Zero->isChecked() )
+      nFlags |= 1 << 25;
     if ( ptab3c->pcheckboxMultiStatements->isChecked() )
         nFlags |= 1 << 26;
     if ( ptab3c->pcheckboxCapColumnSize->isChecked() )
         nFlags |= 1 << 27;
     if ( ptab3a->pcheckboxDisableBinaryResult->isChecked() )
         nFlags |= 1 << 28;
+    if ( ptab3b->pcheckboxNoI_S->isChecked() )
+        nFlags |= 1 << 30;
 
     return nFlags;
 }

=== modified file 'setup/MYODBCSetupDataSourceTab3b.cpp'
--- setup/MYODBCSetupDataSourceTab3b.cpp	2010-01-31 00:29:06 +0000
+++ setup/MYODBCSetupDataSourceTab3b.cpp	2010-04-14 16:07:49 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2004-2007 MySQL AB
+/* Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
 
    The MySQL Connector/ODBC is licensed under the terms of the
    GPL, like most MySQL Connectors. There are special exceptions
@@ -35,6 +35,10 @@
     QString         stringDontUseSetLocale( tr("Disable the use of extended fetch (experimental).") );
     QString         stringPadCharToFullLen( tr("Pad CHAR columns to full column length.") );
     QString         stringDontCacheResults( tr("Do not cache the results locally in the driver, instead read from server (mysql_use_result()). This works only for forward-only cursors. This option is very important in dealing with large tables when you don't want the driver to cache the entire result set.") );
+    QString         stringNoI_S( tr("Switch functions(catalog mostly) to use legacy algorythms") );
+    QString         stringZeroDate2Min( tr("Return SQL_NULL_DATA for zero date.") );
+    QString         stringMinDate2Zero( tr("Bind minimal date as zero date.") );
+
 #if QT_VERSION >= 0x040000
     QVBoxLayout *   playoutFields = new QVBoxLayout();
     setLayout( playoutFields );
@@ -109,6 +113,21 @@
     QToolTip::add( pcheckboxDontCacheResults, stringDontCacheResults );
 #endif
 
+    pcheckboxNoI_S = new MYODBCSetupCheckBox( tr("Do not use INFORMATION_SCHEMA for metadata"), this );
+    pcheckboxNoI_S->setAssistText( stringNoI_S );
+    playoutFields->addWidget( pcheckboxNoI_S );
+    MYODBC_ADD_TOOLTIP(pcheckboxNoI_S, stringNoI_S);
+
+    pcheckboxZeroDate2Min = new MYODBCSetupCheckBox( tr("Return SQL_NULL_DATA for zero date"), this );
+    pcheckboxZeroDate2Min->setAssistText( stringZeroDate2Min );
+    playoutFields->addWidget( pcheckboxZeroDate2Min );
+    MYODBC_ADD_TOOLTIP(pcheckboxZeroDate2Min, stringZeroDate2Min);
+
+    pcheckboxMinDate2Zero = new MYODBCSetupCheckBox( tr("Bind minimal date as zero date"), this );
+    pcheckboxMinDate2Zero->setAssistText( stringMinDate2Zero );
+    playoutFields->addWidget( pcheckboxMinDate2Zero );
+    MYODBC_ADD_TOOLTIP(pcheckboxMinDate2Zero, stringMinDate2Zero);
+
     playoutFields->addStretch( 10 );
 }
 

=== modified file 'setup/MYODBCSetupDataSourceTab3b.h'
--- setup/MYODBCSetupDataSourceTab3b.h	2010-01-31 00:29:06 +0000
+++ setup/MYODBCSetupDataSourceTab3b.h	2010-04-14 13:36:52 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2007 MySQL AB
+/* Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
 
    The MySQL Connector/ODBC is licensed under the terms of the
    GPL, like most MySQL Connectors. There are special exceptions
@@ -54,6 +54,9 @@
     MYODBCSetupCheckBox *pcheckboxDontUseSetLocale;
     MYODBCSetupCheckBox *pcheckboxPadCharToFullLen;
     MYODBCSetupCheckBox *pcheckboxDontCacheResults;
+    MYODBCSetupCheckBox *pcheckboxNoI_S;
+    MYODBCSetupCheckBox *pcheckboxZeroDate2Min;
+    MYODBCSetupCheckBox *pcheckboxMinDate2Zero;
 };
 
 #endif