Commit graph

139 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
konstantin@mysql.com
d2c1f3fc37 First step of implementation of WL#1518 "make bundled zlib
usable for unix builds": zlib 1.2.1 imported
2004-07-21 17:36:26 -07:00
monty@mysql.com
eca9418ca7 Added missing my_time.c file to mysqlclient project
Moved include <assert.h> to my_global.h
2004-06-28 00:42:02 +03:00
lenz@mysql.com
9911d93f07 - removed the VC++Files/InstallShield directory per Montys request
(moved it into another BK tree instead)
2004-06-25 16:00:17 +02:00
patg@krsna.patg.net
f6ea88e8a3 Many files:
new file
2004-06-25 00:43:14 -07:00
lenz@mysql.com
28adaa438a Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
2004-06-24 19:30:34 +02:00
lenz@mysql.com
e2892e4180 - Windows compile fix: added missing file tztime.cpp to the mysqld
project file
2004-06-24 18:17:47 +02:00
konstantin@mysql.com
a30fcdc690 Fix for Bug#4030 "Client side conversion string -> date type doesn't
work (prepared statements)" and after-review fixes:
- str_to_TIME renamed to str_to_datetime to pair with str_to_time
- functions str_to_time and str_to_TIME moved to sql-common
- send_data_str now supports MYSQL_TYPE_TIME, MYSQL_TIME_DATE,
  MYSQL_TIME_DATETIME types of user input buffers.
- few more comments in the client library
- a test case added.
2004-06-24 19:08:36 +04:00
lenz@mysql.com
1c88943129 - Windows compile fix: added srv/srv0que.c to the innobase project
file and sql/tztime.cpp to the libmysqld project file
2004-06-24 11:45:06 +02:00
patg@krsna.patg.net
c9b1946c05 Development.fgl:
add typelib.h to filelist
Clients and Tools.fgl:
  add libmysql.dll to file list
4.0.XX-gpl.ipr:
  Various fixes to installshield project file (added files)
2004-06-23 21:02:37 -07:00
guilhem@mysql.com
c846e86d54 Including in enum_shutdown_level the 2 types of KILL of 5.0
(enum_shutdown_level is going to replace enum killed_state in 5.0).
2004-06-21 23:04:50 +02:00
guilhem@mysql.com
ff678fd8b7 Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-874
2004-06-21 16:37:33 +02:00
guilhem@mysql.com
99bc72d9ed changing order of enum_shutdown_level (easier; we can test if we should die with
"if (thd->killed > thd->killable)", if we simply do
thd->killed= level;
2004-06-21 16:36:28 +02:00
monty@mysql.com
d69a36d118 merge 2004-06-21 10:24:40 +03:00
guilhem@mysql.com
19dbf58eec API change: mysql_shutdown() now requires a 2nd argument, the shutdown level.
mysqld >=4.1.3 will however understand shutdown requests sent by clients <4.1.3.
And mysqld <4.1.3 will understand shutdown requests sent by clients >=4.1.3
(it will ignore the level). Those shutdown level are just PLACEHOLDERS now.
So this change is just to make the 4.1 API suitable before it is frozen. Later
we will actually implement the shutdown levels.
2004-06-18 23:50:04 +02:00
monty@mysql.com
b11d258835 Merge with 4.0.21 2004-06-18 04:38:58 +03:00
patg@krsna.patg.net
1dd8800278 mysql-copyright -> more fixes to deal with problems in removing temporary tar directory. Had to use cd $WD vs chdir($WD).
Servers.fgl -> made sure all charset files were accounted for (cp 1256 was missing)
2004-06-15 00:12:14 -07:00
wax@mysql.com
27f269c868 BUG#3439 problem with UDF functions 2004-06-08 12:35:22 +06:00
monty@mysql.com
42c35d4569 Added authentication code that was missed in merge
Added new windows configuration
2004-06-03 01:55:47 +03:00
monty@mysql.com
70c2256d2f Merge with 4.0 to get fixes for netware 2004-06-02 00:09:14 +03:00
miguel@light.
88647105ca VC++ project for to compile the udf_example.cc on
Windows
2004-05-30 04:11:19 -03:00
monty@mysql.com
e9b7e3baa8 merge with 4.0 to get fix to VC++ project files 2004-05-27 23:45:22 +03:00
monty@mysql.com
1aa3b2c79e removed reference to not existing library lib_release\dbug.lib 2004-05-27 22:53:36 +03:00
monty@mysql.com
5f0d4ee533 Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1 2004-05-27 11:28:05 +03:00
monty@mysql.com
c939f42fa5 Add back wrongly deleted file 2004-05-27 11:23:26 +03:00
monty@mysql.com
61a6557307 merge with 4.0 to get windows fixes 2004-05-27 00:30:28 +03:00
monty@mysql.com
dab0b7d415 VC++ portability fix 2004-05-26 21:45:58 +03:00
hf@deer.(none)
78f58ff384 Fix to make Windows compilation smoother 2004-05-26 21:40:27 +05:00
monty@mysql.com
390d9898f9 merge with 4.0 to get Netware patches and fixes for libmysqld.dll 2004-05-25 22:54:00 +03:00
hf@deer.(none)
32ce3dcb4b Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0
into deer.(none):/home/hf/work/mysql-4.0
2004-05-26 00:38:42 +05:00