Commit graph

53 commits

Author SHA1 Message Date
tsmith@quadxeon.mysql.com
672237f5b5 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
2007-05-21 20:51:31 +02:00
iggy@amd64.(none)
f9f69d35ea Merge amd64.(none):/src/bug24732/my50-bug24732
into  amd64.(none):/src/bug24732/my51-bug24732
2007-05-15 10:34:09 -04:00
iggy@amd64.(none)
3f4138a519 Bug#24732 Executables do not include Vista manifests
- Manifest requires four part application version.
- mysqld does not need requireAdministrator rights 
to run.
2007-05-15 10:30:11 -04:00
joerg@trift2.
f01b6de94f win/Makefile.am : No trailing blank after a continuation line marker ! 2007-05-04 21:28:04 +02:00
iggy@recycle.(none)
f4569bd50c Post Merge Correction 2007-04-23 21:47:21 -04:00
iggy@recycle.(none)
5cf930719f Bug#24732 Executables do not include Vista manifests
- Correct PushBuild failure.
2007-04-23 21:43:36 -04:00
iggy@recycle.(none)
13b54aa963 Bug#24732 Executables do not include Vista manifests
- Post merge cleanup.
2007-04-23 16:23:32 -04:00
iggy@recycle.(none)
658d2127e5 Merge recycle.(none):/src/bug24732/my50-bug24732
into  recycle.(none):/src/bug24732/my51-bug24732
2007-04-23 15:47:26 -04:00
iggy@recycle.(none)
7a358c4b5c Bug#24732 Executables do not include Vista manifests
- Added script to generate application specific manifest.
- Added new CMake MACRO to add customer build events which will first
generate a manifest and then embeds that manifest into an executable.
2007-04-23 15:41:24 -04:00
kent@mysql.com/kent-amd64.(none)
7a2e0ee7d7 configure.in:
Don't install ndb man pages if no ndb configured
config-win.h, CMakeLists.txt, README, configure.js:
  Removed Cybozu patches
2007-03-28 23:00:50 +02:00
monty@mysql.com/narttu.mysql.fi
1933603647 Removed not used define YY_MAGIC_BELOW
Made year 2000 handling more uniform
Removed year 2000 handling out from calc_days()
The above removes some bugs in date/datetimes with year between 0 and 200
Now we get a note when we insert a datetime value into a date column
For default values to CREATE, don't give errors for warning level NOTE
Fixed some compiler failures
Added library ws2_32 for windows compilation (needed if we want to compile with IOCP support)
Removed duplicate typedef TIME and replaced it with MYSQL_TIME

Better (more complete) fix for: Bug#21103 "DATE column not compared as DATE"
Fixed properly Bug#18997 "DATE_ADD and DATE_SUB perform year2K autoconversion magic on 4-digit year value"
Fixed Bug#23093 "Implicit conversion of 9912101 to date does not match cast(9912101 as date)"
2007-03-23 22:08:31 +02:00
msvensson@pilot.blaudden
dc7a024526 chmod u+x win/build-vs*.bat 2007-03-20 15:42:34 +01:00
monty@mysql.com/narttu.mysql.fi
cfef5d04b3 Remove compiler warnings 2007-02-27 19:31:49 +02:00
monty@mysql.com/narttu.mysql.fi
520d1b4144 Fixed compilations problems and warnings on windows 2007-02-23 22:48:15 +02:00
mmj@tiger.mmj.dk
49913f2a95 Merge mjorgensen@bk-internal.mysql.com:/home/bk/mysql-5.0-sage
into  tiger.mmj.dk:/Users/mmj/bktrees/mysql-5.0
2007-01-11 09:19:32 +01:00
tsmith@siva.hindu.god
bac65ee90a WL #3670: Compile-time option to remove GRANT-related startup options
- configure --disable-grant-options defines DISABLE_GRANT_OPTIONS
- configure.js/cmake also updated
- if DISABLE_GRANT_OPTIONS is defined, mysqld no longer recognizes:
  --bootstrap
  --init-file
  --skip-grant-tables

Scripts which rely on those three options are modified to check the environment for MYSQLD_BOOTSTRAP; it should be set to the full path of a mysqld which does handle those options.

For example:

$ export MYSQLD_BOOTSTRAP
$ MYSQLD_BOOTSTRAP=/path/to/full/MySQL/bin/mysqld
$ mysql_install_db
$ make test
2007-01-09 19:22:01 -07:00
kent@mysql.com/kent-amd64.(none)
67868597bb Many files:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
  Adjusted year(s) in copyright header 
  Added GPL copyright text
my_vle.h, rpl_utility.h, my_vle.c, base64-t.c, rpl_utility.cc:
  Changed copyright header formatting some
plugin_example.c, daemon_example.c:
  Added "Copyright (C) 2006 MySQL AB" to GPL header
2006-12-31 02:29:11 +01:00
kent@kent-amd64.(none)
58763e383e Merge mysql.com:/home/kent/bk/main/mysql-5.0
into  mysql.com:/home/kent/bk/main/mysql-5.1
2006-12-31 01:32:21 +01:00
kent@mysql.com/kent-amd64.(none)
6523aca729 my_strtoll10-x86.s:
Corrected spelling in copyright text
Makefile.am:
  Don't update the files from BitKeeper
