diff options
author | unknown <monty@hundin.mysql.fi> | 2002-08-29 18:20:04 +0300 |
---|---|---|
committer | unknown <monty@hundin.mysql.fi> | 2002-08-29 18:20:04 +0300 |
commit | 77e28942864bcb8134982e707b1bb22d1c4a00ed (patch) | |
tree | 639b682a916bf0c0da738734e94c5305baef2c42 /libmysqld | |
parent | f4a24ad2d2a4240ea9c0012cab6aa1c1bf846ed4 (diff) | |
download | mariadb-git-77e28942864bcb8134982e707b1bb22d1c4a00ed.tar.gz |
Updated VC++ dsp files from windows build machine
Remove some compiler warnings when using VC++
Add InnoDB in normal MySQL binary for windows.
BitKeeper/deleted/.del-lib_load.cc~854092828128d7f9:
Delete: libmysqld/lib_load.cc
VC++Files/bdb/bdb.dsp:
Updated VC++ dsp files from windows build machine
VC++Files/client/mysql.dsp:
Updated VC++ dsp files from windows build machine
VC++Files/client/mysqladmin.dsp:
Updated VC++ dsp files from windows build machine
VC++Files/client/mysqlclient.dsp:
Updated VC++ dsp files from windows build machine
VC++Files/client/mysqldump.dsp:
Updated VC++ dsp files from windows build machine
VC++Files/client/mysqlimport.dsp:
Updated VC++ dsp files from windows build machine
VC++Files/client/mysqlshow.dsp:
Updated VC++ dsp files from windows build machine
VC++Files/innobase/innobase.dsp:
Updated VC++ dsp files from windows build machine
VC++Files/libmysqld/libmysqld.dsp:
Updated VC++ dsp files from windows build machine
VC++Files/libmysqltest/myTest.dsp:
Updated VC++ dsp files from windows build machine
VC++Files/libmysqltest/mytest.c:
Removed compiler warning for VC++
VC++Files/mysql.dsw:
Add Innodb to standard binary
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
Updated VC++ dsp files from windows build machine
VC++Files/mysqlcheck/mysqlcheck.dsp:
Updated VC++ dsp files from windows build machine
VC++Files/mysqlmanager/MySqlManager.dsp:
Updated VC++ dsp files from windows build machine
VC++Files/mysys/mysys.dsp:
Updated VC++ dsp files from windows build machine
VC++Files/pack_isam/pack_isam.dsp:
Updated VC++ dsp files from windows build machine
VC++Files/perror/perror.dsp:
Updated VC++ dsp files from windows build machine
VC++Files/replace/replace.dsp:
Updated VC++ dsp files from windows build machine
VC++Files/sql/mysqld.dsp:
Updated VC++ dsp files from windows build machine
VC++Files/test1/test1.dsp:
Updated VC++ dsp files from windows build machine
VC++Files/thr_insert_test/thr_insert_test.dsp:
Updated VC++ dsp files from windows build machine
VC++Files/thr_test/thr_test.dsp:
Updated VC++ dsp files from windows build machine
VC++Files/vio/vio.dsp:
Updated VC++ dsp files from windows build machine
sql/item_strfunc.cc:
Removed compiler warning on VC++
VC++Files/libmysql/libmysql.dsp:
Updated VC++ dsp files from windows build machine
Diffstat (limited to 'libmysqld')
-rw-r--r-- | libmysqld/lib_load.cc | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/libmysqld/lib_load.cc b/libmysqld/lib_load.cc deleted file mode 100644 index 3db5a2488d1..00000000000 --- a/libmysqld/lib_load.cc +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (c) 2000 - * SWsoft company - * - * This material is provided "as is", with absolutely no warranty expressed - * or implied. Any use is at your own risk. - * - * Permission to use or copy this software for any purpose is hereby granted - * without fee, provided the above notices are retained on all copies. - * Permission to modify the code and to distribute modified code is granted, - * provided the above notices are retained, and a notice that the code was - * modified is included with the above copyright notice. - * - */ -/* Copy data from a textfile to table */ - -#include "mysql_priv.h" -#include <my_dir.h> -#include <m_ctype.h> - - -int -mysql_load_internal(THD * thd, sql_exchange * ex, TABLE_LIST * table_list, - List<Item> & fields, enum enum_duplicates handle_duplicates, - bool read_file_from_client, thr_lock_type lock_type); - -int -mysql_load(THD * thd, sql_exchange * ex, TABLE_LIST * table_list, - List<Item> & fields, enum enum_duplicates handle_duplicates, - bool read_file_from_client, thr_lock_type lock_type) -{ - read_file_from_client = 0; //server is always in the same process - return mysql_load_internal(thd, ex, table_list, fields, handle_duplicates, - read_file_from_client, lock_type); -} - -#define mysql_load mysql_load_internal - - -#if defined (__WIN__) -#include "../sql/sql_load.cpp" -#else -#include "../sql/sql_load.cc" -#endif |