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_prepare.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_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index 6e4a748a67a..27f0c7a7c45 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -1147,11 +1147,11 @@ static int mysql_test_insert_select(Prepared_statement *stmt, TABLE_LIST *first_local_table= (TABLE_LIST *)lex->select_lex.table_list.first; /* Skip first table, which is the table we are inserting in */ - lex->select_lex.table_list.first= (gptr) first_local_table->next; + lex->select_lex.table_list.first= (uchar*) first_local_table->next; lex->select_lex.resolve_mode= SELECT_LEX::NOMATTER_MODE; res= select_like_statement_test(stmt, tables); /* revert changes*/ - lex->select_lex.table_list.first= (gptr) first_local_table; + lex->select_lex.table_list.first= (uchar*) first_local_table; lex->select_lex.resolve_mode= SELECT_LEX::INSERT_MODE; return res; } |