Many files:
  Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
  Adjusted year(s) in copyright header 
Many files:
  Added GPL copyright text
Removed files:
  Docs/Support/colspec-fix.pl
  Docs/Support/docbook-fixup.pl
  Docs/Support/docbook-prefix.pl
  Docs/Support/docbook-split
  Docs/Support/make-docbook
  Docs/Support/make-makefile
  Docs/Support/test-make-manual
  Docs/Support/test-make-manual-de
  Docs/Support/xwf
2006-12-31 01:02:27 +01:00
kent@mysql.com/kent-amd64.(none)
1e3237fefa Many files:
Changed header to GPL version 2 only
2006-12-27 02:23:51 +01:00
kent@mysql.com/kent-amd64.(none)
226a5c833f Many files:
Changed header to GPL version 2 only
2006-12-23 20:17:15 +01:00
georg@lmy002.wdf.sap.corp
b17bbb9d3e Deleted old storage directories (introduced by a buggy 5.0 -> 5.1 merge).
Fix for win/Makefile.am
2006-09-21 08:57:47 +02:00
cmiller@zippy.cornsilk.net
a4d39c753a Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-09-05 17:44:08 -04:00
georg@lmy002.wdf.sap.corp
27636d9303 Additional files for cmake support 2006-08-31 19:52:42 +02:00
brian@zim.(none)
4d7f7fb878 Removed warnings for Windows build issues. Edited Windows README to remove reference to BDB. 2006-08-14 14:45:48 -07:00
elliot@mysql.com
10fd4b0f0f Fixing false alarm errors on windows build from a clean clone. 2006-06-15 22:46:52 -04:00
msvensson@shellback.
2ebdc8fdf8 Update readme file with instructions for VCExpress and Platform SDK 2006-04-10 18:44:55 +02:00
knielsen@mysql.com
1d40417bd7 Fix files not removed from make dist when deleted. 2006-03-28 17:34:35 +02:00
knielsen@mysql.com
3f2cc44b3d Clean up CMake configuration following review. 2006-03-28 13:49:29 +02:00
knielsen@mysql.com
cc57e4e01b Manual merge. 2006-03-28 10:07:03 +02:00
reggie@big_geek.
7f674749b8 removed handlerton-win.cc
now using CONFIGURE_FILE and INCLUDE to generate handlerton.cc and to set the definitions based on
the storage engines given on the command line
2006-03-27 15:19:56 -06:00
knielsen@mysql.com
bc6628d27f Some changes to make it possible to build for Windows with CMake from
a normal 'make dist' source .tar.gz.
2006-03-24 22:50:56 +01:00
knielsen@mysql.com
a3ad39cf66 Updated CMake stuff to handle the configurations needed for release
builds.
2006-03-23 16:34:52 +01:00
knielsen@mysql.com
24e29bf9d1 Fix Windows CMake dependency problem. 2006-03-16 13:30:59 +01:00
Reggie@xgeek.
2388e052ad Removed calls to deploy.bat from the build scripts since the cmake scripts are now
out in the target directories.
2006-03-15 10:33:16 -06:00
Reggie@xgeek.
11979eec94 Moved cmake scripts into the proper directories 2006-03-15 10:22:12 -06:00
Reggie@xgeek.
cb6b228bfb README:
new file
2006-03-15 05:20:27 -06:00
Reggie@xgeek.
605d6f0568 sql:
removed double entries for sql_yacc.* and added -p MYSQL define to call to bison
2006-03-15 02:16:16 -06:00
Reggie@xgeek.
36121ee7ba base:
Fixed problem where taocrypt was defined too early in the process
2006-03-13 05:17:23 -06:00
reggie@big_geek.
3bcc20950d Some cmake script fixes 2006-03-03 22:05:40 -06:00
knielsen@mysql.com
19c4ba39c4 Windows compile fixes. 2006-02-28 12:52:38 +01:00
knielsen@mysql.com
5174023ef1 Add CMake targets for missing stuff for release build. 2006-02-24 15:49:57 +01:00
knielsen@mysql.com
da6e7e172f Merge mysqldev@win2003-x86:my/mysql-5.1-new
into  mysql.com:/usr/local/mysql/tmpbuild-5.1
2006-02-22 10:19:45 +01:00
reggie@linux.site
cb10b77c31 BUG #15408 - Partitions: subpartition names are not unique 2006-02-21 17:40:07 -06:00
reggie@big_geek.
466a5bb399 BUG#15408: Partitions: subpartition names are not unique
Also, moved some of the code out of handler.h and into partition specific files for better 
separation.
Also, moved some of the C funcs into partition_info as formal C++ methods
2006-02-16 10:38:33 -06:00
knielsen@mysql.com
abcf6ccebb Changes to make testsuite run in CMake build tree. 2006-02-10 13:29:01 +01:00
knielsen@mysql.com
dc2f25a8f1 Explicit cscript.exe execution of .js files. 2006-02-10 11:22:20 +01:00
reggie@big_geek.
a76665698b added cmake file for instance manager 2006-02-08 23:57:30 -06:00
reggie@big_geek.
60af944d39 cmakefiles cleanup 2006-02-08 11:18:17 -06:00
reggie@big_geek.
2df6b1cb6c cmake corrections to fix compiling on visual 7.1 2006-02-07 09:43:42 -06:00