Ignore:
Timestamp:
Apr 11, 2011, 4:11:58 PM (14 years ago)
Author:
gav
Message:

Svn merge -r874:r878 trunk/ into branches/features/grailsUpgrade/.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/features/grailsUpgrade/grails-app/conf/DataSource.groovy

    r606 r881  
    2626            url = "jdbc:hsqldb:mem:devDb"
    2727            /** MySQL */
     28//             dialect = org.hibernate.dialect.MySQL5InnoDBDialect
    2829//             driverClassName = "com.mysql.jdbc.Driver"
    2930//             username = "gnumimsadmin"
     
    4243            url = "jdbc:hsqldb:mem:devDb"
    4344            /** MySQL */
     45//             dialect = org.hibernate.dialect.MySQL5InnoDBDialect
    4446//             driverClassName = "com.mysql.jdbc.Driver"
    4547//             username = "gnumimsadmin"
     
    6668            /** MSSQL */
    6769            //For more info see the docs that you downloaded with the driver.
    68 //             dialect = org.hibernate.dialect.SQLServerDialect // Useful with `grails schema-export`
     70//             dialect = org.hibernate.dialect.SQLServerDialect // MSSQL 2000+2005 Useful with `grails schema-export`
    6971//             driverClassName = "com.microsoft.sqlserver.jdbc.SQLServerDriver"
    7072//             username = "gnumimsadmin"
     
    7375//             url = "jdbc:sqlserver://gnumimssql01:1433;databaseName=gnumims_prod"
    7476            /** MySQL */
     77            dialect = org.hibernate.dialect.MySQL5InnoDBDialect
    7578            driverClassName = "com.mysql.jdbc.Driver"
    7679            username = "gnumimsadmin"
Note: See TracChangeset for help on using the changeset viewer.