Commit graph

176 commits

Author SHA1 Message Date
jimw@mysql.com
7b985df2a0 Remove references to no-longer-used MySqlManager project files 2005-03-21 23:32:27 +01:00
jimw@mysql.com
5f715b52d0 Fix test_libmysqld link problem on Windows. 2005-03-21 21:51:31 +01:00
joerg@mysql.com
f87c045e7e Merge 2005-03-11 11:21:51 +01:00
joerg@mysql.com
f610930224 Correct "make_win_src_distribution" to not introduce additional directory layers,
adapt the Windows build files accordingly.
2005-03-10 21:13:46 +01:00
serg@serg.mylan
956682de1a merged 2005-03-09 14:09:06 +01:00
georg@lmy002.wdf.sap.corp
e8e5cd5053 Various fixes for Windows 2003 Platform SDK SP1 beta 2005-03-07 13:04:05 +01:00
georg@lmy002.wdf.sap.corp
473f2f9409 New Project files for Windows Ithanium 64-bit builds 2005-03-06 14:22:28 +01:00
kent@mysql.com
c3af8b202d libmysqld.dsp:
Corrected path to my_decimal.cpp
2005-02-24 11:24:59 +01:00
reggie@mdk10.(none)
18799ea2ca Added my_mmap to mysys library
mysys.dsp:
  Added my_mmap
2005-02-23 23:10:22 -06:00
georg@beethoven.site
26e3685b02 Changes and fixes for windows compilation 2005-02-18 15:17:17 +01:00
ingo@mysql.com
601a4fdfa2 Merge 2005-02-11 11:59:35 +01:00
brian@zim.(none)
29af4dffe6 Set of fixes requested by Kent in IRC. Tested (except the windows changes since I am trusting Kent...). No windows compiles here folks... 2005-02-10 19:04:38 -08:00
kent@mysql.com
9a564f832a Merge 2005-02-09 16:56:58 +01:00
wax@kishkin.ru
b93102422b WL#964
renamed client_test to mysql_client_test
    fixed name for lstat in removef()
    added mysql-debug.exe for Windows
    added enviroment variable MYSQL_CLIENT_TEST
    added cleaning directory before tests
    New BitKeeper file ``VC++Files/tests/mysql_client_test.dsp''
    Delete: VC++Files/tests/client_test.dsp
2005-02-02 19:53:49 +05:00
wax@kishkin.ru
6ba40427ba WL#964
added client_test.dsp in project
    added CHARACTER SET in tables
    added 5th time zone
    included lstat in if()
    expanded ignore list for windows
    added directory slave1 and slave2
    added options for mysqld and mysqltest
    fixed error in read_option()
    fixed and added enviroment variables for Linux and Windows
    rewrote str_tok()
    added replacment 3th column
    New BitKeeper file ``VC++Files/tests/client_test.dsp''
2005-01-31 19:18:06 +05:00
lenz@mysql.com
bbf08df9f1 - added "../extra" to the include path of mysqltest.dsp (Windows compile
failed to find the newly introduced extra/mysqld_ername.h header file)
2005-01-27 09:05:55 +01:00
georg@beethoven.site
3b2bf2f512 Fixes for windows compilation bugs
(After review of cs georg:1.1800 by Monty)
2005-01-26 15:19:20 +01:00
hf@deer.(none)
196c95e938 Merging conflicts resolved 2005-01-11 21:00:53 +04:00
lenz@mysql.com
33795908a0 Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
2005-01-11 16:02:45 +01:00
lenz@mysql.com
a156ddd0be - Create the mysqld binaries with the correct file names during the build
instead of renaming them in the packaging stage with Do-win-build later:
  mysqld-opt.exe -> mysqld.exe, mysqld.exe -> mysqld-debug.exe
2005-01-11 15:41:42 +01:00
hf@deer.(none)
7ddb951984 Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.7330
2005-01-11 16:10:06 +04:00
serg@sergbook.mysql.com
f472cec178 merged 2005-01-06 19:32:16 +02:00
kent@mysql.com
de85fdb78f mysql_test_run_new.dsp:
Link mysql_test_run_new as console application
my_manage.c:
  The type intptr_t isn't defined for VC 6.0
  Changed return type for CreateProcess() to bool
mysql_test_run_new.c:
  The type intptr_t isn't defined for VC 6.0
mysqltest.dsp:
  Added regex to additional build types for mysqltest
mysqldump.dsp:
  Added mysys.lib for linking mysqldump
