Changeset 357

Timestamp:

08/26/10 00:19:40 (18 months ago)

Author:

antonbatenev.ya.ru

Message:

Добавление флагов сжатия трафика и работы с большими пакетами для ODBC

Location:

trunk

Files:

• storage/mysql_database.cpp (modified) (2 diffs)
• version.h (modified) (1 diff)

trunk/storage/mysql_database.cpp

@@ -51 +51 @@
         bool is_port_number    = false;
         int  database_port_int = database_port.toInt(&is_port_number);
-        
+
         #ifdef Q_WS_WIN
+                // http://dev.mysql.com/doc/refman/5.1/en/connector-odbc-configuration-connection-parameters.html
                 QString connection_string;
 
-                connection_string += "Driver={MySQL ODBC 5.1 Driver};";
+                connection_string += "driver={MySQL ODBC 5.1 Driver};";
                 connection_string += "charset=UTF8;";
-                connection_string += "Server="   + database_host     + ";";
-                connection_string += "Database=" + database_name     + ";";
-                connection_string += "User="     + database_login    + ";";
-                connection_string += "Password=" + database_password + ";";
+                connection_string += "option=" + QString(8 /* FLAG_BIG_PACKETS */ + 2048 /* FLAG_COMPRESSED_PROTO */) + ";";
+                connection_string += "server="   + database_host     + ";";
+                connection_string += "database=" + database_name     + ";";
+                connection_string += "user="     + database_login    + ";";
+                connection_string += "password=" + database_password + ";";
 
                 if (is_port_number == true)
                 {
                         if (database_port_int != 0)
-                                connection_string += "Port=" + QString(database_port_int) + ";";
+                                connection_string += "port=" + QString(database_port_int) + ";";
                 }
                 else if (database_port.length() != 0)
-                        connection_string += "Socket=" + database_port + ";";
-                        
+                        connection_string += "socket=" + database_port + ";";
+
                 ADatabase::setDatabaseName(connection_string);
         #else
@@ -76 +78 @@
                 ADatabase::setUserName(database_login);
                 ADatabase::setPassword(database_password);
-                
+
                 if (is_port_number == true)
                 {
                         if (database_port_int != 0)
                                 ADatabase::setPort(database_port_int);
+
+                        ADatabase::setConnectOptions("CLIENT_COMPRESS=1");
                 }
                 else if (database_port.length() != 0)

trunk/version.h

@@ -20 +20 @@
  * \brief Дата билда (заменяется автоматически при каждом билде в version.h, что и приводит к смене номера ревизии)
  */
-#define AVALON_DATE "Срд Авг 25 22:02:22 MSD 2010"
+#define AVALON_DATE "Срд Авг 25 23:50:56 MSD 2010"
 
 #endif