diff options
| author | unknown <miguel@hegel.local> | 2004-05-05 02:59:17 -0300 |
|---|---|---|
| committer | unknown <miguel@hegel.local> | 2004-05-05 02:59:17 -0300 |
| commit | bddee0c170454f54c1f87299d88d3aa9e44a3872 (patch) | |
| tree | acaa682ecb4e7413232120ad5965cc6adc2f410c /sql/sql_lex.cc | |
| parent | af847c22af26e1cc308eeab08d35942741809408 (diff) | |
| download | mariadb-git-bddee0c170454f54c1f87299d88d3aa9e44a3872.tar.gz | |
Windows fixes for VC++ compiler compability
myisam/myisam_ftdump.c:
VC++ compiler compability fix
mysys/my_getsystime.c:
Applied Sergei's code for Windows (still subject to changes by him)
sql/handler.cc:
VC++ compiler compability fix
sql/item_geofunc.cc:
Removed non-used variable
sql/item_strfunc.cc:
VC++ compiler compability fix
sql/opt_range.cc:
VC++ compiler compability fix
sql/sql_insert.cc:
VC++ compiler compability fix
sql/sql_lex.cc:
VC++ compiler compability fix
sql/sql_parse.cc:
VC++ compiler compability fix
sql/sql_prepare.cc:
VC++ compiler compability fix
sql/sql_union.cc:
Removed non-used variable and VC++ compiler compability fix
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 19a6941fe32..63247a64319 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -1668,8 +1668,8 @@ TABLE_LIST *st_lex::unlink_first_table(TABLE_LIST *tables, and from local list if it is not the same */ select_lex.table_list.first= ((&select_lex != all_selects_list) ? - (gptr) (*local_first)->next : - (gptr) tables); + (byte*) (*local_first)->next : + (byte*) tables); (*global_first)->next= 0; return tables; } @@ -1698,10 +1698,10 @@ TABLE_LIST *st_lex::link_first_table_back(TABLE_LIST *tables, we do not touch local table 'next' field => we need just put the table in the list */ - select_lex.table_list.first= (gptr) local_first; + select_lex.table_list.first= (byte*) local_first; } else - select_lex.table_list.first= (gptr) global_first; + select_lex.table_list.first= (byte*) global_first; return global_first; } |