From 282b2f40cd0aa09815001e178f60c9e71667d847 Mon Sep 17 00:00:00 2001 From: Aymeric Augustin Date: Mon, 18 Feb 2013 19:09:54 +0100 Subject: [PATCH] Fixed #15119 -- Stopped pinging the MySQL server. --- django/db/backends/__init__.py | 5 +---- django/db/backends/mysql/base.py | 9 --------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/django/db/backends/__init__.py b/django/db/backends/__init__.py index 7a0a577ef13..6e74c2b4607 100644 --- a/django/db/backends/__init__.py +++ b/django/db/backends/__init__.py @@ -53,11 +53,8 @@ class BaseDatabaseWrapper(object): __hash__ = object.__hash__ - def _valid_connection(self): - return self.connection is not None - def _cursor(self): - if not self._valid_connection(): + if self.connection is None: conn_params = self.get_connection_params() self.connection = self.get_new_connection(conn_params) self.init_connection_state() diff --git a/django/db/backends/mysql/base.py b/django/db/backends/mysql/base.py index 754e876701c..5a23dce0957 100644 --- a/django/db/backends/mysql/base.py +++ b/django/db/backends/mysql/base.py @@ -402,15 +402,6 @@ class DatabaseWrapper(BaseDatabaseWrapper): self.introspection = DatabaseIntrospection(self) self.validation = DatabaseValidation(self) - def _valid_connection(self): - if self.connection is not None: - try: - self.connection.ping() - return True - except DatabaseError: - self.close() - return False - def get_connection_params(self): kwargs = { 'conv': django_conversions,