database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Eliminate warnings noticed by VC7. This includes fixing my_mmap() on

Browse Source 
Windows to call CreateFileMapping() with correct arguments, and
propogating the introduction of query_id_t to everywhere query ids are
passed around. (Bug #8826)
This commit is contained in:
jimw@mysql.com
2005-03-18 16:12:25 -08:00
parent 348c285d0f
commit ee2b4ec959
33 changed files with 66 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_class.h
View File

@@ -1168,8 +1168,8 @@ public:
from table are necessary for this select, to check if it's necessary to
update auto-updatable fields (like auto_increment and timestamp).
*/
ulong query_id;
ulong warn_id, version, options, thread_id, col_access;
query_id_t query_id, warn_id;
ulong version, options, thread_id, col_access;
/* Statement id is thread-wide. This counter is used to generate ids */
ulong statement_id_counter;
@@ -1797,7 +1797,8 @@ class user_var_entry
public:
LEX_STRING name;
char *value;
ulong length, update_query_id, used_query_id;
ulong length;
query_id_t update_query_id, used_query_id;
Item_result type;
double val_real(my_bool *null_value);