libgda r3165 - in trunk: . WixInstaller doc/C/tmpl libgda libgda/binreloc providers/mysql tools

[vivien svn gnome org]

Author: vivien
Date: Sun Jun 15 20:26:32 2008
New Revision: 3165
URL: http://svn.gnome.org/viewvc/libgda?rev=3165&view=rev

Log:
2008-06-15  Vivien Malerba <malerba gnome-db org>

	* providers/mysql/mysql_specs_dsn.xml.in:
	* providers/mysql/gda-mysql-provider.c: added a COMPRESS option to specify the
	CLIENT_COMPRESS flag when opening the connection
	* WixInstaller/*: configuration files to use with the Wix Windows
	installer to produce .msm and .msi files
	* configure.in: also use the mysql_config5 program when detecting a
	MySQL installation
	* libgda/gda-config.c: crasher fixed
	* tools/gda-sql.c: better interraction with the Windows console
	* libgda/binreloc/gda-binreloc.c: cut the last "bin" part of a path
	under MacOS X


Added:
   trunk/WixInstaller/
   trunk/WixInstaller/Clean.bat
   trunk/WixInstaller/Make.bat
   trunk/WixInstaller/README
   trunk/WixInstaller/bdb.wxs
   trunk/WixInstaller/gda-module.wxs
   trunk/WixInstaller/gda-share.wxs
   trunk/WixInstaller/gda-sql.wxs
   trunk/WixInstaller/glib-fragment.wxs
   trunk/WixInstaller/gpl.rtf
   trunk/WixInstaller/mdb.wxs
   trunk/WixInstaller/mysql.wxs
   trunk/WixInstaller/postgres.wxs
Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/doc/C/tmpl/gda-batch.sgml
   trunk/doc/C/tmpl/gda-connection.sgml
   trunk/doc/C/tmpl/gda-set.sgml
   trunk/doc/C/tmpl/gda-sql-statement.sgml
   trunk/doc/C/tmpl/gda-vconnection-data-model.sgml
   trunk/gtk-doc.make
   trunk/libgda/binreloc/gda-binreloc.c
   trunk/libgda/gda-config.c
   trunk/providers/mysql/gda-mysql-provider.c
   trunk/providers/mysql/mysql_specs_dsn.xml.in
   trunk/tools/gda-sql.c

Added: trunk/WixInstaller/Clean.bat
==============================================================================
--- (empty file)
+++ trunk/WixInstaller/Clean.bat	Sun Jun 15 20:26:32 2008
@@ -0,0 +1,7 @@
+ echo off
+echo Cleaning all computed files
+del *.wixobj
+del *~
+del *.msm
+del *.msi
+

Added: trunk/WixInstaller/Make.bat
==============================================================================
--- (empty file)
+++ trunk/WixInstaller/Make.bat	Sun Jun 15 20:26:32 2008
@@ -0,0 +1,47 @@
+ echo off
+
+REM Values to change include VERSION and INSTALLDIR, both below.
+
+REM The subdirectory to install into
+SET INSTALLDIR="Gda-4.0"
+
+if NOT "%1"=="" SET VERSION="%1"
+if NOT "%1"=="" GOTO GOT_VERSION
+
+REM The full version number of the build in XXXX.XX.XX format
+SET VERSION="3.99.3"
+
+echo.
+echo Version not specified - defaulting to %VERSION%
+echo.
+
+:GOT_VERSION
+
+echo.
+echo Compiling individual .wxs files
+
+for %%f in (*.wxs) do (
+candle -nologo -dVERSION=%VERSION% -dINSTALLDIR=%INSTALLDIR% "%%f"
+IF ERRORLEVEL 1 GOTO ERR_HANDLER
+)
+
+echo.
+echo Creating Gda merge module...
+light -nologo -out gda-module-%VERSION%.msm gda-module.wixobj glib-fragment.wixobj gda-share.wixobj bdb.wixobj mdb.wixobj mysql.wixobj postgres.wixobj
+IF ERRORLEVEL 1 GOTO ERR_HANDLER
+
+echo.
+echo Creating Gda-sql installer
+light -nologo -out gda-sql-%VERSION%.msi -dVERSION=%VERSION%  -ext WixUIExtension -cultures:en-us gda-sql.wixobj
+IF ERRORLEVEL 1 GOTO ERR_HANDLER
+
+echo.
+echo Done!
+GOTO EXIT
+
+:ERR_HANDLER
+echo.
+echo Aborting build!
+GOTO EXIT
+
+:EXIT

Added: trunk/WixInstaller/README
==============================================================================
--- (empty file)
+++ trunk/WixInstaller/README	Sun Jun 15 20:26:32 2008
@@ -0,0 +1,37 @@
+Instructions on how to use Wix to build MSI files
+-------------------------------------------------
+Wix is available at http://wix.sourceforge/net under the "Common Public License".
+
+Before using Wix (Version 3), make sure you have the following directory layout:
+.
+|-- bin
+|   |-- ...
+|   `-- ...
+|-- depend
+|   |-- bdb
+|   |-- gtk
+|   |-- mdb
+|   |-- mysql
+|   |-- pgsql
+|-- etc
+|   `-- libgda-4.0
+|-- gdawix                  <-- current directory
+|   |-- README              <-- this file
+|   |-- Make.bat            <-- execute this to build
+|   |-- Clean.bat
+|   |-- bdb.wxs
+|   |-- gda-module.wxs
+|   |-- gda-share.wxs
+|   |-- gda-sql.wxs
+|   |-- glib-fragment.wxs
+|   |-- mdb.wxs
+|   |-- mysql.wxs
+|   `-- postgres.wxs
+|-- include
+|   `-- libgda-4.0
+|-- lib
+|   |-- ...
+|   `-- ...
+`-- share
+    |-- ...
+    `-- ...

Added: trunk/WixInstaller/bdb.wxs
==============================================================================
--- (empty file)
+++ trunk/WixInstaller/bdb.wxs	Sun Jun 15 20:26:32 2008
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi";>
+  <Fragment>
+    <DirectoryRef Id="BINDIR">
+      <Component Id="BDB_DLL" Guid="5b7d464e-b07f-440c-9d39-38adaab6b769">
+        <File Id="bdb_file0" DiskId="1" Name="libdb47.dll" Source="../depend/bdb/bin/libdb47.dll" />
+        <File Id="bdb_file1" DiskId="1" Name="msvcp80.dll" Source="../depend/bdb/bin/msvcp80.dll" />
+        <File Id="bdb_file2" DiskId="1" Name="msvcr80.dll" Source="../depend/bdb/bin/msvcr80.dll" />
+      </Component>
+    </DirectoryRef>
+  </Fragment>
+</Wix>

Added: trunk/WixInstaller/gda-module.wxs
==============================================================================
--- (empty file)
+++ trunk/WixInstaller/gda-module.wxs	Sun Jun 15 20:26:32 2008
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi";>
+  <Module Id="libgda" Language="0" Version="$(var.VERSION)">
+
+    <Package Id="29ccc1c7-fd88-4da1-a5c8-d3203738cdeb" InstallerVersion="200"
+      Languages="1033" Manufacturer="GnomeDb" SummaryCodepage="1252" AdminImage="no" ShortNames="no" />
+
+      <Directory Id="TARGETDIR" Name="SourceDir">
+        <Directory Id="ProgramFilesFolder" Name="PFiles">
+          <Directory Id="GnomeDb" Name="GnomeDb">
+            <Directory Id="INSTALLDIR" Name="$(var.INSTALLDIR)">
+
+	      <!-- etc -->
+	      <Directory Id="etc" Name="etc">
+		<Directory Id="etc_libgda_4.0" Name="libgda-4.0">
+		  <Component Id="etc" Guid="35a8715d-a4fd-48f3-8b58-066ce6c1be31">
+			  <File Id="config" Name="config" Source="../etc/libgda-4.0/config" Vital="yes"/>
+			  <File Id="sales_test.db" Name="sales_test.db" Source="../etc/libgda-4.0/sales_test.db" Vital="yes"/>
+		  </Component>
+		</Directory>
+	      </Directory>
+
+	      <!-- bin -->
+              <Directory Id="BINDIR" Name="bin">
+		<Component Id="execs" Guid="cbc4f5bf-c087-4bc6-a9eb-cb9a613d84bd">
+		  <File Id="gda_sql_4.0.exe" Name="gda-sql-4.0.exe" Source="../bin/gda-sql-4.0.exe" Vital="yes">
+		    <Shortcut Id="gda_sql_4.0.exe.short" Directory="ProgramMenuDir" Name="Gda Sql console" WorkingDirectory="BINDIR"/>
+		  </File>
+		  <File Id="gda_test_connection_4.0.exe" Name="gda-test-connection-4.0.exe" Source="../bin/gda-test-connection-4.0.exe"/>
+		</Component>
+		
+		<Component Id="dlls" Guid="eb72c3cd-e761-4e13-b8cb-7bc0b6b6c4ab">
+		  <File Id="libgda_4.0_4.dll" Name="libgda-4.0-4.dll" Source="../bin/libgda-4.0-4.dll" Vital="yes"/>
+		</Component>
+
+		
+              </Directory>
+
+	      <!-- lib -->
+	      <Directory Id="lib" Name="lib">
+		<Directory Id="lib_libgda_4.0" Name="libgda-4.0">
+		  <Directory Id="PROVIDERSDIR" Name="providers">
+		    <Component Id="providers" Guid="c3d0b4ce-e262-4991-ba8f-a9ad6723efa9">
+		      <File Id="libgda_sqlite.dll" Name="libgda-sqlite.dll" Source="../lib/libgda-4.0/providers/libgda-sqlite.dll" Vital="yes"/>
+                      <File Id="libgda_postgres.dll" Name="libgda-postgres.dll" Source="../lib/libgda-4.0/providers/libgda-postgres.dll" Vital="yes"/>
+                      <File Id="libgda_mysql.dll" Name="libgda-mysql.dll" Source="../lib/libgda-4.0/providers/libgda-mysql.dll" Vital="yes"/>
+                      <File Id="libgda_mdb.dll" Name="libgda-mdb.dll" Source="../lib/libgda-4.0/providers/libgda-mdb.dll" Vital="yes"/>
+                      <File Id="libgda_bdb.dll" Name="libgda-bdb.dll" Source="../lib/libgda-4.0/providers/libgda-bdb.dll" Vital="yes"/>
+		    </Component>
+		  </Directory>
+		</Directory>
+              </Directory>
+
+            </Directory>
+          </Directory>
+        </Directory>
+
+	<Directory Id="ProgramMenuFolder" Name="Programs">
+	  <Directory Id="ProgramMenuDir" Name="GnomeDb"/>
+	</Directory>
+      </Directory>
+
+      <!-- GLib -->
+      <ComponentRef Id="GLIB_DLL"/> 
+
+      <!-- Database DLLs -->
+      <ComponentRef Id="BDB_DLL"/>
+      <ComponentRef Id="MDB_DLL"/>
+      <ComponentRef Id="MYSQL_DLL"/>
+      <ComponentRef Id="POSTGRES_DLL"/>
+
+      <ComponentRef Id="GDA_SHARE"/>
+      <ComponentRef Id="GDA_DTD"/>
+  </Module>
+</Wix>

Added: trunk/WixInstaller/gda-share.wxs
==============================================================================
--- (empty file)
+++ trunk/WixInstaller/gda-share.wxs	Sun Jun 15 20:26:32 2008
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi";>
+  <Fragment>
+    <DirectoryRef Id="INSTALLDIR">
+      <Directory Id="directory0" Name="share">
+        <Directory Id="directory4" Name="libgda-4.0">
+          <Component Id="GDA_SHARE" DiskId="1" Guid="b16a06f1-4342-4858-a9b7-1c9be753d53b">
+            <File Id="share_file167" Name="bdb_specs_dsn.xml" Source="../share/libgda-4.0/bdb_specs_dsn.xml" />
+            <File Id="share_file168" Name="information_schema.xml" Source="../share/libgda-4.0/information_schema.xml" />
+            <File Id="share_file169" Name="mdb_specs_dsn.xml" Source="../share/libgda-4.0/mdb_specs_dsn.xml" />
+            <File Id="share_file170" Name="mysql_specs_add_column.xml" Source="../share/libgda-4.0/mysql_specs_add_column.xml" />
+            <File Id="share_file171" Name="mysql_specs_create_db.xml" Source="../share/libgda-4.0/mysql_specs_create_db.xml" />
+            <File Id="share_file172" Name="mysql_specs_create_index.xml" Source="../share/libgda-4.0/mysql_specs_create_index.xml" />
+            <File Id="share_file173" Name="mysql_specs_create_table.xml" Source="../share/libgda-4.0/mysql_specs_create_table.xml" />
+            <File Id="share_file174" Name="mysql_specs_create_view.xml" Source="../share/libgda-4.0/mysql_specs_create_view.xml" />
+            <File Id="share_file175" Name="mysql_specs_drop_column.xml" Source="../share/libgda-4.0/mysql_specs_drop_column.xml" />
+            <File Id="share_file176" Name="mysql_specs_drop_db.xml" Source="../share/libgda-4.0/mysql_specs_drop_db.xml" />
+            <File Id="share_file177" Name="mysql_specs_drop_index.xml" Source="../share/libgda-4.0/mysql_specs_drop_index.xml" />
+            <File Id="share_file178" Name="mysql_specs_drop_table.xml" Source="../share/libgda-4.0/mysql_specs_drop_table.xml" />
+            <File Id="share_file179" Name="mysql_specs_drop_view.xml" Source="../share/libgda-4.0/mysql_specs_drop_view.xml" />
+            <File Id="share_file180" Name="mysql_specs_dsn.xml" Source="../share/libgda-4.0/mysql_specs_dsn.xml" />
+            <File Id="share_file181" Name="mysql_specs_rename_table.xml" Source="../share/libgda-4.0/mysql_specs_rename_table.xml" />
+            <File Id="share_file182" Name="postgres_specs_add_column.xml" Source="../share/libgda-4.0/postgres_specs_add_column.xml" />
+            <File Id="share_file183" Name="postgres_specs_create_db.xml" Source="../share/libgda-4.0/postgres_specs_create_db.xml" />
+            <File Id="share_file184" Name="postgres_specs_create_index.xml" Source="../share/libgda-4.0/postgres_specs_create_index.xml" />
+            <File Id="share_file185" Name="postgres_specs_create_table.xml" Source="../share/libgda-4.0/postgres_specs_create_table.xml" />
+            <File Id="share_file186" Name="postgres_specs_create_view.xml" Source="../share/libgda-4.0/postgres_specs_create_view.xml" />
+            <File Id="share_file187" Name="postgres_specs_drop_column.xml" Source="../share/libgda-4.0/postgres_specs_drop_column.xml" />
+            <File Id="share_file188" Name="postgres_specs_drop_db.xml" Source="../share/libgda-4.0/postgres_specs_drop_db.xml" />
+            <File Id="share_file189" Name="postgres_specs_drop_index.xml" Source="../share/libgda-4.0/postgres_specs_drop_index.xml" />
+            <File Id="share_file190" Name="postgres_specs_drop_table.xml" Source="../share/libgda-4.0/postgres_specs_drop_table.xml" />
+            <File Id="share_file191" Name="postgres_specs_drop_view.xml" Source="../share/libgda-4.0/postgres_specs_drop_view.xml" />
+            <File Id="share_file192" Name="postgres_specs_dsn.xml" Source="../share/libgda-4.0/postgres_specs_dsn.xml" />
+            <File Id="share_file193" Name="postgres_specs_rename_table.xml" Source="../share/libgda-4.0/postgres_specs_rename_table.xml" />
+            <File Id="share_file194" Name="sqlite_specs_add_column.xml" Source="../share/libgda-4.0/sqlite_specs_add_column.xml" />
+            <File Id="share_file195" Name="sqlite_specs_create_db.xml" Source="../share/libgda-4.0/sqlite_specs_create_db.xml" />
+            <File Id="share_file196" Name="sqlite_specs_create_index.xml" Source="../share/libgda-4.0/sqlite_specs_create_index.xml" />
+            <File Id="share_file197" Name="sqlite_specs_create_table.xml" Source="../share/libgda-4.0/sqlite_specs_create_table.xml" />
+            <File Id="share_file198" Name="sqlite_specs_create_view.xml" Source="../share/libgda-4.0/sqlite_specs_create_view.xml" />
+            <File Id="share_file199" Name="sqlite_specs_drop_db.xml" Source="../share/libgda-4.0/sqlite_specs_drop_db.xml" />
+            <File Id="share_file200" Name="sqlite_specs_drop_index.xml" Source="../share/libgda-4.0/sqlite_specs_drop_index.xml" />
+            <File Id="share_file201" Name="sqlite_specs_drop_table.xml" Source="../share/libgda-4.0/sqlite_specs_drop_table.xml" />
+            <File Id="share_file202" Name="sqlite_specs_drop_view.xml" Source="../share/libgda-4.0/sqlite_specs_drop_view.xml" />
+            <File Id="share_file203" Name="sqlite_specs_dsn.xml" Source="../share/libgda-4.0/sqlite_specs_dsn.xml" />
+            <File Id="share_file204" Name="sqlite_specs_rename_table.xml" Source="../share/libgda-4.0/sqlite_specs_rename_table.xml" />
+          </Component>
+          <Directory Id="directory5" Name="dtd">
+            <Component Id="GDA_DTD" DiskId="1" Guid="b50b1027-9ad6-4174-98fa-a824a6ccd066">
+              <File Id="share_file205" Name="libgda-array.dtd" Source="../share/libgda-4.0/dtd/libgda-array.dtd" />
+              <File Id="share_file206" Name="libgda-paramlist.dtd" Source="../share/libgda-4.0/dtd/libgda-paramlist.dtd" />
+              <File Id="share_file207" Name="libgda-server-operation.dtd" Source="../share/libgda-4.0/dtd/libgda-server-operation.dtd" />
+            </Component>
+          </Directory>
+        </Directory>
+      </Directory>
+    </DirectoryRef>
+  </Fragment>
+</Wix>

Added: trunk/WixInstaller/gda-sql.wxs
==============================================================================
--- (empty file)
+++ trunk/WixInstaller/gda-sql.wxs	Sun Jun 15 20:26:32 2008
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi";>
+
+  <Product Id="ed896b47-d102-47b0-b915-171c7eff56d8" Name="Gda Sql console" UpgradeCode="fc98463b-5f4f-4364-9764-e3c798c88ef2" Language="1033" Version="$(var.VERSION)" Manufacturer="GnomeDb">
+
+    <Package Manufacturer="GnomeDb" InstallerVersion="200" Compressed="yes" />
+
+    <Media Id="1" Cabinet="Sample.cab" EmbedCab="yes" DiskPrompt="CD-ROM #1" />
+    <Property Id="DiskPrompt" Value="GnomeDb install [1]" />
+
+    <Directory Id="TARGETDIR" Name="SourceDir">
+      <Directory Id="ProgramFilesFolder" Name="PFiles">
+        <Directory Id="GnomeDb" Name="GnomeDb">
+          <Directory Id="INSTALLDIR" Name="$(var.INSTALLDIR)">
+
+            <Merge Id="libgda.29ccc1c7-fd88-4da1-a5c8-d3203738cdeb" Language="1033" SourceFile="gda-module-$(var.VERSION).msm" DiskId="1" />
+
+          </Directory>
+        </Directory>
+      </Directory>
+    </Directory>
+
+    <Feature Id="GdaModule" Display="hidden" Title="Core" Level="1">
+      <MergeRef Id="libgda.29ccc1c7-fd88-4da1-a5c8-d3203738cdeb" />
+    </Feature>
+
+     <UIRef Id="WixUI_Minimal" />
+     <WixVariable Id="WixUILicenseRtf" Value="gpl.rtf" />
+
+  </Product>
+</Wix>

Added: trunk/WixInstaller/glib-fragment.wxs
==============================================================================
--- (empty file)
+++ trunk/WixInstaller/glib-fragment.wxs	Sun Jun 15 20:26:32 2008
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi";>
+  <Fragment>
+    <DirectoryRef Id="INSTALLDIR">
+      <Directory Id="glib_bin" Name="bin">
+        <Component Id="GLIB_DLL" Guid="76b40e4c-3ae6-44ac-9e57-391c1a6fd960">
+	  <File Id="glib_file0" DiskId="1" Name="charset.dll" Source="../depend/gtk/bin/charset.dll" />
+	  <File Id="glib_file1" DiskId="1" Name="iconv.dll" Source="../depend/gtk/bin/iconv.dll" />
+	  <File Id="glib_file2" DiskId="1" Name="intl.dll" Source="../depend/gtk/bin/intl.dll" />
+	  <File Id="glib_file8" DiskId="1" Name="libgio-2.0-0.dll" Source="../depend/gtk/bin/libgio-2.0-0.dll" />
+	  <File Id="glib_file9" DiskId="1" Name="libglib-2.0-0.dll" Source="../depend/gtk/bin/libglib-2.0-0.dll" />
+	  <File Id="glib_file10" DiskId="1" Name="libgmodule-2.0-0.dll" Source="../depend/gtk/bin/libgmodule-2.0-0.dll" />
+	  <File Id="glib_file11" DiskId="1" Name="libgobject-2.0-0.dll" Source="../depend/gtk/bin/libgobject-2.0-0.dll" />
+	  <File Id="glib_file12" DiskId="1" Name="libgthread-2.0-0.dll" Source="../depend/gtk/bin/libgthread-2.0-0.dll" />
+	  <File Id="glib_file20" DiskId="1" Name="libxml2.dll" Source="../depend/gtk/bin/libxml2.dll" />
+	  <File Id="glib_file21" DiskId="1" Name="zlib1.dll" Source="../depend/gtk/bin/zlib1.dll" />
+        </Component>
+      </Directory>
+    </DirectoryRef>
+  </Fragment>
+</Wix>

Added: trunk/WixInstaller/gpl.rtf
==============================================================================
--- (empty file)
+++ trunk/WixInstaller/gpl.rtf	Sun Jun 15 20:26:32 2008
@@ -0,0 +1,342 @@
+{\rtf1\ansi\ansicpg1252\deff0\deflang1033{\fonttbl{\f0\fswiss\fcharset0 Arial;}}
+{\*\generator Msftedit 5.41.15.1507;}\viewkind4\uc1\pard\f0\fs20\tab\tab     GNU GENERAL PUBLIC LICENSE\par
+\tab\tab        Version 2, June 1991\par
+\par
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,\par
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\par
+ Everyone is permitted to copy and distribute verbatim copies\par
+ of this license document, but changing it is not allowed.\par
+\par
+\tab\tab\tab     Preamble\par
+\par
+  The licenses for most software are designed to take away your\par
+freedom to share and change it.  By contrast, the GNU General Public\par
+License is intended to guarantee your freedom to share and change free\par
+software--to make sure the software is free for all its users.  This\par
+General Public License applies to most of the Free Software\par
+Foundation's software and to any other program whose authors commit to\par
+using it.  (Some other Free Software Foundation software is covered by\par
+the GNU Lesser General Public License instead.)  You can apply it to\par
+your programs, too.\par
+\par
+  When we speak of free software, we are referring to freedom, not\par
+price.  Our General Public Licenses are designed to make sure that you\par
+have the freedom to distribute copies of free software (and charge for\par
+this service if you wish), that you receive source code or can get it\par
+if you want it, that you can change the software or use pieces of it\par
+in new free programs; and that you know you can do these things.\par
+\par
+  To protect your rights, we need to make restrictions that forbid\par
+anyone to deny you these rights or to ask you to surrender the rights.\par
+These restrictions translate to certain responsibilities for you if you\par
+distribute copies of the software, or if you modify it.\par
+\par
+  For example, if you distribute copies of such a program, whether\par
+gratis or for a fee, you must give the recipients all the rights that\par
+you have.  You must make sure that they, too, receive or can get the\par
+source code.  And you must show them these terms so they know their\par
+rights.\par
+\par
+  We protect your rights with two steps: (1) copyright the software, and\par
+(2) offer you this license which gives you legal permission to copy,\par
+distribute and/or modify the software.\par
+\par
+  Also, for each author's protection and ours, we want to make certain\par
+that everyone understands that there is no warranty for this free\par
+software.  If the software is modified by someone else and passed on, we\par
+want its recipients to know that what they have is not the original, so\par
+that any problems introduced by others will not reflect on the original\par
+authors' reputations.\par
+\par
+  Finally, any free program is threatened constantly by software\par
+patents.  We wish to avoid the danger that redistributors of a free\par
+program will individually obtain patent licenses, in effect making the\par
+program proprietary.  To prevent this, we have made it clear that any\par
+patent must be licensed for everyone's free use or not licensed at all.\par
+\par
+  The precise terms and conditions for copying, distribution and\par
+modification follow.\par
+\par
+\tab\tab     GNU GENERAL PUBLIC LICENSE\par
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION\par
+\par
+  0. This License applies to any program or other work which contains\par
+a notice placed by the copyright holder saying it may be distributed\par
+under the terms of this General Public License.  The "Program", below,\par
+refers to any such program or work, and a "work based on the Program"\par
+means either the Program or any derivative work under copyright law:\par
+that is to say, a work containing the Program or a portion of it,\par
+either verbatim or with modifications and/or translated into another\par
+language.  (Hereinafter, translation is included without limitation in\par
+the term "modification".)  Each licensee is addressed as "you".\par
+\par
+Activities other than copying, distribution and modification are not\par
+covered by this License; they are outside its scope.  The act of\par
+running the Program is not restricted, and the output from the Program\par
+is covered only if its contents constitute a work based on the\par
+Program (independent of having been made by running the Program).\par
+Whether that is true depends on what the Program does.\par
+\par
+  1. You may copy and distribute verbatim copies of the Program's\par
+source code as you receive it, in any medium, provided that you\par
+conspicuously and appropriately publish on each copy an appropriate\par
+copyright notice and disclaimer of warranty; keep intact all the\par
+notices that refer to this License and to the absence of any warranty;\par
+and give any other recipients of the Program a copy of this License\par
+along with the Program.\par
+\par
+You may charge a fee for the physical act of transferring a copy, and\par
+you may at your option offer warranty protection in exchange for a fee.\par
+\par
+  2. You may modify your copy or copies of the Program or any portion\par
+of it, thus forming a work based on the Program, and copy and\par
+distribute such modifications or work under the terms of Section 1\par
+above, provided that you also meet all of these conditions:\par
+\par
+    a) You must cause the modified files to carry prominent notices\par
+    stating that you changed the files and the date of any change.\par
+\par
+    b) You must cause any work that you distribute or publish, that in\par
+    whole or in part contains or is derived from the Program or any\par
+    part thereof, to be licensed as a whole at no charge to all third\par
+    parties under the terms of this License.\par
+\par
+    c) If the modified program normally reads commands interactively\par
+    when run, you must cause it, when started running for such\par
+    interactive use in the most ordinary way, to print or display an\par
+    announcement including an appropriate copyright notice and a\par
+    notice that there is no warranty (or else, saying that you provide\par
+    a warranty) and that users may redistribute the program under\par
+    these conditions, and telling the user how to view a copy of this\par
+    License.  (Exception: if the Program itself is interactive but\par
+    does not normally print such an announcement, your work based on\par
+    the Program is not required to print an announcement.)\par
+\par
+These requirements apply to the modified work as a whole.  If\par
+identifiable sections of that work are not derived from the Program,\par
+and can be reasonably considered independent and separate works in\par
+themselves, then this License, and its terms, do not apply to those\par
+sections when you distribute them as separate works.  But when you\par
+distribute the same sections as part of a whole which is a work based\par
+on the Program, the distribution of the whole must be on the terms of\par
+this License, whose permissions for other licensees extend to the\par
+entire whole, and thus to each and every part regardless of who wrote it.\par
+\par
+Thus, it is not the intent of this section to claim rights or contest\par
+your rights to work written entirely by you; rather, the intent is to\par
+exercise the right to control the distribution of derivative or\par
+collective works based on the Program.\par
+\par
+In addition, mere aggregation of another work not based on the Program\par
+with the Program (or with a work based on the Program) on a volume of\par
+a storage or distribution medium does not bring the other work under\par
+the scope of this License.\par
+\par
+  3. You may copy and distribute the Program (or a work based on it,\par
+under Section 2) in object code or executable form under the terms of\par
+Sections 1 and 2 above provided that you also do one of the following:\par
+\par
+    a) Accompany it with the complete corresponding machine-readable\par
+    source code, which must be distributed under the terms of Sections\par
+    1 and 2 above on a medium customarily used for software interchange; or,\par
+\par
+    b) Accompany it with a written offer, valid for at least three\par
+    years, to give any third party, for a charge no more than your\par
+    cost of physically performing source distribution, a complete\par
+    machine-readable copy of the corresponding source code, to be\par
+    distributed under the terms of Sections 1 and 2 above on a medium\par
+    customarily used for software interchange; or,\par
+\par
+    c) Accompany it with the information you received as to the offer\par
+    to distribute corresponding source code.  (This alternative is\par
+    allowed only for noncommercial distribution and only if you\par
+    received the program in object code or executable form with such\par
+    an offer, in accord with Subsection b above.)\par
+\par
+The source code for a work means the preferred form of the work for\par
+making modifications to it.  For an executable work, complete source\par
+code means all the source code for all modules it contains, plus any\par
+associated interface definition files, plus the scripts used to\par
+control compilation and installation of the executable.  However, as a\par
+special exception, the source code distributed need not include\par
+anything that is normally distributed (in either source or binary\par
+form) with the major components (compiler, kernel, and so on) of the\par
+operating system on which the executable runs, unless that component\par
+itself accompanies the executable.\par
+\par
+If distribution of executable or object code is made by offering\par
+access to copy from a designated place, then offering equivalent\par
+access to copy the source code from the same place counts as\par
+distribution of the source code, even though third parties are not\par
+compelled to copy the source along with the object code.\par
+\par
+  4. You may not copy, modify, sublicense, or distribute the Program\par
+except as expressly provided under this License.  Any attempt\par
+otherwise to copy, modify, sublicense or distribute the Program is\par
+void, and will automatically terminate your rights under this License.\par
+However, parties who have received copies, or rights, from you under\par
+this License will not have their licenses terminated so long as such\par
+parties remain in full compliance.\par
+\par
+  5. You are not required to accept this License, since you have not\par
+signed it.  However, nothing else grants you permission to modify or\par
+distribute the Program or its derivative works.  These actions are\par
+prohibited by law if you do not accept this License.  Therefore, by\par
+modifying or distributing the Program (or any work based on the\par
+Program), you indicate your acceptance of this License to do so, and\par
+all its terms and conditions for copying, distributing or modifying\par
+the Program or works based on it.\par
+\par
+  6. Each time you redistribute the Program (or any work based on the\par
+Program), the recipient automatically receives a license from the\par
+original licensor to copy, distribute or modify the Program subject to\par
+these terms and conditions.  You may not impose any further\par
+restrictions on the recipients' exercise of the rights granted herein.\par
+You are not responsible for enforcing compliance by third parties to\par
+this License.\par
+\par
+  7. If, as a consequence of a court judgment or allegation of patent\par
+infringement or for any other reason (not limited to patent issues),\par
+conditions are imposed on you (whether by court order, agreement or\par
+otherwise) that contradict the conditions of this License, they do not\par
+excuse you from the conditions of this License.  If you cannot\par
+distribute so as to satisfy simultaneously your obligations under this\par
+License and any other pertinent obligations, then as a consequence you\par
+may not distribute the Program at all.  For example, if a patent\par
+license would not permit royalty-free redistribution of the Program by\par
+all those who receive copies directly or indirectly through you, then\par
+the only way you could satisfy both it and this License would be to\par
+refrain entirely from distribution of the Program.\par
+\par
+If any portion of this section is held invalid or unenforceable under\par
+any particular circumstance, the balance of the section is intended to\par
+apply and the section as a whole is intended to apply in other\par
+circumstances.\par
+\par
+It is not the purpose of this section to induce you to infringe any\par
+patents or other property right claims or to contest validity of any\par
+such claims; this section has the sole purpose of protecting the\par
+integrity of the free software distribution system, which is\par
+implemented by public license practices.  Many people have made\par
+generous contributions to the wide range of software distributed\par
+through that system in reliance on consistent application of that\par
+system; it is up to the author/donor to decide if he or she is willing\par
+to distribute software through any other system and a licensee cannot\par
+impose that choice.\par
+\par
+This section is intended to make thoroughly clear what is believed to\par
+be a consequence of the rest of this License.\par
+\par
+  8. If the distribution and/or use of the Program is restricted in\par
+certain countries either by patents or by copyrighted interfaces, the\par
+original copyright holder who places the Program under this License\par
+may add an explicit geographical distribution limitation excluding\par
+those countries, so that distribution is permitted only in or among\par
+countries not thus excluded.  In such case, this License incorporates\par
+the limitation as if written in the body of this License.\par
+\par
+  9. The Free Software Foundation may publish revised and/or new versions\par
+of the General Public License from time to time.  Such new versions will\par
+be similar in spirit to the present version, but may differ in detail to\par
+address new problems or concerns.\par
+\par
+Each version is given a distinguishing version number.  If the Program\par
+specifies a version number of this License which applies to it and "any\par
+later version", you have the option of following the terms and conditions\par
+either of that version or of any later version published by the Free\par
+Software Foundation.  If the Program does not specify a version number of\par
+this License, you may choose any version ever published by the Free Software\par
+Foundation.\par
+\par
+  10. If you wish to incorporate parts of the Program into other free\par
+programs whose distribution conditions are different, write to the author\par
+to ask for permission.  For software which is copyrighted by the Free\par
+Software Foundation, write to the Free Software Foundation; we sometimes\par
+make exceptions for this.  Our decision will be guided by the two goals\par
+of preserving the free status of all derivatives of our free software and\par
+of promoting the sharing and reuse of software generally.\par
+\par
+\tab\tab\tab     NO WARRANTY\par
+\par
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY\par
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN\par
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES\par
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED\par
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF\par
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS\par
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE\par
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,\par
+REPAIR OR CORRECTION.\par
+\par
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\par
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR\par
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,\par
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING\par
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED\par
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY\par
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER\par
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE\par
+POSSIBILITY OF SUCH DAMAGES.\par
+\par
+\tab\tab      END OF TERMS AND CONDITIONS\par
+\par
+\tab     How to Apply These Terms to Your New Programs\par
+\par
+  If you develop a new program, and you want it to be of the greatest\par
+possible use to the public, the best way to achieve this is to make it\par
+free software which everyone can redistribute and change under these terms.\par
+\par
+  To do so, attach the following notices to the program.  It is safest\par
+to attach them to the start of each source file to most effectively\par
+convey the exclusion of warranty; and each file should have at least\par
+the "copyright" line and a pointer to where the full notice is found.\par
+\par
+    <one line to give the program's name and a brief idea of what it does.>\par
+    Copyright (C) <year>  <name of author>\par
+\par
+    This program is free software; you can redistribute it and/or modify\par
+    it under the terms of the GNU General Public License as published by\par
+    the Free Software Foundation; either version 2 of the License, or\par
+    (at your option) any later version.\par
+\par
+    This program is distributed in the hope that it will be useful,\par
+    but WITHOUT ANY WARRANTY; without even the implied warranty of\par
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\par
+    GNU General Public License for more details.\par
+\par
+    You should have received a copy of the GNU General Public License along\par
+    with this program; if not, write to the Free Software Foundation, Inc.,\par
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\par
+\par
+Also add information on how to contact you by electronic and paper mail.\par
+\par
+If the program is interactive, make it output a short notice like this\par
+when it starts in an interactive mode:\par
+\par
+    Gnomovision version 69, Copyright (C) year name of author\par
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\par
+    This is free software, and you are welcome to redistribute it\par
+    under certain conditions; type `show c' for details.\par
+\par
+The hypothetical commands `show w' and `show c' should show the appropriate\par
+parts of the General Public License.  Of course, the commands you use may\par
+be called something other than `show w' and `show c'; they could even be\par
+mouse-clicks or menu items--whatever suits your program.\par
+\par
+You should also get your employer (if you work as a programmer) or your\par
+school, if any, to sign a "copyright disclaimer" for the program, if\par
+necessary.  Here is a sample; alter the names:\par
+\par
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program\par
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.\par
+\par
+  <signature of Ty Coon>, 1 April 1989\par
+  Ty Coon, President of Vice\par
+\par
+This General Public License does not permit incorporating your program into\par
+proprietary programs.  If your program is a subroutine library, you may\par
+consider it more useful to permit linking proprietary applications with the\par
+library.  If this is what you want to do, use the GNU Lesser General\par
+Public License instead of this License.\par
+}
+
\ No newline at end of file

Added: trunk/WixInstaller/mdb.wxs
==============================================================================
--- (empty file)
+++ trunk/WixInstaller/mdb.wxs	Sun Jun 15 20:26:32 2008
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi";>
+  <Fragment>
+    <DirectoryRef Id="BINDIR">
+      <Component Id="MDB_DLL" Guid="3e6192e0-aa2a-4567-af20-60205165eb1e">
+        <File Id="mdb_file0" DiskId="1" Name="libmdb-0.dll" Source="..\depend\mdb\bin\libmdb-0.dll" />
+      </Component>
+    </DirectoryRef>
+  </Fragment>
+</Wix>

Added: trunk/WixInstaller/mysql.wxs
==============================================================================
--- (empty file)
+++ trunk/WixInstaller/mysql.wxs	Sun Jun 15 20:26:32 2008
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi";>
+  <Fragment>
+    <DirectoryRef Id="BINDIR">
+      <Component Id="MYSQL_DLL" Guid="355dd2ba-8e87-43ba-88c4-6b76aa376573">
+	<File Id="mysql_file0" DiskId="1" Name="libmySQL.dll" Source="../depend/mysql/bin/libmySQL.dll" />
+      </Component>
+    </DirectoryRef>
+  </Fragment>
+</Wix>

Added: trunk/WixInstaller/postgres.wxs
==============================================================================
--- (empty file)
+++ trunk/WixInstaller/postgres.wxs	Sun Jun 15 20:26:32 2008
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi";>
+  <Fragment>
+    <DirectoryRef Id="BINDIR">
+      <Component Id="POSTGRES_DLL" DiskId="1" Guid="d86aa3e4-8ca7-4786-8002-c97da597586e">
+        <File Id="postgres_file0" DiskId="1" Name="libpq.dll" Source="../depend/pgsql/bin/libpq.dll" />
+        <File Id="postgres_file1" DiskId="1" Name="comerr32.dll" Source="../depend/pgsql/bin/comerr32.dll" />
+        <File Id="postgres_file2" DiskId="1" Name="gssapi32.dll" Source="../depend/pgsql/bin/gssapi32.dll" />
+	<!--<File Id="postgres_file3" DiskId="1" Name="iconv.dll" Source="../depend/pgsql/bin/iconv.dll" />-->
+        <File Id="postgres_file4" DiskId="1" Name="k5sprt32.dll" Source="../depend/pgsql/bin/k5sprt32.dll" />
+        <File Id="postgres_file5" DiskId="1" Name="krb5_32.dll" Source="../depend/pgsql/bin/krb5_32.dll" />
+        <File Id="postgres_file6" DiskId="1" Name="libeay32.dll" Source="../depend/pgsql/bin/libeay32.dll" />
+        <File Id="postgres_file7" DiskId="1" Name="libiconv2.dll" Source="../depend/pgsql/bin/libiconv2.dll" />
+        <File Id="postgres_file8" DiskId="1" Name="libintl3.dll" Source="../depend/pgsql/bin/libintl3.dll" />
+        <File Id="postgres_file9" DiskId="1" Name="msvcr71.dll" Source="../depend/pgsql/bin/msvcr71.dll" />
+        <File Id="postgres_file10" DiskId="1" Name="pgaevent.dll" Source="../depend/pgsql/bin/pgaevent.dll" />
+        <File Id="postgres_file11" DiskId="1" Name="ssleay32.dll" Source="../depend/pgsql/bin/ssleay32.dll" />
+      </Component>
+    </DirectoryRef>
+  </Fragment>
+</Wix>

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sun Jun 15 20:26:32 2008
@@ -415,7 +415,7 @@
 		AC_MSG_WARN(Can't auto determine Mysql installation in cross-compiling environment)
 	else
 		AC_MSG_CHECKING(for MySQL files)
-		AC_PATH_PROG(MYSQL_CONFIG, mysql_config)
+		AC_PATH_PROGS(MYSQL_CONFIG, mysql_config mysql_config5)
 	fi
 else
 	AC_MSG_CHECKING(for MySQL files in $withval)
@@ -423,7 +423,7 @@
 	then
 		mysql_req=$withval	
 	else
-		AC_PATH_PROG(MYSQL_CONFIG, mysql_config, [], $withval/bin)
+		AC_PATH_PROGS(MYSQL_CONFIG, mysql_config mysql_config5, [], $withval/bin)
 	fi	
 fi
 ])
@@ -432,7 +432,7 @@
 if test $mysql_req = auto
 then
 	AC_MSG_CHECKING(for MySQL files)
-	AC_PATH_PROG(MYSQL_CONFIG, mysql_config)
+	AC_PATH_PROGS(MYSQL_CONFIG, mysql_config mysql_config5)
 fi
 
 if test x$MYSQL_CONFIG != x

Modified: trunk/doc/C/tmpl/gda-batch.sgml
==============================================================================
--- trunk/doc/C/tmpl/gda-batch.sgml	(original)
+++ trunk/doc/C/tmpl/gda-batch.sgml	Sun Jun 15 20:26:32 2008
@@ -88,3 +88,14 @@
 @Returns: 
 
 
+<!-- ##### FUNCTION gda_batch_get_parameters ##### -->
+<para>
+
+</para>
+
+ batch: 
+ out_params: 
+ error: 
+ Returns: 
+
+

Modified: trunk/doc/C/tmpl/gda-connection.sgml
==============================================================================
--- trunk/doc/C/tmpl/gda-connection.sgml	(original)
+++ trunk/doc/C/tmpl/gda-connection.sgml	Sun Jun 15 20:26:32 2008
@@ -272,6 +272,19 @@
 @Returns: 
 
 
+<!-- ##### FUNCTION gda_connection_batch_execute ##### -->
+<para>
+
+</para>
+
+ cnc: 
+ batch: 
+ params: 
+ model_usage: 
+ error: 
+ Returns: 
+
+
 <!-- ##### FUNCTION gda_connection_begin_transaction ##### -->
 <para>
 

Modified: trunk/doc/C/tmpl/gda-set.sgml
==============================================================================
--- trunk/doc/C/tmpl/gda-set.sgml	(original)
+++ trunk/doc/C/tmpl/gda-set.sgml	Sun Jun 15 20:26:32 2008
@@ -208,6 +208,7 @@
 
 @set: 
 @holder: 
+ Returns: 
 
 
 <!-- ##### FUNCTION gda_set_remove_holder ##### -->

Modified: trunk/doc/C/tmpl/gda-sql-statement.sgml
==============================================================================
--- trunk/doc/C/tmpl/gda-sql-statement.sgml	(original)
+++ trunk/doc/C/tmpl/gda-sql-statement.sgml	Sun Jun 15 20:26:32 2008
@@ -645,6 +645,50 @@
 @case_s: not %NULL if expression is a CASE WHEN ... expression
 @cast_as: not %NULL if expression must be cast to another data type
 
+<!-- ##### FUNCTION gda_sql_expr_new ##### -->
+<para>
+
+</para>
+
+ parent: 
+ Returns: 
+
+
+<!-- ##### FUNCTION gda_sql_expr_free ##### -->
+<para>
+
+</para>
+
+ expr: 
+
+
+<!-- ##### FUNCTION gda_sql_expr_copy ##### -->
+<para>
+
+</para>
+
+ expr: 
+ Returns: 
+
+
+<!-- ##### FUNCTION gda_sql_expr_serialize ##### -->
+<para>
+
+</para>
+
+ expr: 
+ Returns: 
+
+
+<!-- ##### FUNCTION gda_sql_expr_take_select ##### -->
+<para>
+
+</para>
+
+ expr: 
+ stmt: 
+
+
 <!-- ##### STRUCT GdaSqlParamSpec ##### -->
 <para>
 
@@ -734,12 +778,62 @@
   This structure represents the name of a table's field.
 </para>
 
+ any: 
+ field_name: 
+ validity_meta_table_column: 
+
+<!-- ##### FUNCTION gda_sql_field_new ##### -->
+<para>
+
+</para>
+
+ parent: 
+ Returns: 
+
+
+<!-- ##### FUNCTION gda_sql_field_free ##### -->
+<para>
+
+</para>
+
+ field: 
+
+
+<!-- ##### FUNCTION gda_sql_field_copy ##### -->
+<para>
+
+</para>
+
+ field: 
+ Returns: 
+
+
+<!-- ##### FUNCTION gda_sql_field_serialize ##### -->
+<para>
+
+</para>
+
+ field: 
+ Returns: 
+
+
+<!-- ##### FUNCTION gda_sql_field_take_name ##### -->
+<para>
+
+</para>
+
+ field: 
+ value: 
+
 
 <!-- ##### STRUCT GdaSqlTable ##### -->
 <para>
   This structure represents the name of a table.
 </para>
 
+ any: 
+ table_name: 
+ validity_meta_object: 
 
 <!-- ##### FUNCTION gda_sql_table_new ##### -->
 <para>

Modified: trunk/doc/C/tmpl/gda-vconnection-data-model.sgml
==============================================================================
--- trunk/doc/C/tmpl/gda-vconnection-data-model.sgml	(original)
+++ trunk/doc/C/tmpl/gda-vconnection-data-model.sgml	Sun Jun 15 20:26:32 2008
@@ -25,6 +25,16 @@
 </para>
 
 
+<!-- ##### USER_FUNCTION GdaVConnectionDataModelFunc ##### -->
+<para>
+
+</para>
+
+ model: 
+ table_name: 
+ data: 
+
+
 <!-- ##### STRUCT GdaVconnectionDataModelSpec ##### -->
 <para>
 

Modified: trunk/gtk-doc.make
==============================================================================
--- trunk/gtk-doc.make	(original)
+++ trunk/gtk-doc.make	Sun Jun 15 20:26:32 2008
@@ -5,11 +5,11 @@
 ####################################
 
 if GTK_DOC_USE_LIBTOOL
-GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
-GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
+GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
 else
-GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
-GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
+GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
 endif
 
 # We set GPATH here; this gives us semantics for GNU make
@@ -38,7 +38,12 @@
 	$(DOC_MODULE).prerequisites \
 	$(DOC_MODULE).signals
 
-CLEANFILES = $(SCANOBJ_FILES) $(DOC_MODULE)-unused.txt $(DOC_STAMPS)
+REPORT_FILES = \
+	$(DOC_MODULE)-undocumented.txt \
+	$(DOC_MODULE)-undeclared.txt \
+	$(DOC_MODULE)-unused.txt
+
+CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
 
 if ENABLE_GTK_DOC
 all-local: html-build.stamp
@@ -79,6 +84,10 @@
 tmpl.stamp: tmpl-build.stamp
 	@true
 
+tmpl/*.sgml:
+	@true
+
+
 #### xml ####
 
 sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
@@ -96,11 +105,11 @@
 html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
 	@echo 'gtk-doc: Building HTML'
 	@-chmod -R u+w $(srcdir)
-	rm -rf $(srcdir)/html 
+	rm -rf $(srcdir)/html
 	mkdir $(srcdir)/html
 	cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
 	test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
-	@echo 'gtk-doc: Fixing cross-references' 
+	@echo 'gtk-doc: Fixing cross-references'
 	cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
 	touch html-build.stamp
 
@@ -110,11 +119,16 @@
 	rm -f *~ *.bak
 	rm -rf .libs
 
+distclean-local:
+	cd $(srcdir) && \
+	  rm -rf xml $(REPORT_FILES) \
+	         $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+
 maintainer-clean-local: clean
-	cd $(srcdir) && rm -rf xml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+	cd $(srcdir) && rm -rf xml html
 
 install-data-local:
-	installfiles=`echo $(srcdir)/html/*`; \
+	-installfiles=`echo $(srcdir)/html/*`; \
 	if test "$$installfiles" = '$(srcdir)/html/*'; \
 	then echo '-- Nothing to install' ; \
 	else \
@@ -125,7 +139,10 @@
 	  done; \
 	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
 	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \
+	  which gtkdoc-rebase >/dev/null && \
+	    gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \
 	fi
+	
 
 uninstall-local:
 	rm -f $(DESTDIR)$(TARGET_DIR)/*
@@ -148,8 +165,9 @@
 	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
 	-cp $(srcdir)/xml/*.xml $(distdir)/xml
 	cp $(srcdir)/html/* $(distdir)/html
-	if test -f $(srcdir)/$(DOC_MODULE).types; then \
-	  cp $(srcdir)/$(DOC_MODULE).types $(distdir)/$(DOC_MODULE).types; \
-	fi
+	-cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
+	-cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
+	cd $(distdir) && rm -f $(DISTCLEANFILES)
+	-gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
 
 .PHONY : dist-hook-local docs

Modified: trunk/libgda/binreloc/gda-binreloc.c
==============================================================================
--- trunk/libgda/binreloc/gda-binreloc.c	(original)
+++ trunk/libgda/binreloc/gda-binreloc.c	Sun Jun 15 20:26:32 2008
@@ -127,8 +127,11 @@
 
 	if ((GetCurrentProcess (&myProcess) == noErr) &&
 	    (GetProcessBundleLocation (&myProcess, &bundleLocation) == noErr) &&
-	    (FSRefMakePath (&bundleLocation, bundlePath, MAXLEN) == noErr))
+	    (FSRefMakePath (&bundleLocation, bundlePath, MAXLEN) == noErr)) {
 		prefix = g_path_get_dirname ((const char*) bundlePath);
+		if (g_str_has_suffix (prefix, "bin"))
+			prefix [strlen (prefix) - 3] = 0;
+	}
 	else
 		g_warning ("Could not get PREFIX (using Mac OS X Carbon)");
 #else

Modified: trunk/libgda/gda-config.c
==============================================================================
--- trunk/libgda/gda-config.c	(original)
+++ trunk/libgda/gda-config.c	Sun Jun 15 20:26:32 2008
@@ -1274,6 +1274,8 @@
 			continue;
 		if (strcmp (ext + 1, G_MODULE_SUFFIX))
 			continue;
+		if (!g_str_has_prefix (name, "libgda"))
+			continue;
 
 		path = g_build_path (G_DIR_SEPARATOR_S, dirname,
 				     name, NULL);
@@ -1329,6 +1331,7 @@
 				   forget about that provider... */
 				internal_provider_free (ip);
 				ip = NULL;
