summaryrefslogtreecommitdiff
path: root/sql/item_cmpfunc.cc
diff options
context:
space:
mode:
authorunknown <venu@myvenu.com>2003-06-03 18:45:07 -0700
committerunknown <venu@myvenu.com>2003-06-03 18:45:07 -0700
commitfc59ec4eddbd4f6f518795dcd231b5343234350f (patch)
tree6c667c83f599e122fe20111ffc01bf244d774111 /sql/item_cmpfunc.cc
parentda9bf1dec30f9d1cda414d0a96ca93c11b1a77e7 (diff)
downloadmariadb-git-fc59ec4eddbd4f6f518795dcd231b5343234350f.tar.gz
Windows build fixups with the latest source
sql/item_cmpfunc.cc: Remove unused variables sql/mysqld.cc: fix the defination as this is different from the prototype (cl compiler failed) sql/sql_insert.cc: fix the windows error (without cast) sql/sql_show.cc: Remove unused variables include/config-win.h: Fix for Windows build to go (charsets + collation default defs) VC++Files/client/mysqlclient.dsp: Take care of newly added/removed files VC++Files/libmysql/libmysql.dsp: Take care of newly added/removed files VC++Files/sql/mysqld.dsp: Take care of newly added/removed files
Diffstat (limited to 'sql/item_cmpfunc.cc')
-rw-r--r--sql/item_cmpfunc.cc1
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc
index 4f55357f288..3dbdc36a92d 100644
--- a/sql/item_cmpfunc.cc
+++ b/sql/item_cmpfunc.cc
@@ -246,7 +246,6 @@ void Item_bool_func2::fix_length_and_dec()
We must set cmp_charset here as we may be called from for an automatic
generated item, like in natural join
*/
-end:
set_cmp_charset(args[0]->charset(), args[0]->coercibility,
args[1]->charset(), args[1]->coercibility);
}