diff options
| author | unknown <kostja@oak.local> | 2003-07-18 18:57:21 +0400 |
|---|---|---|
| committer | unknown <kostja@oak.local> | 2003-07-18 18:57:21 +0400 |
| commit | 2fa2ab70470251f242b33287468a22319057bc6b (patch) | |
| tree | 06b70f471463eec69c8b15d74c4c0b590297d594 | |
| parent | a4b15d5311b763d381389f4c448d8f11663e5b57 (diff) | |
| download | mariadb-git-2fa2ab70470251f242b33287468a22319057bc6b.tar.gz | |
few compile-time bugs fixed
include/mysql.h:
fixed compile-time bug
sql/sql_class.cc:
fixed compile-time bug
sql/sql_class.h:
fixed compile-time bug
| -rw-r--r-- | include/mysql.h | 2 | ||||
| -rw-r--r-- | sql/sql_class.cc | 2 | ||||
| -rw-r--r-- | sql/sql_class.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/mysql.h b/include/mysql.h index 079808d9ba7..10bacffb2b1 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -229,7 +229,7 @@ typedef struct st_mysql my_bool reconnect; /* set to 1 if automatic reconnect */ /* session-wide random string */ - char scramble[max(SCRAMBLE_LENGTH,SCRAMBLE_LENGTH_323)+1]; + char scramble[SCRAMBLE_LENGTH+1]; /* Set if this is the original connection, not a master or a slave we have 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; |