+				continue;
 			}
 		}
 		else
@@ -1357,6 +1360,7 @@
 				   forget about that provider... */
 				internal_provider_free (ip);
 				ip = NULL;
+				continue;
 			}
 		}
 		else {
@@ -1428,7 +1432,8 @@
 	g_free (info->id);
 	g_free (info->location);
 	g_free (info->description);
-	g_object_unref (info->dsn_params);
+	if (info->dsn_params)
+		g_object_unref (info->dsn_params);
 	g_free (ip);
 }
 

Modified: trunk/providers/mysql/gda-mysql-provider.c
==============================================================================
--- trunk/providers/mysql/gda-mysql-provider.c	(original)
+++ trunk/providers/mysql/gda-mysql-provider.c	Sun Jun 15 20:26:32 2008
@@ -387,6 +387,7 @@
 		      const gchar  *username,
 		      const gchar  *password,
 		      gboolean      use_ssl,
+		      gboolean      compress,
 		      GError      **error)
 {
 	g_print ("*** %s\n", __func__);
@@ -410,6 +411,9 @@
 
 	if (use_ssl)
 		flags |= CLIENT_SSL;
+	if (compress)
+		flags |= CLIENT_COMPRESS;
+	
 	
 	MYSQL *mysql = g_new0 (MYSQL, 1);
 	mysql_init (mysql);
@@ -511,10 +515,11 @@
 	user = gda_quark_list_find (params, "USER");
 	password = gda_quark_list_find (params, "PASSWORD");
 
-	const gchar *port, *unix_socket, *use_ssl;
+	const gchar *port, *unix_socket, *use_ssl, *compress;
 	port = gda_quark_list_find (params, "PORT");
 	unix_socket = gda_quark_list_find (params, "UNIX_SOCKET");
 	use_ssl = gda_quark_list_find (params, "USE_SSL");
+	compress = gda_quark_list_find (params, "COMPRESS");
 	
 	
 	/* open the real connection to the database */
@@ -526,7 +531,8 @@
 	MYSQL *mysql = real_open_connection (host, (port != NULL) ? atoi (port) : 0,
 					     unix_socket, db_name,
 					     user, password,
-					     (use_ssl != NULL) ? TRUE : FALSE,
+					     (use_ssl && ((*use_ssl == 't') || (*use_ssl == 'T'))) ? TRUE : FALSE,
+					     (compress && ((*compress == 't') || (*compress == 'T'))) ? TRUE : FALSE,
 					     &error);
 	if (!mysql) {
 		_gda_mysql_make_error (cnc, mysql, NULL, NULL);

Modified: trunk/providers/mysql/mysql_specs_dsn.xml.in
==============================================================================
--- trunk/providers/mysql/mysql_specs_dsn.xml.in	(original)
+++ trunk/providers/mysql/mysql_specs_dsn.xml.in	Sun Jun 15 20:26:32 2008
@@ -6,5 +6,6 @@
     <parameter id="PORT" _name="Port" _descr="Database server port" gdatype="gint"/>
     <parameter id="UNIX_SOCKET" _name="UNIX Socket" _descr="Full path of the UNIX socket to use when connecting locally" gdatype="gchararray"/>
     <parameter id="USE_SSL" _name="Require SSL" _descr="Whether or not to use SSL to establish the connection" gdatype="gboolean"/>
+    <parameter id="COMPRESS" _name="Compress" _descr="Use compression protocol" gdatype="gboolean"/>
   </parameters>
 </data-set-spec>

Modified: trunk/tools/gda-sql.c
==============================================================================
--- trunk/tools/gda-sql.c	(original)
+++ trunk/tools/gda-sql.c	Sun Jun 15 20:26:32 2008
@@ -39,6 +39,9 @@
 #ifndef G_OS_WIN32
 #include <signal.h>
 #include <pwd.h>
+#else
+#include <stdlib.h>
+#include <windows.h>
 #endif
 
 #ifdef HAVE_READLINE
@@ -197,6 +200,15 @@
 
 	/* welcome message */
 	if (!data->output_stream) {
+#ifdef G_OS_WIN32
+		HANDLE wHnd;
+		SMALL_RECT windowSize = {0, 0, 139, 49};
+
+		wHnd = GetStdHandle(STD_OUTPUT_HANDLE);
+
+		SetConsoleTitle ("Gda console, version " PACKAGE_VERSION);
+		SetConsoleWindowInfo (wHnd, TRUE, &windowSize);
+#endif
 		g_print (_("Welcome to the GDA SQL console, version " PACKAGE_VERSION));
 		g_print ("\n\n");
 		g_print (_("Type: .copyright to show usage and distribution terms\n"