diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-02-14 13:31:39 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-02-14 13:31:39 +0200 |
| commit | 6826a55b1da73770ce067972efafc00f9d2f6670 (patch) | |
| tree | 5a43e43d6a139a343cb71c89c1209240d9287db0 /sql/sql_class.h | |
| parent | fab7113f8398ba41d5e54e32dc0b3259a6297dfc (diff) | |
| parent | 4ec12a5e55d5f2db27a5c0ce93c7e74254d652a4 (diff) | |
| download | mariadb-git-6826a55b1da73770ce067972efafc00f9d2f6670.tar.gz | |
merge
sql/item.h:
Auto merged
sql/item_sum.h:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 93703acc97b..a3f3737e46f 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -591,8 +591,7 @@ public: struct st_mysql_bind *client_params; char *extra_data; ulong extra_length; - char *query_rest; - uint32 query_rest_length; + String query_rest; #endif NET net; // client connection descriptor MEM_ROOT warn_root; // For warnings and errors |