From 1232a6382e1d87d49eb4590d42ff24d73f648617 Mon Sep 17 00:00:00 2001 From: Carson Ip Date: Wed, 20 Feb 2019 11:51:15 +0800 Subject: [PATCH] Fix minor typos --- include/MySQL_Session.h | 2 +- lib/ClickHouse_Authentication.cpp | 2 +- lib/ClickHouse_Server.cpp | 2 +- lib/MySQL_Authentication.cpp | 2 +- lib/MySQL_Session.cpp | 4 ++-- lib/MySQL_Thread.cpp | 6 +++--- lib/ProxySQL_Admin.cpp | 2 +- lib/Query_Cache.cpp | 2 +- lib/Query_Processor.cpp | 2 +- lib/SQLite3_Server.cpp | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/include/MySQL_Session.h b/include/MySQL_Session.h index 8f88a63be..784620e4f 100644 --- a/include/MySQL_Session.h +++ b/include/MySQL_Session.h @@ -175,7 +175,7 @@ class MySQL_Session bool schema_locked; bool transaction_persistent; bool session_fast_forward; - bool started_sending_data_to_client; // this status variable tracks if some result set was sent to the client, of if proysql is still buffering everything + bool started_sending_data_to_client; // this status variable tracks if some result set was sent to the client, or if proxysql is still buffering everything bool use_ssl; bool with_gtid; diff --git a/lib/ClickHouse_Authentication.cpp b/lib/ClickHouse_Authentication.cpp index 057ed37ba..a7ecfeb5b 100644 --- a/lib/ClickHouse_Authentication.cpp +++ b/lib/ClickHouse_Authentication.cpp @@ -11,7 +11,7 @@ ClickHouse_Authentication::ClickHouse_Authentication() { #else if (glovars.has_debug==true) { #endif /* DEBUG */ - perror("Incompatible debagging version"); + perror("Incompatible debugging version"); exit(EXIT_FAILURE); } #ifdef PROXYSQL_AUTH_PTHREAD_MUTEX diff --git a/lib/ClickHouse_Server.cpp b/lib/ClickHouse_Server.cpp index 9dddcdf8d..9282ae471 100644 --- a/lib/ClickHouse_Server.cpp +++ b/lib/ClickHouse_Server.cpp @@ -1427,7 +1427,7 @@ ClickHouse_Server::ClickHouse_Server() { #else if (glovars.has_debug==true) { #endif /* DEBUG */ - perror("Incompatible debagging version"); + perror("Incompatible debugging version"); exit(EXIT_FAILURE); } diff --git a/lib/MySQL_Authentication.cpp b/lib/MySQL_Authentication.cpp index fd75a3337..c77d8e98a 100644 --- a/lib/MySQL_Authentication.cpp +++ b/lib/MySQL_Authentication.cpp @@ -10,7 +10,7 @@ MySQL_Authentication::MySQL_Authentication() { #else if (glovars.has_debug==true) { #endif /* DEBUG */ - perror("Incompatible debagging version"); + perror("Incompatible debugging version"); exit(EXIT_FAILURE); } #ifdef PROXYSQL_AUTH_PTHREAD_MUTEX diff --git a/lib/MySQL_Session.cpp b/lib/MySQL_Session.cpp index ca2b62a8d..722f817a6 100644 --- a/lib/MySQL_Session.cpp +++ b/lib/MySQL_Session.cpp @@ -654,7 +654,7 @@ bool MySQL_Session::handler_SetAutocommit(PtrSize_t *pkt) { } } if (fd >= 0) { // we can set autocommit - // we immeditately process the number of transactions + // we immediately process the number of transactions unsigned int nTrx=NumActiveTransactions(); if (fd==1 && autocommit==true) { // nothing to do, return OK @@ -2965,7 +2965,7 @@ handler_again: CurrentQuery.mysql_stmt=myconn->local_stmts->find_backend_stmt_by_global_id(CurrentQuery.stmt_global_id); if (CurrentQuery.mysql_stmt==NULL) { MySQL_STMT_Global_info *stmt_info=NULL; - // the conection we too doesn't have the prepared statements prepared + // the connection we too doesn't have the prepared statements prepared // we try to create it now stmt_info=GloMyStmt->find_prepared_statement_by_stmt_id(CurrentQuery.stmt_global_id); CurrentQuery.QueryLength=stmt_info->query_length; diff --git a/lib/MySQL_Thread.cpp b/lib/MySQL_Thread.cpp index dea7d79b0..0c3f61ab1 100644 --- a/lib/MySQL_Thread.cpp +++ b/lib/MySQL_Thread.cpp @@ -334,7 +334,7 @@ MySQL_Threads_Handler::MySQL_Threads_Handler() { #else if (glovars.has_debug==true) { #endif /* DEBUG */ - perror("Incompatible debagging version"); + perror("Incompatible debugging version"); exit(EXIT_FAILURE); } num_threads=0; @@ -461,7 +461,7 @@ MySQL_Threads_Handler::MySQL_Threads_Handler() { #ifdef DEBUG variables.session_debug=true; #endif /*debug */ - // status varuables + // status variables status_variables.mirror_sessions_current=0; __global_MySQL_Thread_Variables_version=1; MLM = new MySQL_Listeners_Manager(); @@ -3253,7 +3253,7 @@ __run_skip_1a: proxy_error("Error during read from signal_all_threads()\n"); } proxy_debug(PROXY_DEBUG_GENERIC,3, "Got signal from admin , done nothing\n"); - //fprintf(stderr,"Got signal from admin , done nothing\n"); // FIXME: this is just the scheleton for issue #253 + //fprintf(stderr,"Got signal from admin , done nothing\n"); // FIXME: this is just the skeleton for issue #253 if (c) { // we are being signaled to sleep for some ms. Before going to sleep we also release the mutex pthread_mutex_unlock(&thread_mutex); diff --git a/lib/ProxySQL_Admin.cpp b/lib/ProxySQL_Admin.cpp index e8cec2291..4c58e1ee6 100644 --- a/lib/ProxySQL_Admin.cpp +++ b/lib/ProxySQL_Admin.cpp @@ -3601,7 +3601,7 @@ ProxySQL_Admin::ProxySQL_Admin() { #else if (glovars.has_debug==true) { #endif /* DEBUG */ - perror("Incompatible debagging version"); + perror("Incompatible debugging version"); exit(EXIT_FAILURE); } diff --git a/lib/Query_Cache.cpp b/lib/Query_Cache.cpp index 4965c0dce..f9a9ee044 100644 --- a/lib/Query_Cache.cpp +++ b/lib/Query_Cache.cpp @@ -317,7 +317,7 @@ Query_Cache::Query_Cache() { #else if (glovars.has_debug==true) { #endif /* DEBUG */ - perror("Incompatible debagging version"); + perror("Incompatible debugging version"); exit(EXIT_FAILURE); } for (int i=0; i