[glom/mysql: 4/21] fix mistake
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glom/mysql: 4/21] fix mistake
- Date: Fri, 11 Jan 2013 11:31:34 +0000 (UTC)
commit a86d7401552c1ed4eda8cbddc78e044e3983219e
Author: Murray Cumming <murrayc murrayc com>
Date: Thu Jan 3 14:46:21 2013 +0100
fix mistake
glom/libglom/connectionpool_backends/mysql.cc | 2 +-
glom/libglom/connectionpool_backends/mysql_self.cc | 4 ++--
glom/libglom/connectionpool_backends/postgres.cc | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/glom/libglom/connectionpool_backends/mysql.cc b/glom/libglom/connectionpool_backends/mysql.cc
index a92b589..5ad2cfb 100644
--- a/glom/libglom/connectionpool_backends/mysql.cc
+++ b/glom/libglom/connectionpool_backends/mysql.cc
@@ -107,7 +107,7 @@ Glib::RefPtr<Gnome::Gda::Connection> MySQL::attempt_connect(const Glib::ustring&
cnc_string, auth_string,
Gnome::Gda::CONNECTION_OPTIONS_SQL_IDENTIFIERS_CASE_SENSITIVE);
- connection->statement_execute_non_select("SET DATESTYLE = 'ISO'");
+ //connection->statement_execute_non_select("SET DATESTYLE = 'ISO'");
data_model = connection->statement_execute_select("SELECT version()");
}
}
diff --git a/glom/libglom/connectionpool_backends/mysql_self.cc b/glom/libglom/connectionpool_backends/mysql_self.cc
index 42079fe..49b0c85 100644
--- a/glom/libglom/connectionpool_backends/mysql_self.cc
+++ b/glom/libglom/connectionpool_backends/mysql_self.cc
@@ -328,13 +328,13 @@ Backend::StartupErrors MySQLSelfHosted::startup(const SlotProgress& slot_progres
+ " --datadir=" + Glib::shell_quote(dbdir_data)
+ " --socket=" + Glib::shell_quote(dbdir_socket)
+ " --pid-file=" + Glib::shell_quote(dbdir_pid);
- //std::cout << G_STRFUNC << ": debug: command_mysql_start=" << command_mysql_start << std::endl;
+ std::cout << G_STRFUNC << ": debug: command_mysql_start=" << command_mysql_start << std::endl;
m_port = available_port; //Needed by get_mysqladmin_command().
const std::string command_check_mysql_has_started = get_mysqladmin_command(m_temporary_password) //TODO: Get the temporary password in a callback.
+ " ping";
const std::string second_command_success_text = "mysqld is alive"; //TODO: This is not a stable API. Also, watch out for localisation.
- //std::cout << G_STRFUNC << ": debug: command_check_mysql_has_started=" << command_check_mysql_has_started << std::endl;
+ std::cout << G_STRFUNC << ": debug: command_check_mysql_has_started=" << command_check_mysql_has_started << std::endl;
const bool result = Glom::Spawn::execute_command_line_and_wait_until_second_command_returns_success(command_mysql_start, command_check_mysql_has_started, slot_progress, second_command_success_text);
std::cout << G_STRFUNC << std::cout << " DEBUG: started" << std::endl;
diff --git a/glom/libglom/connectionpool_backends/postgres.cc b/glom/libglom/connectionpool_backends/postgres.cc
index 519ecff..d306c59 100644
--- a/glom/libglom/connectionpool_backends/postgres.cc
+++ b/glom/libglom/connectionpool_backends/postgres.cc
@@ -101,7 +101,7 @@ Glib::RefPtr<Gnome::Gda::Connection> Postgres::attempt_connect(const Glib::ustri
cnc_string, auth_string,
Gnome::Gda::CONNECTION_OPTIONS_SQL_IDENTIFIERS_CASE_SENSITIVE);
- //connection->statement_execute_non_select("SET DATESTYLE = 'ISO'");
+ connection->statement_execute_non_select("SET DATESTYLE = 'ISO'");
data_model = connection->statement_execute_select("SELECT version()");
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]