summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorkostja@oak.local <>2003-07-18 18:57:21 +0400
committerkostja@oak.local <>2003-07-18 18:57:21 +0400
commit715f8747d49bec27ae4948e74e18247dc4e9d52b (patch)
tree06b70f471463eec69c8b15d74c4c0b590297d594 /sql
parent09e53b016967a84126dc50474a54010712893bf1 (diff)
downloadmariadb-git-715f8747d49bec27ae4948e74e18247dc4e9d52b.tar.gz
few compile-time bugs fixed
Diffstat (limited to 'sql')
-rw-r--r--sql/sql_class.cc2
-rw-r--r--sql/sql_class.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index ebb3e819ddc..c7fb2ce3368 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -139,7 +139,7 @@ THD::THD():user_time(0), is_fatal_error(0),
set_query_id=1;
db_access=NO_ACCESS;
version=refresh_version; // For boot
- *scramble= *scramble_323= '\0';
+ *scramble= '\0';
init();
/* Initialize sub structures */
diff --git a/sql/sql_class.h b/sql/sql_class.h
index 1557ede8305..4eb1d6057a9 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -547,7 +547,7 @@ public:
DYNAMIC_ARRAY user_var_events;
/* scramble - random string sent to client on handshake */
- char scramble[max(SCRAMBLE_LENGTH, SCRAMBLE_LENGTH_323)+1];
+ char scramble[SCRAMBLE_LENGTH+1];
uint8 query_cache_type; // type of query cache processing
bool slave_thread;