From 87ecbec79dfc02abcaaf3ce2c04b848e968748da Mon Sep 17 00:00:00 2001
From: cyberbotx <cyberbotx@5417fbe8-f217-4b02-8779-1006273d7864>
Date: Tue, 7 Apr 2009 05:31:14 +0000
Subject: [PATCH] Remove all remaining uses of (My)SQL from the code.

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2267 5417fbe8-f217-4b02-8779-1006273d7864
---
 include/services.h |  3 ---
 include/version.sh | 12 +++---------
 lang/cat.l         | 19 -------------------
 lang/de.l          | 18 ------------------
 lang/en_us.l       | 19 -------------------
 lang/es.l          | 19 -------------------
 lang/fr.l          | 19 -------------------
 lang/gr.l          | 19 -------------------
 lang/hun.l         | 19 -------------------
 lang/it.l          | 19 -------------------
 lang/nl.l          | 19 -------------------
 lang/pl.l          | 24 ------------------------
 lang/pt.l          | 19 -------------------
 lang/ru.l          | 19 -------------------
 lang/tr.l          | 19 -------------------
 src/main.c         |  2 +-
 src/misc.c         |  8 --------
 17 files changed, 4 insertions(+), 272 deletions(-)

diff --git a/include/services.h b/include/services.h
index 4a630f5a7..3ef0a1ecd 100644
--- a/include/services.h
+++ b/include/services.h
@@ -575,9 +575,6 @@ struct memo_ {
 	time_t time;	/* When it was sent */
 	char sender[NICKMAX];
 	char *text;
-#ifdef USE_MYSQL
-	uint32 id;		/* Database ID; see mysql.c */
-#endif
 };
 
 typedef struct {
diff --git a/include/version.sh b/include/version.sh
index b6329daa0..4b00e0c6b 100644
--- a/include/version.sh
+++ b/include/version.sh
@@ -38,15 +38,15 @@ cat >$VERSIONH <<EOF
  * Please read COPYING and CREDITS for further details.
  *
  * Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church. 
- * 
+ * Based on the original code of Services by Andy Church.
+ *
  * This file is auto-generated by version.sh
  *
  */
 
  #ifndef VERSION_H
  #define VERSION_H
- 
+
 #define VERSION_MAJOR	$VERSION_MAJOR
 #define VERSION_MINOR	$VERSION_MINOR
 #define VERSION_PATCH	$VERSION_PATCH
@@ -67,12 +67,6 @@ cat >$VERSIONH <<EOF
 # define VER_OS
 #endif
 
-#if defined(USE_MYSQL)
-# define VER_MYSQL "Q"
-#else
-# define VER_MYSQL
-#endif
-
 #if defined(USE_MODULES)
 # define VER_MODULE "M"
 #else
diff --git a/lang/cat.l b/lang/cat.l
index 4f4c7e3dd..ed90bd605 100644
--- a/lang/cat.l
+++ b/lang/cat.l
@@ -2901,17 +2901,6 @@ OPER_SET_NOEXPIRE_ERROR
 	Establiment per a NOEXPIRE ha de ser ON o OFF.
 OPER_SET_UNKNOWN_OPTION
 	Opció %s desconeguda.
-OPER_SET_SQL_ON
-	SQL code will be used.
-OPER_SET_SQL_OFF
-	SQL code will not be used.
-OPER_SET_SQL_ERROR
-	Setting for SQL must be ON or OFF.
-OPER_SET_SQL_ERROR_INIT
-	Error during init of SQL, check your logs to correct.
-OPER_SET_SQL_ERROR_DISABLED
-	SQL is not configured for this network. Please edit the
-	configuration file (services.conf).
 OPER_SET_LIST_OPTION_ON
 	%s is enable
 OPER_SET_LIST_OPTION_OFF
@@ -6043,7 +6032,6 @@ OPER_HELP_SET
 	    DEBUG      Activa o desactiva el Mode debug
 	    NOEXPIRE   Activa o desactiva el Mode no expire
 	    SUPERADMIN Activate or deactivate super-admin mode
-	    SQL   	 Activate or deactivate sql mode
 	    IGNORE     Activate or deactivate ignore mode
 	    LIST       List the options
 	
@@ -6109,13 +6097,6 @@ OPER_HELP_SET_SUPERADMIN
 	This opion is _NOT_ persistant, and should only be used when
 	needed, and set back to OFF when no longer needed.
 
-OPER_HELP_SET_SQL
-	Syntax: SET SQL {ON | OFF}
-
-	Setting this will toggle Anope's from usage of SQL, this should
-	be used to disable and enable SQL should your SQL server go down
-	while services are running.
-
 OPER_HELP_SET_IGNORE
 	Syntax: SET IGNORE {ON | OFF}
 
diff --git a/lang/de.l b/lang/de.l
index 2d02ea088..e63458c1c 100644
--- a/lang/de.l
+++ b/lang/de.l
@@ -2867,17 +2867,6 @@ OPER_SET_NOEXPIRE_ERROR
 	Die Einstellung von NOEXPIRE kann nur ON oder OFF sein.
 OPER_SET_UNKNOWN_OPTION
 	Unbekannte Option %s.
-OPER_SET_SQL_ON
-	SQL code wird jetzt benutzt.
-OPER_SET_SQL_OFF
-	SQL code wird jetzt NICHT mehr benutzt.
-OPER_SET_SQL_ERROR
-	Einstellungen für SQL können nur ON oder OFF sein.
-OPER_SET_SQL_ERROR_INIT
-	SQL FEHLER, schaue bitte in deine Logs nach um zu sehen wie du es berichtigen kannst.
-OPER_SET_SQL_ERROR_DISABLED
-	SQL ist für den Netzwerk nicht konfiguriert. Um SQL code zu
-	benutzen mußt du es in deine services.conf richtig Konfigurieren.
 OPER_SET_LIST_OPTION_ON
 	%s ist eingeschaltet
 OPER_SET_LIST_OPTION_OFF
@@ -6059,7 +6048,6 @@ OPER_HELP_SET
 	    NOEXPIRE   Auslauf-Modus der Services
 	                 an oder aus
 	    SUPERADMIN Den Super-Admin Modus an oder aus
-	    SQL   	 SQL-Modus an oder aus
 	    IGNORE     Ignore-Modus an oder aus
 	    LIST       Optionen-Liste
 
@@ -6126,12 +6114,6 @@ OPER_HELP_SET_SUPERADMIN
 	werden, wenn er wirklich gebraucht wird. Danach sollte er
 	sofort wieder ausgeschaltet werden.
 
-OPER_HELP_SET_SQL
-	Syntax: SET SQL {ON | OFF}
-
-	Diese Einstellung wird Anope veranlassen SQL zu benutzen oder nicht.
-	Kann nützlich sein wenn zB der MySQL-Server aus ist.
-
 OPER_HELP_SET_IGNORE
 	Syntax: SET IGNORE {ON | OFF}
 
diff --git a/lang/en_us.l b/lang/en_us.l
index d70505b01..72c59d328 100644
--- a/lang/en_us.l
+++ b/lang/en_us.l
@@ -2817,17 +2817,6 @@ OPER_SET_NOEXPIRE_ERROR
 	Setting for NOEXPIRE must be ON or OFF.
 OPER_SET_UNKNOWN_OPTION
 	Unknown option %s.
-OPER_SET_SQL_ON
-	SQL code will be used.
-OPER_SET_SQL_OFF
-	SQL code will not be used.
-OPER_SET_SQL_ERROR
-	Setting for SQL must be ON or OFF.
-OPER_SET_SQL_ERROR_INIT
-	Error during init of SQL, check your logs to correct.
-OPER_SET_SQL_ERROR_DISABLED
-	SQL is not configured for this network. Please edit the
-	configuration file (services.conf).
 OPER_SET_LIST_OPTION_ON
 	%s is enabled
 OPER_SET_LIST_OPTION_OFF
@@ -5729,7 +5718,6 @@ OPER_HELP_SET
 	    DEBUG      Activate or deactivate debug mode
 	    NOEXPIRE   Activate or deactivate no expire mode
 	    SUPERADMIN Activate or deactivate super-admin mode
-	    SQL        Activate or deactivate sql mode
 	    IGNORE     Activate or deactivate ignore mode
 	    LIST       List the options
 
@@ -5792,13 +5780,6 @@ OPER_HELP_SET_SUPERADMIN
 	This option is not persistent, and should only be used when
 	needed, and set back to OFF when no longer needed.
 
-OPER_HELP_SET_SQL
-	Syntax: SET SQL {ON | OFF}
-
-	Setting this will toggle Anope's usage of SQL, this should
-	be used to disable and enable SQL should your SQL server go down
-	while services are running.
-
 OPER_HELP_SET_IGNORE
 	Syntax: SET IGNORE {ON | OFF}
 
diff --git a/lang/es.l b/lang/es.l
index 9a6963de1..40d70481b 100644
--- a/lang/es.l
+++ b/lang/es.l
@@ -2872,17 +2872,6 @@ OPER_SET_NOEXPIRE_ERROR
 	Seteo para NOEXPIRE debe ser ON u OFF.
 OPER_SET_UNKNOWN_OPTION
 	Opcion %s desconocida.
-OPER_SET_SQL_ON
-	El codigo SQL sera usado.
-OPER_SET_SQL_OFF
-	El codigo SQL no sera usado.
-OPER_SET_SQL_ERROR
-	Opciones para SQL son ON o OFF.
-OPER_SET_SQL_ERROR_INIT
-	Error durante el inicio de SQL, revisa tus logs para corregir.
-OPER_SET_SQL_ERROR_DISABLED
-	SQL no esta configurado para esta red. Por favor edita
-	el archivo de configuracion (services.conf).
 OPER_SET_LIST_OPTION_ON
 	%s esta habilitado
 OPER_SET_LIST_OPTION_OFF
@@ -6010,7 +5999,6 @@ OPER_HELP_SET
 	    DEBUG      Activa o desactiva el modo debug
 	    NOEXPIRE   Activa o desactiva el modo no expire
 	    SUPERADMIN Activa o desactiva el modo SuperAdmin
-	    SQL   	 Activate or deactivate sql mode
 	    IGNORE     Activate or deactivate ignore mode
 	    LIST       List the options
 	
@@ -6076,13 +6064,6 @@ OPER_HELP_SET_SUPERADMIN
 	Esta opcion no es persistente y debe ser usada solo de ser
 	necesario.
 
-OPER_HELP_SET_SQL
-	Syntax: SET SQL {ON | OFF}
-
-	Setting this will toggle Anope's from usage of SQL, this should
-	be used to disable and enable SQL should your SQL server go down
-	while services are running.
-
 OPER_HELP_SET_IGNORE
 	Syntax: SET IGNORE {ON | OFF}
 
diff --git a/lang/fr.l b/lang/fr.l
index 3165fa99a..0a485b6cc 100644
--- a/lang/fr.l
+++ b/lang/fr.l
@@ -2925,17 +2925,6 @@ OPER_SET_NOEXPIRE_ERROR
 	La valeur de NOEXPIRE doit être ON ou OFF.
 OPER_SET_UNKNOWN_OPTION
 	Option inconnue %s.
-OPER_SET_SQL_ON
-	Le code SQL dois etre utilisé.
-OPER_SET_SQL_OFF
-	Le code SQL ne dois pas etre utilisé.
-OPER_SET_SQL_ERROR
-	Les configurations pour SQL doivent etre ON ou OFF.
-OPER_SET_SQL_ERROR_INIT
-	Erreur durant l'initialisation de SQL, verifier les logs pour corriger l'erreur.
-OPER_SET_SQL_ERROR_DISABLED
-	SQL n'est pas configuré pour ce réseau. Editer le fichier
-	de configuration (services.conf) pour l'activer.
 OPER_SET_LIST_OPTION_ON
 	%s est activé
 OPER_SET_LIST_OPTION_OFF
@@ -6083,7 +6072,6 @@ OPER_HELP_SET
 	    DEBUG      Active ou désactive le mode de déboguage
 	    NOEXPIRE   Active ou désactive le mode sans expiration
 	    SUPERADMIN Active ou désactive le mode super-admin
-	    SQL   	   Active ou désactive le mode SQL
 	    IGNORE     Active ou désactive le mode ignore
 	    LIST       Liste les options
 	
@@ -6148,13 +6136,6 @@ OPER_HELP_SET_SUPERADMIN
 
 	Utilisation temporaire.
 
-OPER_HELP_SET_SQL
-	Syntaxe: SET SQL {ON | OFF}
-
-	Activer cette option fera utiliser SQL a anope, cette option est 
-	utilisé pour activé ou désactiver mysql lorsque votre serveur est
-	down et que les services sont en cour de fonctionnement.
-	
 OPER_HELP_SET_IGNORE
 	Syntaxe: SET IGNORE {ON | OFF}
 
diff --git a/lang/gr.l b/lang/gr.l
index 46dad15ac..4c554c8e8 100644
--- a/lang/gr.l
+++ b/lang/gr.l
@@ -2904,17 +2904,6 @@ OPER_SET_NOEXPIRE_ERROR
 	Ç åðéëïãÞ ãéá NOEXPIRE ðñÝðåé íá åßíáé ON Þ OFF.
 OPER_SET_UNKNOWN_OPTION
 	¢ãíùóôç åðéëïãÞ %s.
-OPER_SET_SQL_ON
-	SQL code will be used.
-OPER_SET_SQL_OFF
-	SQL code will not be used.
-OPER_SET_SQL_ERROR
-	Setting for SQL must be ON or OFF.
-OPER_SET_SQL_ERROR_INIT
-	Error during init of SQL, check your logs to correct.
-OPER_SET_SQL_ERROR_DISABLED
-	SQL is not configured for this network. Please edit the
-	configuration file (services.conf).
 OPER_SET_LIST_OPTION_ON
 	%s is enable
 OPER_SET_LIST_OPTION_OFF
@@ -5951,7 +5940,6 @@ OPER_HELP_SET
 	    DEBUG      Åíåñãïðïéåßôå Þ áðåíåñãïðïéåßôå óå debug mode
 	    NOEXPIRE   Åíåñãïðïéåßôå Þ áðåíåñãïðïéåßôå óå no expire mode
 	    SUPERADMIN Activate or deactivate super-admin mode
-	    SQL   	 Activate or deactivate sql mode
 	    IGNORE     Activate or deactivate ignore mode
 	    LIST       List the options
 	
@@ -6016,13 +6004,6 @@ OPER_HELP_SET_SUPERADMIN
 	This opion is _NOT_ persistant, and should only be used when
 	needed, and set back to OFF when no longer needed.
 
-OPER_HELP_SET_SQL
-	Syntax: SET SQL {ON | OFF}
-
-	Setting this will toggle Anope's from usage of SQL, this should
-	be used to disable and enable SQL should your SQL server go down
-	while services are running.
-
 OPER_HELP_SET_IGNORE
 	Syntax: SET IGNORE {ON | OFF}
 
diff --git a/lang/hun.l b/lang/hun.l
index 1a395fb90..2320aad38 100644
--- a/lang/hun.l
+++ b/lang/hun.l
@@ -2864,17 +2864,6 @@ OPER_SET_NOEXPIRE_ERROR
 	Az NOEXPIRE beállításhoz kell ON vagy OFF.
 OPER_SET_UNKNOWN_OPTION
 	Ismeretlen beállítás %s.
-OPER_SET_SQL_ON
-	SQL code will be used.
-OPER_SET_SQL_OFF
-	SQL code will not be used.
-OPER_SET_SQL_ERROR
-	Setting for SQL must be ON or OFF.
-OPER_SET_SQL_ERROR_INIT
-	Error during init of SQL, check your logs to correct.
-OPER_SET_SQL_ERROR_DISABLED
-	SQL is not configured for this network. Please edit the
-	configuration file (services.conf).
 OPER_SET_LIST_OPTION_ON
 	%s is enable
 OPER_SET_LIST_OPTION_OFF
@@ -5849,7 +5838,6 @@ OPER_HELP_SET
 	    DEBUG      Bekapcsolja/kikapcsolja a debug módot
 	    NOEXPIRE   Bekapcsolja/kikapcsolja a nem elévülõ módot
 	    SUPERADMIN Bekapcsolja/kikapcsolja a super-admin módot
-	    SQL   	 Activate or deactivate sql mode
 	    IGNORE     Activate or deactivate ignore mode
 	    LIST       List the options
 	
@@ -5915,13 +5903,6 @@ OPER_HELP_SET_SUPERADMIN
 	Ez az opció nem ajánlott, csak akkor használd, ha 
 	szükséges és kapcsold ki, ha már nem.
 
-OPER_HELP_SET_SQL
-	Syntax: SET SQL {ON | OFF}
-
-	Setting this will toggle Anope's from usage of SQL, this should
-	be used to disable and enable SQL should your SQL server go down
-	while services are running.
-
 OPER_HELP_SET_IGNORE
 	Syntax: SET IGNORE {ON | OFF}
 
diff --git a/lang/it.l b/lang/it.l
index 6e5d27006..f2705062d 100644
--- a/lang/it.l
+++ b/lang/it.l
@@ -2829,17 +2829,6 @@ OPER_SET_NOEXPIRE_ERROR
 	Il parametro dell'opzione NOEXPIRE deve essere ON o OFF.
 OPER_SET_UNKNOWN_OPTION
 	Opzione %s sconosciuta.
-OPER_SET_SQL_ON
-	Il codice SQL viene utilizzato.
-OPER_SET_SQL_OFF
-	Il codice SQL non viene utilizzato.
-OPER_SET_SQL_ERROR
-	L'impostazione per SQL dev'essere ON o OFF.
-OPER_SET_SQL_ERROR_INIT
-	Errore durante l'inizializzazione di SQL, controlla i tuoi log per correggere.
-OPER_SET_SQL_ERROR_DISABLED
-	SQL non è configurato per questo network. Modifica
-	il file di configurazione (services.conf).
 OPER_SET_LIST_OPTION_ON
 	%s è attivato
 OPER_SET_LIST_OPTION_OFF
@@ -5900,7 +5889,6 @@ OPER_HELP_SET
 	    DEBUG      Attiva o disattiva la modalità di debug
 	    NOEXPIRE   Attiva o disattiva la modalità no expire
 	    SUPERADMIN Attiva o disattiva la modalità SuperAdmin
-	    SQL   	 Attiva o disattiva la modalità sql
 	    IGNORE     Attiva o disattiva la modalità ignore
 	    LIST       Elenca le opzioni
 	
@@ -5969,13 +5957,6 @@ OPER_HELP_SET_SUPERADMIN
 	Questa opzione NON è persistente, e dovrebbe essere usata
 	solo quando necessario, e reimpostata a OFF al più presto.
 
-OPER_HELP_SET_SQL
-	Sintassi: SET SQL {ON | OFF}
-
-	Questa impostazione abilita o disabilita l'utilizzo di SQL da parte
-	di Anope. Da usare nel caso che il server SQL diventa irraggiungibile
-	mentre i services stanno lavorando.
-
 OPER_HELP_SET_IGNORE
 	Sintassi: SET IGNORE {ON | OFF}
 
diff --git a/lang/nl.l b/lang/nl.l
index b55ac59f1..e72f978ce 100644
--- a/lang/nl.l
+++ b/lang/nl.l
@@ -2870,17 +2870,6 @@ OPER_SET_NOEXPIRE_ERROR
 	Instelling voor NOEXPIRE moet ON of OFF zijn.
 OPER_SET_UNKNOWN_OPTION
 	Onbekende optie %s.
-OPER_SET_SQL_ON
-	SQL code wordt gebruikt.
-OPER_SET_SQL_OFF
-	SQL code wordt niet gebruikt.
-OPER_SET_SQL_ERROR
-	Instelling voor SQL moet ON of OFF zijn.
-OPER_SET_SQL_ERROR_INIT
-	Fout tijdens het initialiseren van SQL. Controleer de logs om dit op te lossen.
-OPER_SET_SQL_ERROR_DISABLED
-	SQL is not configured for this network. Please edit the
-	configuration file (services.conf).
 OPER_SET_LIST_OPTION_ON
 	%s is ingeschakeld
 OPER_SET_LIST_OPTION_OFF
@@ -5897,7 +5886,6 @@ OPER_HELP_SET
 	    DEBUG      (De)activeer debug mode
 	    NOEXPIRE   (De)activeer de geen-verloop mode
 	    SUPERADMIN (De)activeer SuperAdministrator mode
-	    SQL   	 Activate or deactivate sql mode
 	    IGNORE     Activate or deactivate ignore mode
 	    LIST       List the options
 
@@ -5959,13 +5947,6 @@ OPER_HELP_SET_SUPERADMIN
 	wanneer het echt nodig is, en terug op OFF gezet worden als het
 	niet meer nodig is.
 
-OPER_HELP_SET_SQL
-	Gebruik: SET SQL {ON | OFF}
-	
-	Deze instelling schakelt Anope's SQL gebruik. Zo kan al het SQL
-	verkeer worden uitgezet als de SQL server onbereikbaar wordt
-	terwijl services nog draaien.
-
 OPER_HELP_SET_IGNORE
 	Syntax: SET IGNORE {ON | OFF}
 
diff --git a/lang/pl.l b/lang/pl.l
index 735408cfa..dfb16e28e 100644
--- a/lang/pl.l
+++ b/lang/pl.l
@@ -3802,22 +3802,6 @@ OPER_SET_NOEXPIRE_ERROR
 OPER_SET_UNKNOWN_OPTION
 	Nieznana opcja %s.
 
-OPER_SET_SQL_ON
-	Obs³uga SQL zosta³a w³±czona.
-
-OPER_SET_SQL_OFF
-	Obs³uga SQL zosta³a wy³±czona.
-
-OPER_SET_SQL_ERROR
-	Parametrem opcji SQL musi byæ ON albo OFF.
-
-OPER_SET_SQL_ERROR_INIT
-	B³±d podczas inicjacji SQL, sprawd¼ logi.
-
-OPER_SET_SQL_ERROR_DISABLED
-	SQL nie jest skonfigurowany dla tej sieci.
-	Wprowad¼ zmiany w pliku konfiguracyjnym.
-
 OPER_SET_LIST_OPTION_ON
 	%s jest w³±czone
 
@@ -6969,7 +6953,6 @@ OPER_HELP_SET
 	    DEBUG      W³±cza lub wy³±cza tryb debugowania
 	    NOEXPIRE   W³±cza lub wy³±cza tryb noexpire
 	    SUPERADMIN W³±cza lub wy³±cza tryb super administratora
-	    SQL        W³±cza lub wy³±cza obs³ugê SQL
 	    IGNORE     W³±cza lub wy³±cza tryb ignorowania
 	    LIST       Listuje aktualne ustawienia
 
@@ -7028,13 +7011,6 @@ OPER_HELP_SET_SUPERADMIN
 	Ta opcja powinna byæ u¿ywana tylko wtedy, kiedy
 	jest taka potrzeba. Nale¿y j± pó¼niej wy³±czyæ.
 
-OPER_HELP_SET_SQL
-	Sk³adnia: SET SQL {ON | OFF}
-	
-	W³±cza lub wy³±cza korzystanie z bazy danych SQL.
-	Komenda ta pozwala na wy³±czenie serwera SQL
-	podczas nieprzerwanej pracy serwisów.
-
 OPER_HELP_SET_IGNORE
 	Sk³adnia: SET IGNORE {ON | OFF}
 	
diff --git a/lang/pt.l b/lang/pt.l
index d8c2c7e05..5540c22c0 100644
--- a/lang/pt.l
+++ b/lang/pt.l
@@ -2841,17 +2841,6 @@ OPER_SET_NOEXPIRE_ERROR
 	Opção NOEXPIRE deve ser ON ou OFF.
 OPER_SET_UNKNOWN_OPTION
 	Opção desconhecida: %s.
-OPER_SET_SQL_ON
-	Código SQL será usado.
-OPER_SET_SQL_OFF
-	Código SQL não será usado.
-OPER_SET_SQL_ERROR
-	Ajuste para SQL deve ser ON ou OFF.
-OPER_SET_SQL_ERROR_INIT
-	Erro durante inicialização de SQL, verifique seus logs para corrigir.
-OPER_SET_SQL_ERROR_DISABLED
-	SQL não está configurada para esta rede. Por favor, edite o
-	arquivo de configuração (services.conf).
 OPER_SET_LIST_OPTION_ON
 	%s está ativada
 OPER_SET_LIST_OPTION_OFF
@@ -5844,7 +5833,6 @@ OPER_HELP_SET
 	    DEBUG       Ativa ou desativa o modo de depuração (debug)
 	    NOEXPIRE    Ativa ou desativa o modo não-expira
 	    SUPERADMIN  Ativa ou desativa o modo Super-Admin
-	    SQL         Ativa ou desativa o modo SQL
 	    IGNORE      Ativa ou desativa o modo Ignore
 	    LIST        Lista as opções atuais
 	
@@ -5910,13 +5898,6 @@ OPER_HELP_SET_SUPERADMIN
 	Esta opção não é permanente, e deve ser usada somente quando
 	necessária, e desativada quando não for mais necessária.
 
-OPER_HELP_SET_SQL
-	Sintaxe: SET SQL {ON | OFF}
-	
-	Ajustando esta opção, fará os Services usarem ou não SQL. Isso deve
-	ser usado para ativar ou desativar SQL caso seu servidor SQL caia
-	enquanto os Services estiverem rodando.
-
 OPER_HELP_SET_IGNORE
 	Sintaxe: SET IGNORE {ON | OFF}
 	
diff --git a/lang/ru.l b/lang/ru.l
index efe704487..4ad47317c 100644
--- a/lang/ru.l
+++ b/lang/ru.l
@@ -2813,17 +2813,6 @@ OPER_SET_NOEXPIRE_ERROR
 	 êà÷åñòâå ïàðàìåòðà äëÿ îïöèè NOEXPIRE âû äîëæíû óêàçàòü ëèáî ON, ëèáî OFF.
 OPER_SET_UNKNOWN_OPTION
 	Íåèçâåñòíàÿ îïöèÿ %s.
-OPER_SET_SQL_ON
-	Ðåæèì ðàáîòû ñåðâèñîâ èçìåíåí: àêòèâèðîâàí SQL-ðåæèì (èñïîëüçîâàíèå SQL DB).
-OPER_SET_SQL_OFF
-	Ðåæèì ðàáîòû ñåðâèñîâ èçìåíåí: SQL-ðåæèì äåàêòèâèðîâàí.
-OPER_SET_SQL_ERROR
-	 êà÷åñòâå ïàðàìåòðà äëÿ îïöèè SQL âû äîëæíû óêàçàòü ëèáî ON, ëèáî OFF.
-OPER_SET_SQL_ERROR_INIT
-	Îøèáêà èíèöèàëèçàöèè SQL, îáðàòèòåñü ê ëîãàì äëÿ áîëåå ïîäðîáíîé èíôîðìàöèè.
-OPER_SET_SQL_ERROR_DISABLED
-	SQL-ôóíêöèè íå íàñòðîåíû èëè íàñòðîåíû íåêîððåêòíî. Âíåñèòå íåîáõîäèìûå
-	èçìåíåíèÿ â êîíôèãóðàöèîííûé ôàéë ñåðâèñîâ (services.conf).
 OPER_SET_LIST_OPTION_ON
 	Ðåæèì %s: âêëþ÷åí.
 OPER_SET_LIST_OPTION_OFF
@@ -5915,7 +5904,6 @@ OPER_HELP_SET
 	    LOGCHAN    àêòèâàöèÿ/äåàêòèâàöèÿ ëîãèðîâàíèÿ ñîáûòèé íà ñåðâèñíûé êàíàë
 	    DEBUG      àêòèâàöèÿ/äåàêòèâàöèÿ ðåæèì îòëàäêè (debug mode)
 	    NOEXPIRE   àêòèâàöèÿ/äåàêòèâàöèÿ ðåæèìà íå-èñòå÷åíèÿ
-	    SQL        àêòèâàöèÿ/äåàêòèâàöèÿ SQL-ðåæèìà
 	    IGNORE     àêòèâàöèÿ/äåàêòèâàöèÿ îáðàáîòêè ñïèñêà èãíîðà
 	    LIST       ïðîñìîòð ñòàòóñà âñåõ âûøåïåðå÷èñëåííûõ îïöèé
 	    SUPERADMIN àêòèâàöèÿ/äåàêòèâàöèÿ ðåæèìà Ñóïåð-Àäìèíèñòðàòîðà
@@ -5989,13 +5977,6 @@ OPER_HELP_SET_SUPERADMIN
 	íåîáõîäèìîñòè. Îòêëþ÷èòå åå ñðàçó, êàê òîëüêî ïåðåñòàíåòå íóæäàòüñÿ
 	â íåé.
 
-OPER_HELP_SET_SQL
-	Ñèíòàêñèñ: SET SQL {ON | OFF}
-	
-	Äàííàÿ îïöèÿ ïîçâîëÿåò âàì "íà ëåòó" âêëþ÷àòü èëè âûêëþ÷àòü SQL-ðåæèì
-	ñåðâèñîâ. Âåñüìà  ïîëåçíî,  íàïðèìåð, êîãäà  MySQL ñåðâåð âðåìåííî
-	íåäîñòóïåí.
-
 OPER_HELP_SET_IGNORE
 	Ñèíòàêñèñ: SET IGNORE {ON | OFF}
 	
diff --git a/lang/tr.l b/lang/tr.l
index 6a83c16b9..cd6dda3f0 100644
--- a/lang/tr.l
+++ b/lang/tr.l
@@ -2898,17 +2898,6 @@ OPER_SET_NOEXPIRE_ERROR
 	NOEXPIRE ayarý ON yada OFF olmalýdýr.
 OPER_SET_UNKNOWN_OPTION
 	Varolmayan özellik %s.
-OPER_SET_SQL_ON
-	SQL code will be used.
-OPER_SET_SQL_OFF
-	SQL code will not be used.
-OPER_SET_SQL_ERROR
-	Setting for SQL must be ON or OFF.
-OPER_SET_SQL_ERROR_INIT
-	Error during init of SQL, check your logs to correct.
-OPER_SET_SQL_ERROR_DISABLED
-	SQL is not configured for this network. Please edit the
-	configuration file (services.conf).
 OPER_SET_LIST_OPTION_ON
 	%s is enable
 OPER_SET_LIST_OPTION_OFF
@@ -5902,7 +5891,6 @@ OPER_HELP_SET
 	    DEBUG      Debug modunu aktifleþtirir yada kapatýr
 	    NOEXPIRE   No expire modunu aktifleþtirir yada kapatýr
 	    SUPERADMIN Activate or deactivate super-admin mode
-	    SQL   	 Activate or deactivate sql mode
 	    IGNORE     Activate or deactivate ignore mode
 	    LIST       List the options
 	
@@ -5963,13 +5951,6 @@ OPER_HELP_SET_SUPERADMIN
 	This opion is _NOT_ persistant, and should only be used when
 	needed, and set back to OFF when no longer needed.
 
-OPER_HELP_SET_SQL
-	Syntax: SET SQL {ON | OFF}
-
-	Setting this will toggle Anope's from usage of SQL, this should
-	be used to disable and enable SQL should your SQL server go down
-	while services are running.
-
 OPER_HELP_SET_IGNORE
 	Syntax: SET IGNORE {ON | OFF}
 
diff --git a/src/main.c b/src/main.c
index 8484eeea1..cd3c9e117 100644
--- a/src/main.c
+++ b/src/main.c
@@ -89,7 +89,7 @@ const char version_number_dotted[] = VERSION_STRING_DOTTED;
 const char version_build[] =
 	"build #" BUILD ", compiled " __DATE__ " " __TIME__;
 /* the space is needed cause if you build with nothing it will complain */
-const char version_flags[] = " " VER_OS VER_MYSQL VER_MODULE;
+const char version_flags[] = " " VER_OS VER_MODULE;
 
 
 /******** Local variables! ********/
diff --git a/src/misc.c b/src/misc.c
index 591cd1181..b1ab62e32 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -882,9 +882,6 @@ void rand_init()
 	int n, fd;
 #endif
 	struct {
-#ifdef USE_MYSQL
-		int sqlrand;
-#endif
 #ifndef _WIN32
 		struct timeval nowt;	/* time */
 		char rnd[32];		   /* /dev/urandom */
@@ -896,11 +893,6 @@ void rand_init()
 
 	arc4_init();
 
-	/* Grab "random" MYSQL data */
-#ifdef USE_MYSQL
-	rdat.sqlrand = mysql_rand();
-#endif
-
 	/* Grab OS specific "random" data */
 #ifndef _WIN32
 	/* unix/bsd: time */