2005-01-04 23:07:29 +01:00
hf@deer.(none)
eb723e0537 Fix for bug #6434 (bad memory deletion in app using libmysqld)
We should build libmysqld in SAFEMALLOC mode.
2005-01-03 18:50:51 +04:00
kent@mysql.com
fb820c4b9c prepare, winmysqladmin.cpp, mysqldmax.dsp, mysqld.dsp, mysql.dsw:
Removed references to ISAM and MERGE
2005-01-01 20:27:51 +01:00
monty@mysql.com
34d5331cee Merge with global tree 2004-12-31 00:50:30 +02:00
petr@mysql.com
1e24a49d45 VC++Files/mysqlmanager deleted 2004-12-29 11:41:58 +03:00
monty@mishka.local
4f4bbfc279 Merge with 4.1 2004-12-22 13:54:39 +02:00
wax@kishkin.ru
e81d48fdd9 corrected mysqltest.dsp
corrected mysql_test_run_new.dsp
added dependency
corrected path of mysql_test_run_new.dsp
fixed wrong code
added my_create_tables.c
removed command_line
fixed #elif
restored NAME_MAX and MAX_FNAME
added create_system_files()
added compare() for windows
added all files of testes in script
added mysql-test in script
2004-12-14 18:46:55 +05:00
guilhem@mysql.com
1cbc904c59 Changing the default of libmysqlclient : it's now NO reconnection.
All our programs which use mysql_real_connect() and mysql_connect() are updated accordingly, though I have deliberately
made mysqlimport not reconnect anymore (already true for mysqldump >= 4.1.8).
All Connector devs have been warned about the change I'm doing here - which was agreed with Monty,
and fixes BUG#2555.
2004-12-09 14:44:10 +01:00
rburnett@build.mysql.com
e9e5312559 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into build.mysql.com:/users/rburnett/mysql-4.1-new2
2004-12-06 14:51:37 +01:00
monty@mysql.com
0de4777187 Merge with 4.1 2004-12-06 11:38:56 +02:00
wax@kishkin.ru
f3bdd0312b added project files of mysqltest and mysql_test_run_new 2004-12-03 16:59:49 +05:00
rburnett@build.mysql.com
4278e6194b Bug #6697 Failure to build 4.1.7 on Visual Studio .NET [fixed]
mysqld.dsp:
  Added custom build step for message.mc to all targets
2004-12-02 18:05:37 +01:00
serg@serg.mylan
ee933cd198 merged 2004-11-22 21:33:15 +01:00
lenz@mysql.com
51e18c217a - renamed mysqladmin.c -> mysqladmin.cpp to fix the Windows builds 2004-11-22 17:08:06 +01:00
lenz@mysql.com
40c5b91930 - added sql_trigger.cpp to the mysqld and libmysqld project files 2004-11-18 16:36:25 +01:00
monty@mysql.com
afbe601302 merge with 4.1 2004-10-29 19:26:52 +03:00
lenz@mysql.com
8c496b487f - added missing file strings/my_strtoll10.c to the libmysql.dsp and
mysqlclient.dsp project files
2004-10-14 14:54:06 +02:00
monty@mysql.com
31122efde7 Merge with 4.1
(Includes merge of arena code in 4.1 and 5.0)
2004-09-06 15:14:10 +03:00
sergefp@mysql.com
9366988718 Adding the file needed for windows build (on behalf of Reggie) 2004-08-27 03:27:16 +04:00
serg@serg.mylan
b4bb38e896 merged 2004-08-26 15:19:46 +02:00
guilhem@mysql.com
22a65bcf26 mysql_com.h:
still better names for enum; removing unneeded symbol
2004-08-19 15:15:52 +02:00
guilhem@mysql.com
f1e8bc8535 mysql_com.h:
Better names for defines, as these are visible in API
2004-08-19 15:10:59 +02:00
serg@serg.mylan
3bac9dd7db Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-08-19 03:03:02 +02:00
guilhem@mysql.com
f5228a60e6 Very small API change: changing the values in enum enum_shutdown_level;
as this enum is not really usable yet (as MySQL server supports only one
shutdown level), and as SHUTDOWN_DEFAULT is still left to 0, this change
should disturb no user. Later (in 4.1.4 or 4.1.5) code will be pushed to
implement graceful shutdown using this enum.
2004-08-19 01:03:43 +02:00
serg@serg.mylan
e1237cbc53 manually merged 2004-08-18 19:57:55 +02:00
rburnett@build.mysql.com
67003d1c98 mysql_priv.h:
Added declarations for print_msg_to_log and vprint_msg_to_log.  sql_print_error are simple functions that wrap calls to print_msg_to_log.  Define the different error types with MY_ERROR_TYPE, MY_WARNING_TYPE, and MY_INFORMATION_TYPE
gen_lex_hash.cc:
  Added NULL error reporting parameter to handle_options
log.cc:
  Add print_msg_to_log, print_buffer_to_log, and vprint_msg_to_log.  Print_msg_to_log will write the message to the windows event log if on NT.  We now have error, warning, and information versions of sql_print_xxxx.  T his is a variation of a similar changeset WAX did.
mysqld.cc:
  Added option_error_reporter callback function and pass that into handle_options
mysql.cc:
  Added NULL as error reporter arg to the end of handle_options
Many files:
  Added NULL error reporter parameter as the last paramter to handle_options
my_getopt.c:
  Added second function pointer to server as an error reporting callback.  Added local function report_option_error that will either write the error to stderr or to the error reporting callback.  changed all calls in handle_options from fprintf(stderr, ... ) to report_option_error
my_getopt.h:
  Changed declaration of handle_options to use typedefs for the two function pointers.  added second function pointer to server as an error reporting callback
mysqld.dsp:
  Added custom build step for compiling message file and added message resource file (output of mc)
2004-08-14 03:38:37 +02:00
lenz@mysql.com
ed277f8ccf - Windows compile fix: added srv/srv0que.c to the innobase project
file
2004-08-05 16:50:03 +02:00
lenz@mysql.com
55dce7b2c6 - make sure the Windows "-classic" server binaries actually include
"-classic" in the version string
2004-07-30 14:04:52 +02:00