summaryrefslogtreecommitdiff
path: root/VC++Files
Commit message (Collapse)AuthorAgeFilesLines
* First step of implementation of WL#1518 "make bundled zlibunknown2004-07-211-16/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | usable for unix builds": zlib 1.2.1 imported BitKeeper/deleted/.del-Make_vms.com~95dd9cc7505c3153: Delete: zlib/Make_vms.com BitKeeper/deleted/.del-Makefile.riscos~f85c6493d3e51733: Delete: zlib/Makefile.riscos BitKeeper/deleted/.del-Makefile.pup~b0e9ed99224cc5f4: Delete: zlib/amiga/Makefile.pup BitKeeper/deleted/.del-Makefile.sas~be103e936c85b66a: Delete: zlib/amiga/Makefile.sas BitKeeper/deleted/.del-README.contrib~2924ba28ef1f9fab: Delete: zlib/contrib/README.contrib BitKeeper/deleted/.del-gvmat32.asm~edf721a2de30e964: Delete: zlib/contrib/asm386/gvmat32.asm BitKeeper/deleted/.del-visual-basic.txt~859fcbcb668ffbb3: Delete: zlib/contrib/visual-basic.txt BitKeeper/deleted/.del-gvmat32c.c~2e97d7d65dd59113: Delete: zlib/contrib/asm386/gvmat32c.c BitKeeper/deleted/.del-mkgvmt32.bat~5a92cf0febe3dc81: Delete: zlib/contrib/asm386/mkgvmt32.bat BitKeeper/deleted/.del-zlibvc.def~67961fa7815b9267: Delete: zlib/contrib/asm386/zlibvc.def BitKeeper/deleted/.del-zlibvc.dsp~a3323c77bcd12995: Delete: zlib/contrib/asm386/zlibvc.dsp BitKeeper/deleted/.del-match.s~51b8fef5136642ed: Delete: zlib/contrib/asm586/match.s BitKeeper/deleted/.del-readme.586~cb1bb7136b0803bb: Delete: zlib/contrib/asm586/readme.586 BitKeeper/deleted/.del-zlibvc.dsw~e3dca9d8f342e64e: Delete: zlib/contrib/asm386/zlibvc.dsw BitKeeper/deleted/.del-match.s~e4bbe1fa486d1c6c: Delete: zlib/contrib/asm686/match.s BitKeeper/deleted/.del-readme.686~98a220c13809fce5: Delete: zlib/contrib/asm686/readme.686 BitKeeper/deleted/.del-zlib.mak~70f7c5f6947fd807: Delete: zlib/contrib/delphi/zlib.mak BitKeeper/deleted/.del-d_zlib.bpr~cefb1beee520d6e8: Delete: zlib/contrib/delphi2/d_zlib.bpr BitKeeper/deleted/.del-d_zlib.cpp~62dff1931881afa6: Delete: zlib/contrib/delphi2/d_zlib.cpp BitKeeper/deleted/.del-zlibdef.pas~780244c8d12b6c53: Delete: zlib/contrib/delphi/zlibdef.pas BitKeeper/deleted/.del-readme.txt~8222e54ca00f2729: Delete: zlib/contrib/delphi2/readme.txt BitKeeper/deleted/.del-zlib.bpg~fbd9308275ad8e3: Delete: zlib/contrib/delphi2/zlib.bpg BitKeeper/deleted/.del-zlib.bpr~fe8bf5d1c4a2ce5a: Delete: zlib/contrib/delphi2/zlib.bpr BitKeeper/deleted/.del-zlib.cpp~bb0c3df062410f5c: Delete: zlib/contrib/delphi2/zlib.cpp BitKeeper/deleted/.del-zlib.pas~1d5285e2449b50a3: Delete: zlib/contrib/delphi2/zlib.pas BitKeeper/deleted/.del-zlib32.bpr~c2a9f0aa47a1d9ad: Delete: zlib/contrib/delphi2/zlib32.bpr BitKeeper/deleted/.del-test.cpp~4480297b204dc360: Delete: zlib/contrib/iostream/test.cpp BitKeeper/deleted/.del-zfstream.cpp~943ecbd558e86dde: Delete: zlib/contrib/iostream/zfstream.cpp BitKeeper/deleted/.del-zlib32.cpp~bbb4a200d2fe6497: Delete: zlib/contrib/delphi2/zlib32.cpp BitKeeper/deleted/.del-ChangeLogUnzip~a3ae0ba899cadd: Delete: zlib/contrib/minizip/ChangeLogUnzip BitKeeper/deleted/.del-zfstream.h~71ee057bdc6366ac: Delete: zlib/contrib/iostream/zfstream.h BitKeeper/deleted/.del-zstream.h~a6f6be5634962c81: Delete: zlib/contrib/iostream2/zstream.h BitKeeper/deleted/.del-zstream_test.cpp~e471b51e7fb553ec: Delete: zlib/contrib/iostream2/zstream_test.cpp BitKeeper/deleted/.del-miniunz.c~9da181975b3a48: Delete: zlib/contrib/minizip/miniunz.c BitKeeper/deleted/.del-minizip.c~4a49a0addb97272b: Delete: zlib/contrib/minizip/minizip.c BitKeeper/deleted/.del-readme.txt~174eb00680149f6b: Delete: zlib/contrib/minizip/readme.txt BitKeeper/deleted/.del-unzip.c~662c5ba4edbb3a19: Delete: zlib/contrib/minizip/unzip.c BitKeeper/deleted/.del-unzip.def~8a0ad6f745ee5cd4: Delete: zlib/contrib/minizip/unzip.def BitKeeper/deleted/.del-unzip.h~d5e800088a368c32: Delete: zlib/contrib/minizip/unzip.h BitKeeper/deleted/.del-zip.c~9750c19a123f3057: Delete: zlib/contrib/minizip/zip.c BitKeeper/deleted/.del-zip.def~4ffe888e9fd7b5aa: Delete: zlib/contrib/minizip/zip.def BitKeeper/deleted/.del-zip.h~4c72b8fcc492f055: Delete: zlib/contrib/minizip/zip.h BitKeeper/deleted/.del-zlibvc.def~dd272b3ed71647ba: Delete: zlib/contrib/minizip/zlibvc.def BitKeeper/deleted/.del-zlibvc.dsp~ad83fb048811e2d2: Delete: zlib/contrib/minizip/zlibvc.dsp BitKeeper/deleted/.del-zlibvc.dsw~c66b33a2d52f37c5: Delete: zlib/contrib/minizip/zlibvc.dsw BitKeeper/deleted/.del-makefile.w32~6507530fa1b017c: Delete: zlib/contrib/untgz/makefile.w32 BitKeeper/deleted/.del-untgz.c~4e8f1a3a2c145373: Delete: zlib/contrib/untgz/untgz.c BitKeeper/deleted/.del-Makefile.os2~8ab058477b24d1ff: Delete: zlib/os2/Makefile.os2 BitKeeper/deleted/.del-zlib.def~385b56ed82784ff3: Delete: zlib/os2/zlib.def BitKeeper/deleted/.del-Makefile.b32~10ffaac6cc41847a: Delete: zlib/msdos/Makefile.b32 BitKeeper/deleted/.del-Makefile.bor~121b2bc837b6367: Delete: zlib/msdos/Makefile.bor BitKeeper/deleted/.del-Makefile.dj2~a069623cad6ce7f4: Delete: zlib/msdos/Makefile.dj2 BitKeeper/deleted/.del-Makefile.emx~11a9e6c8a719ba60: Delete: zlib/msdos/Makefile.emx BitKeeper/deleted/.del-Makefile.msc~ba5ad7709ff22aab: Delete: zlib/msdos/Makefile.msc BitKeeper/deleted/.del-Makefile.tc~d1398368648e8836: Delete: zlib/msdos/Makefile.tc BitKeeper/deleted/.del-Makefile.w32~921a473e873d94d1: Delete: zlib/msdos/Makefile.w32 BitKeeper/deleted/.del-Makefile.wat~b2b51cbc2c2bc2f4: Delete: zlib/msdos/Makefile.wat BitKeeper/deleted/.del-zlib.def~189fba701e5e4b9c: Delete: zlib/msdos/zlib.def BitKeeper/deleted/.del-zlib.rc~e5ce22c7c915ec00: Delete: zlib/msdos/zlib.rc BitKeeper/deleted/.del-Makefile.emx~b5fa0633cbe6fe01: Delete: zlib/nt/Makefile.emx BitKeeper/deleted/.del-Makefile.gcc~7fcd3dd326341fa0: Delete: zlib/nt/Makefile.gcc BitKeeper/deleted/.del-Makefile.nt~9910c98f5da056de: Delete: zlib/nt/Makefile.nt BitKeeper/deleted/.del-zlib.dnt~8160c636eb3eeed7: Delete: zlib/nt/zlib.dnt BitKeeper/deleted/.del-zlib.dsp~a8abac2fb721276e: Delete: zlib/zlib.dsp BitKeeper/deleted/.del-zlib.html~2e74efd497dcd4d0: Delete: zlib/zlib.html BitKeeper/deleted/.del-minigzip.c~1f21a5863f457cb0: Delete: zlib/minigzip.c BitKeeper/deleted/.del-example.c~5ea43c929ccd2a4f: Delete: zlib/example.c BitKeeper/deleted/.del-descrip.mms~51cd5d1792d76b9c: Delete: zlib/descrip.mms BitKeeper/deleted/.del-infblock.h~7d4f40c3a1d4cdf8: Delete: zlib/infblock.h BitKeeper/deleted/.del-infblock.c~3c866934e0f44c43: Delete: zlib/infblock.c BitKeeper/deleted/.del-infutil.c~43d2340436244b52: Delete: zlib/infutil.c BitKeeper/deleted/.del-infutil.h~a6bd0dcbbdc187ac: Delete: zlib/infutil.h BitKeeper/deleted/.del-infcodes.h~c9f64a612c2cc56a: Delete: zlib/infcodes.h BitKeeper/deleted/.del-infcodes.c~7ed73df8a54d6d55: Delete: zlib/infcodes.c BitKeeper/deleted/.del-maketree.c~846b8b96ac6872d8: Delete: zlib/maketree.c VC++Files/zlib/zlib.dsp: Modified to suit zlib upgrade. mysys/my_crc32.c: Modified to suit zlib upgrade. zlib/ChangeLog: zlib 1.2.1 imported zlib/FAQ: zlib 1.2.1 imported zlib/INDEX: zlib 1.2.1 imported zlib/README: zlib 1.2.1 imported zlib/adler32.c: zlib 1.2.1 imported zlib/algorithm.txt: zlib 1.2.1 imported zlib/compress.c: zlib 1.2.1 imported zlib/crc32.c: zlib 1.2.1 imported zlib/deflate.c: zlib 1.2.1 imported zlib/deflate.h: zlib 1.2.1 imported zlib/gzio.c: zlib 1.2.1 imported zlib/inffast.c: zlib 1.2.1 imported zlib/inffast.h: zlib 1.2.1 imported zlib/inffixed.h: zlib 1.2.1 imported zlib/inflate.c: zlib 1.2.1 imported zlib/inftrees.c: zlib 1.2.1 imported zlib/inftrees.h: zlib 1.2.1 imported zlib/trees.c: zlib 1.2.1 imported zlib/uncompr.c: zlib 1.2.1 imported zlib/zconf.h: zlib 1.2.1 imported zlib/zlib.3: zlib 1.2.1 imported zlib/zlib.h: zlib 1.2.1 imported zlib/zutil.c: zlib 1.2.1 imported zlib/zutil.h: zlib 1.2.1 imported
* Added missing my_time.c file to mysqlclient projectunknown2004-06-281-0/+4
| | | | | | | | | | | | | | | Moved include <assert.h> to my_global.h VC++Files/client/mysqlclient.dsp: Added missing my_time.c file to mysqlclient project include/my_dbug.h: Moved include <assert.h> to my_global.h Removed NDEBUG as asserts should be indenpendent of if we are using DBUG or not include/my_global.h: Added assert.h as this is included in a lot of places sql/sql_table.cc: Initialize forgotten variable
* - removed the VC++Files/InstallShield directory per Montys requestunknown2004-06-25142-16165/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (moved it into another BK tree instead) BitKeeper/deleted/.del-Default.cdf~b6e79894b8a945c7: Delete: VC++Files/InstallShield/4.0.XX-classic/Component Definitions/Default.cdf BitKeeper/deleted/.del-Clients and Tools.fgl~2bbd9a12ecb9c515: Delete: VC++Files/InstallShield/4.0.XX-classic/File Groups/Clients and Tools.fgl BitKeeper/deleted/.del-Default.fdf~4953a6c975a34ea: Delete: VC++Files/InstallShield/4.0.XX-classic/File Groups/Default.fdf BitKeeper/deleted/.del-Default.fgl~833ee740287c6f79: Delete: VC++Files/InstallShield/4.0.XX-classic/Component Definitions/Default.fgl BitKeeper/deleted/.del-Development.fgl~ac14d1ef148e8a98: Delete: VC++Files/InstallShield/4.0.XX-classic/File Groups/Development.fgl BitKeeper/deleted/.del-Documentation.fgl~9b6931b2da84ca08: Delete: VC++Files/InstallShield/4.0.XX-classic/File Groups/Documentation.fgl BitKeeper/deleted/.del-Grant Tables.fgl~4e70fbbf80f7c08a: Delete: VC++Files/InstallShield/4.0.XX-classic/File Groups/Grant Tables.fgl BitKeeper/deleted/.del-4.0.XX-classic.ipr~300f789dff606645: Delete: VC++Files/InstallShield/4.0.XX-classic/4.0.XX-classic.ipr BitKeeper/deleted/.del-Default.rge~6749c71897080659: Delete: VC++Files/InstallShield/4.0.XX-classic/Registry Entries/Default.rge BitKeeper/deleted/.del-Servers.fgl~bfa9c448fb6677a8: Delete: VC++Files/InstallShield/4.0.XX-classic/File Groups/Servers.fgl BitKeeper/deleted/.del-Setup.dbg~fda938d4672b152f: Delete: VC++Files/InstallShield/4.0.XX-classic/Script Files/Setup.dbg BitKeeper/deleted/.del-Setup.ino~a4a8e4ff4ecb9208: Delete: VC++Files/InstallShield/4.0.XX-classic/Script Files/Setup.ino BitKeeper/deleted/.del-Setup.ins~fc1164dbe4fab00a: Delete: VC++Files/InstallShield/4.0.XX-classic/Script Files/Setup.ins BitKeeper/deleted/.del-Default.shl~53f36034d502f789: Delete: VC++Files/InstallShield/4.0.XX-classic/Shell Objects/Default.shl BitKeeper/deleted/.del-Setup.obs~2c6932da5ab5d1b1: Delete: VC++Files/InstallShield/4.0.XX-classic/Script Files/Setup.obs BitKeeper/deleted/.del-Setup.rul.old~ca45dde660f56d93: Delete: VC++Files/InstallShield/4.0.XX-classic/Script Files/Setup.rul.old BitKeeper/deleted/.del-infolist.txt~c2044c845067562f: Delete: VC++Files/InstallShield/4.0.XX-classic/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt BitKeeper/deleted/.del-setup.bmp~a94c8610ab87e06c: Delete: VC++Files/InstallShield/4.0.XX-classic/Setup Files/Uncompressed Files/Language Independent/OS Independent/setup.bmp BitKeeper/deleted/.del-setup.rul~b60736dcf4dd2009: Delete: VC++Files/InstallShield/4.0.XX-classic/Script Files/setup.rul BitKeeper/deleted/.del-Build.tsb~2115a92aa9011cc0: Delete: VC++Files/InstallShield/4.0.XX-classic/Text Substitutions/Build.tsb BitKeeper/deleted/.del-Clients and Tools.fgl~bf0f776883577f02: Delete: VC++Files/InstallShield/4.0.XX-gpl/File Groups/Clients and Tools.fgl BitKeeper/deleted/.del-Default.cdf~258c3c6c88ee9c1a: Delete: VC++Files/InstallShield/4.0.XX-gpl/Component Definitions/Default.cdf BitKeeper/deleted/.del-Default.fgl~239a3d5c75a17d6f: Delete: VC++Files/InstallShield/4.0.XX-gpl/Component Definitions/Default.fgl BitKeeper/deleted/.del-Default.shl~348d0fe86c90183f: Delete: VC++Files/InstallShield/4.0.XX-classic/String Tables/Default.shl BitKeeper/deleted/.del-Setup.tsb~53ee5a5dea9af84e: Delete: VC++Files/InstallShield/4.0.XX-classic/Text Substitutions/Setup.tsb BitKeeper/deleted/.del-value.shl~139b49dbd00913e5: Delete: VC++Files/InstallShield/4.0.XX-classic/String Tables/0009-English/value.shl BitKeeper/deleted/.del-Default.fdf~d6f33b9f4717e65c: Delete: VC++Files/InstallShield/4.0.XX-gpl/File Groups/Default.fdf BitKeeper/deleted/.del-Default.rge~c514c1e9be51be19: Delete: VC++Files/InstallShield/4.0.XX-gpl/Registry Entries/Default.rge BitKeeper/deleted/.del-Development.fgl~6392ce285e73f5fc: Delete: VC++Files/InstallShield/4.0.XX-gpl/File Groups/Development.fgl BitKeeper/deleted/.del-Documentation.fgl~e9b823d7a5c391c4: Delete: VC++Files/InstallShield/4.0.XX-gpl/File Groups/Documentation.fgl BitKeeper/deleted/.del-Grant Tables.fgl~959c4efc58bc0814: Delete: VC++Files/InstallShield/4.0.XX-gpl/File Groups/Grant Tables.fgl BitKeeper/deleted/.del-Servers.fgl~3a0649a7c6aadc83: Delete: VC++Files/InstallShield/4.0.XX-gpl/File Groups/Servers.fgl BitKeeper/deleted/.del-4.0.XX-gpl.ipr~f5909a9e9bd8094: Delete: VC++Files/InstallShield/4.0.XX-gpl/4.0.XX-gpl.ipr BitKeeper/deleted/.del-Setup.dbg~4ccb196b7d55031d: Delete: VC++Files/InstallShield/4.0.XX-gpl/Script Files/Setup.dbg BitKeeper/deleted/.del-Setup.ino~cdbb7d4bd8db360f: Delete: VC++Files/InstallShield/4.0.XX-gpl/Script Files/Setup.ino BitKeeper/deleted/.del-Setup.ins~83eb271b4c91a6ba: Delete: VC++Files/InstallShield/4.0.XX-gpl/Script Files/Setup.ins BitKeeper/deleted/.del-Setup.obs~d09ce92c1e558c6e: Delete: VC++Files/InstallShield/4.0.XX-gpl/Script Files/Setup.obs BitKeeper/deleted/.del-setup.rul~458000bbbdf1205e: Delete: VC++Files/InstallShield/4.0.XX-gpl/Script Files/setup.rul BitKeeper/deleted/.del-Build.tsb~aff1897b9edad5e2: Delete: VC++Files/InstallShield/4.0.XX-gpl/Text Substitutions/Build.tsb BitKeeper/deleted/.del-Default.shl~9063a06da7f33f3: Delete: VC++Files/InstallShield/4.0.XX-gpl/Shell Objects/Default.shl BitKeeper/deleted/.del-Default.shl~f3e5b5b97a54dee6: Delete: VC++Files/InstallShield/4.0.XX-gpl/String Tables/Default.shl BitKeeper/deleted/.del-Setup.rul.old~566b97cdedfedf29: Delete: VC++Files/InstallShield/4.0.XX-gpl/Script Files/Setup.rul.old BitKeeper/deleted/.del-infolist.txt~674d51f7b326518b: Delete: VC++Files/InstallShield/4.0.XX-gpl/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt BitKeeper/deleted/.del-setup.bmp~2e4262a3dfa4d35d: Delete: VC++Files/InstallShield/4.0.XX-gpl/Setup Files/Uncompressed Files/Language Independent/OS Independent/setup.bmp BitKeeper/deleted/.del-value.shl~926e24e7dc9e4e79: Delete: VC++Files/InstallShield/4.0.XX-gpl/String Tables/0009-English/value.shl BitKeeper/deleted/.del-Clients and Tools.fgl~14feac1c737b4104: Delete: VC++Files/InstallShield/4.0.XX-pro/File Groups/Clients and Tools.fgl BitKeeper/deleted/.del-Default.cdf~49cc1dec1e65c351: Delete: VC++Files/InstallShield/4.0.XX-pro/Component Definitions/Default.cdf BitKeeper/deleted/.del-Default.fdf~34238898d44490: Delete: VC++Files/InstallShield/4.0.XX-pro/File Groups/Default.fdf BitKeeper/deleted/.del-Default.fgl~aa69adc3d2c9d8e: Delete: VC++Files/InstallShield/4.0.XX-pro/Component Definitions/Default.fgl BitKeeper/deleted/.del-Development.fgl~d2fa1510dfb65f72: Delete: VC++Files/InstallShield/4.0.XX-pro/File Groups/Development.fgl BitKeeper/deleted/.del-Setup.tsb~72f2ecdeb296ae24: Delete: VC++Files/InstallShield/4.0.XX-gpl/Text Substitutions/Setup.tsb BitKeeper/deleted/.del-4.0.XX-pro.ipr~af4304a46891ea4f: Delete: VC++Files/InstallShield/4.0.XX-pro/4.0.XX-pro.ipr BitKeeper/deleted/.del-Default.rge~5b912d9ca1ac7bca: Delete: VC++Files/InstallShield/4.0.XX-pro/Registry Entries/Default.rge BitKeeper/deleted/.del-Documentation.fgl~77f5dc6633481f26: Delete: VC++Files/InstallShield/4.0.XX-pro/File Groups/Documentation.fgl BitKeeper/deleted/.del-Grant Tables.fgl~11f1ba8dd2959c0: Delete: VC++Files/InstallShield/4.0.XX-pro/File Groups/Grant Tables.fgl BitKeeper/deleted/.del-Servers.fgl~23867318e40f08ab: Delete: VC++Files/InstallShield/4.0.XX-pro/File Groups/Servers.fgl BitKeeper/deleted/.del-Setup.dbg~bc0ea214cda7c317: Delete: VC++Files/InstallShield/4.0.XX-pro/Script Files/Setup.dbg BitKeeper/deleted/.del-Setup.ino~428cd086735edb: Delete: VC++Files/InstallShield/4.0.XX-pro/Script Files/Setup.ino BitKeeper/deleted/.del-Setup.ins~cca39d17ddbeb287: Delete: VC++Files/InstallShield/4.0.XX-pro/Script Files/Setup.ins BitKeeper/deleted/.del-Setup.obs~5350fafc16a5f824: Delete: VC++Files/InstallShield/4.0.XX-pro/Script Files/Setup.obs BitKeeper/deleted/.del-Setup.rul.old~cda35eff331ba28: Delete: VC++Files/InstallShield/4.0.XX-pro/Script Files/Setup.rul.old BitKeeper/deleted/.del-infolist.txt~dac49e5a74c0bc49: Delete: VC++Files/InstallShield/4.0.XX-pro/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt BitKeeper/deleted/.del-setup.rul~7e5ceffa1633b324: Delete: VC++Files/InstallShield/4.0.XX-pro/Script Files/setup.rul BitKeeper/deleted/.del-Build.tsb~feef4151eb46197c: Delete: VC++Files/InstallShield/4.0.XX-pro/Text Substitutions/Build.tsb BitKeeper/deleted/.del-Default.shl~756db7a4f061ef5a: Delete: VC++Files/InstallShield/4.0.XX-pro/Shell Objects/Default.shl BitKeeper/deleted/.del-Default.shl~8442d4f931175ce4: Delete: VC++Files/InstallShield/4.0.XX-pro/String Tables/Default.shl BitKeeper/deleted/.del-Setup.tsb~f72bf507743c85a: Delete: VC++Files/InstallShield/4.0.XX-pro/Text Substitutions/Setup.tsb BitKeeper/deleted/.del-setup.bmp~12a72abe3e2d4504: Delete: VC++Files/InstallShield/4.0.XX-pro/Setup Files/Uncompressed Files/Language Independent/OS Independent/setup.bmp BitKeeper/deleted/.del-value.shl~79f89b845796b76f: Delete: VC++Files/InstallShield/4.0.XX-pro/String Tables/0009-English/value.shl BitKeeper/deleted/.del-Clients and Tools.fgl~105c8773e185916b: Delete: VC++Files/InstallShield/4.1.XX-classic/File Groups/Clients and Tools.fgl BitKeeper/deleted/.del-Default.cdf~21d59372769a480b: Delete: VC++Files/InstallShield/4.1.XX-classic/Component Definitions/Default.cdf BitKeeper/deleted/.del-Default.fdf~bae55f5ef75fb20: Delete: VC++Files/InstallShield/4.1.XX-classic/File Groups/Default.fdf BitKeeper/deleted/.del-Default.fgl~9ff0bebf571edd92: Delete: VC++Files/InstallShield/4.1.XX-classic/Component Definitions/Default.fgl BitKeeper/deleted/.del-Development.fgl~a4bf062672f150ab: Delete: VC++Files/InstallShield/4.1.XX-classic/File Groups/Development.fgl BitKeeper/deleted/.del-Documentation.fgl~93cd161ff57066b7: Delete: VC++Files/InstallShield/4.1.XX-classic/File Groups/Documentation.fgl BitKeeper/deleted/.del-Grant Tables.fgl~fad9ca55f7f65bd8: Delete: VC++Files/InstallShield/4.1.XX-classic/File Groups/Grant Tables.fgl BitKeeper/deleted/.del-4.1.XX-classic.ipr~ab85e2e8f9fba85f: Delete: VC++Files/InstallShield/4.1.XX-classic/4.1.XX-classic.ipr BitKeeper/deleted/.del-Servers.fgl~8660bf8e58bb8c46: Delete: VC++Files/InstallShield/4.1.XX-classic/File Groups/Servers.fgl BitKeeper/deleted/.del-Setup.dbg~c9d441dd9eab9848: Delete: VC++Files/InstallShield/4.1.XX-classic/Script Files/Setup.dbg BitKeeper/deleted/.del-Setup.ino~b11e1526c27a69ac: Delete: VC++Files/InstallShield/4.1.XX-classic/Script Files/Setup.ino BitKeeper/deleted/.del-Setup.ins~2aa4ceafa981c904: Delete: VC++Files/InstallShield/4.1.XX-classic/Script Files/Setup.ins BitKeeper/deleted/.del-Setup.obs~e616ceb8e2f038b: Delete: VC++Files/InstallShield/4.1.XX-classic/Script Files/Setup.obs BitKeeper/deleted/.del-Default.shl~a62e3dc1dbd86b19: Delete: VC++Files/InstallShield/4.1.XX-classic/Shell Objects/Default.shl BitKeeper/deleted/.del-Setup.rul.old~ebca9651260dc1e: Delete: VC++Files/InstallShield/4.1.XX-classic/Script Files/Setup.rul.old BitKeeper/deleted/.del-infolist.txt~7bf03fefb6c8d966: Delete: VC++Files/InstallShield/4.1.XX-classic/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt BitKeeper/deleted/.del-setup.bmp~fb43da1cf301abc0: Delete: VC++Files/InstallShield/4.1.XX-classic/Setup Files/Uncompressed Files/Language Independent/OS Independent/setup.bmp BitKeeper/deleted/.del-setup.rul~d4ed758f1dfd1aea: Delete: VC++Files/InstallShield/4.1.XX-classic/Script Files/setup.rul BitKeeper/deleted/.del-Build.tsb~a33d3beb4a03d10a: Delete: VC++Files/InstallShield/4.1.XX-classic/Text Substitutions/Build.tsb BitKeeper/deleted/.del-Clients and Tools.fgl~bfb5a5bca615aa7b: Delete: VC++Files/InstallShield/4.1.XX-gpl/File Groups/Clients and Tools.fgl BitKeeper/deleted/.del-Default.cdf~2acf82e34190f422: Delete: VC++Files/InstallShield/4.1.XX-gpl/Component Definitions/Default.cdf BitKeeper/deleted/.del-Default.fgl~2ca50676b41365a1: Delete: VC++Files/InstallShield/4.1.XX-gpl/Component Definitions/Default.fgl BitKeeper/deleted/.del-Default.shl~97ed43aad5287eb3: Delete: VC++Files/InstallShield/4.1.XX-classic/String Tables/Default.shl BitKeeper/deleted/.del-Setup.tsb~7f688fa1a1305779: Delete: VC++Files/InstallShield/4.1.XX-classic/Text Substitutions/Setup.tsb BitKeeper/deleted/.del-value.shl~91651502780ef02d: Delete: VC++Files/InstallShield/4.1.XX-classic/String Tables/0009-English/value.shl BitKeeper/deleted/.del-Default.fdf~ecc75c1fdcbe199: Delete: VC++Files/InstallShield/4.1.XX-gpl/File Groups/Default.fdf BitKeeper/deleted/.del-Default.rge~aa8ec10d20cc2ea6: Delete: VC++Files/InstallShield/4.1.XX-gpl/Registry Entries/Default.rge BitKeeper/deleted/.del-Development.fgl~4212e9d59f5dded6: Delete: VC++Files/InstallShield/4.1.XX-gpl/File Groups/Development.fgl BitKeeper/deleted/.del-Documentation.fgl~d3b32a44ccef30cf: Delete: VC++Files/InstallShield/4.1.XX-gpl/File Groups/Documentation.fgl BitKeeper/deleted/.del-Grant Tables.fgl~c4d1d3c2196ba489: Delete: VC++Files/InstallShield/4.1.XX-gpl/File Groups/Grant Tables.fgl BitKeeper/deleted/.del-Servers.fgl~3c93fd095c43d910: Delete: VC++Files/InstallShield/4.1.XX-gpl/File Groups/Servers.fgl BitKeeper/deleted/.del-4.1.XX-gpl.ipr~1ef9c8dd6b2c260a: Delete: VC++Files/InstallShield/4.1.XX-gpl/4.1.XX-gpl.ipr BitKeeper/deleted/.del-Setup.dbg~50904d3a4c3ce326: Delete: VC++Files/InstallShield/4.1.XX-gpl/Script Files/Setup.dbg BitKeeper/deleted/.del-Setup.ino~ec4ed614ca648f0c: Delete: VC++Files/InstallShield/4.1.XX-gpl/Script Files/Setup.ino BitKeeper/deleted/.del-Setup.ins~77fa34bac070a42f: Delete: VC++Files/InstallShield/4.1.XX-gpl/Script Files/Setup.ins BitKeeper/deleted/.del-Setup.obs~523a1459782433bf: Delete: VC++Files/InstallShield/4.1.XX-gpl/Script Files/Setup.obs BitKeeper/deleted/.del-Default.shl~fd30955919785bdc: Delete: VC++Files/InstallShield/4.1.XX-gpl/Shell Objects/Default.shl BitKeeper/deleted/.del-Setup.rul.old~248669ae84dc238b: Delete: VC++Files/InstallShield/4.1.XX-gpl/Script Files/Setup.rul.old BitKeeper/deleted/.del-infolist.txt~ea6e889113272829: Delete: VC++Files/InstallShield/4.1.XX-gpl/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt BitKeeper/deleted/.del-setup.bmp~f86070b6f6eae728: Delete: VC++Files/InstallShield/4.1.XX-gpl/Setup Files/Uncompressed Files/Language Independent/OS Independent/setup.bmp BitKeeper/deleted/.del-setup.rul~da60fc2eeb0a2b65: Delete: VC++Files/InstallShield/4.1.XX-gpl/Script Files/setup.rul BitKeeper/deleted/.del-value.shl~76bc7b15a3f85461: Delete: VC++Files/InstallShield/4.1.XX-gpl/String Tables/0009-English/value.shl BitKeeper/deleted/.del-Build.tsb~90ad5f0b7f8ac7d4: Delete: VC++Files/InstallShield/4.1.XX-gpl/Text Substitutions/Build.tsb BitKeeper/deleted/.del-Clients and Tools.fgl~1b0f3a93a76880b6: Delete: VC++Files/InstallShield/4.1.XX-pro/File Groups/Clients and Tools.fgl BitKeeper/deleted/.del-Default.cdf~7223553f7189e23c: Delete: VC++Files/InstallShield/4.1.XX-pro/Component Definitions/Default.cdf BitKeeper/deleted/.del-Default.fdf~5ceb672212520fa2: Delete: VC++Files/InstallShield/4.1.XX-pro/File Groups/Default.fdf BitKeeper/deleted/.del-Default.fgl~15216384a36ae045: Delete: VC++Files/InstallShield/4.1.XX-pro/Component Definitions/Default.fgl BitKeeper/deleted/.del-Default.shl~4c733f5e5a550568: Delete: VC++Files/InstallShield/4.1.XX-gpl/String Tables/Default.shl BitKeeper/deleted/.del-Development.fgl~ed903f815ee63bcb: Delete: VC++Files/InstallShield/4.1.XX-pro/File Groups/Development.fgl BitKeeper/deleted/.del-Setup.tsb~f8934afe5f574bdd: Delete: VC++Files/InstallShield/4.1.XX-gpl/Text Substitutions/Setup.tsb BitKeeper/deleted/.del-4.1.XX-pro.ipr~d3a8737b2c663290: Delete: VC++Files/InstallShield/4.1.XX-pro/4.1.XX-pro.ipr BitKeeper/deleted/.del-Default.rge~182983f3c2d89dd: Delete: VC++Files/InstallShield/4.1.XX-pro/Registry Entries/Default.rge BitKeeper/deleted/.del-Documentation.fgl~d9e4c6ada79d1bac: Delete: VC++Files/InstallShield/4.1.XX-pro/File Groups/Documentation.fgl BitKeeper/deleted/.del-Grant Tables.fgl~47169111ae90357a: Delete: VC++Files/InstallShield/4.1.XX-pro/File Groups/Grant Tables.fgl BitKeeper/deleted/.del-Servers.fgl~d05b8c0ae046fa41: Delete: VC++Files/InstallShield/4.1.XX-pro/File Groups/Servers.fgl BitKeeper/deleted/.del-Setup.dbg~212d5bfdb120acb6: Delete: VC++Files/InstallShield/4.1.XX-pro/Script Files/Setup.dbg BitKeeper/deleted/.del-Setup.ino~38f5a71ce8fcbe9: Delete: VC++Files/InstallShield/4.1.XX-pro/Script Files/Setup.ino BitKeeper/deleted/.del-Setup.ins~96063fd05aef5bdd: Delete: VC++Files/InstallShield/4.1.XX-pro/Script Files/Setup.ins BitKeeper/deleted/.del-Setup.obs~64620a6aef850ccd: Delete: VC++Files/InstallShield/4.1.XX-pro/Script Files/Setup.obs BitKeeper/deleted/.del-Setup.rul.old~9030a494640d6daa: Delete: VC++Files/InstallShield/4.1.XX-pro/Script Files/Setup.rul.old BitKeeper/deleted/.del-infolist.txt~c82d6e1266aed24c: Delete: VC++Files/InstallShield/4.1.XX-pro/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt BitKeeper/deleted/.del-setup.rul~d2b63cdb81ac804d: Delete: VC++Files/InstallShield/4.1.XX-pro/Script Files/setup.rul BitKeeper/deleted/.del-Build.tsb~3ad8803f587e4caa: Delete: VC++Files/InstallShield/4.1.XX-pro/Text Substitutions/Build.tsb BitKeeper/deleted/.del-Default.shl~49bfb4a6b7be3ae6: Delete: VC++Files/InstallShield/4.1.XX-pro/Shell Objects/Default.shl BitKeeper/deleted/.del-Default.shl~dfd37ac3a14f1c26: Delete: VC++Files/InstallShield/4.1.XX-pro/String Tables/Default.shl BitKeeper/deleted/.del-Setup.tsb~cbf0b4216f1fc07a: Delete: VC++Files/InstallShield/4.1.XX-pro/Text Substitutions/Setup.tsb BitKeeper/deleted/.del-setup.bmp~c14772c028869268: Delete: VC++Files/InstallShield/4.1.XX-pro/Setup Files/Uncompressed Files/Language Independent/OS Independent/setup.bmp BitKeeper/deleted/.del-value.shl~358b883967c1285b: Delete: VC++Files/InstallShield/4.1.XX-pro/String Tables/0009-English/value.shl BitKeeper/deleted/.del-Setup.dbg~cd24ecd832b2e2f: Delete: VC++Files/InstallShield/Script Files/Setup.dbg BitKeeper/deleted/.del-Setup.ino~b3932b7bb121e4ec: Delete: VC++Files/InstallShield/Script Files/Setup.ino BitKeeper/deleted/.del-Setup.ins~f3a796be563fc9bd: Delete: VC++Files/InstallShield/Script Files/Setup.ins BitKeeper/deleted/.del-Setup.obs~4fd60fb740a22ea: Delete: VC++Files/InstallShield/Script Files/Setup.obs BitKeeper/deleted/.del-Setup.rul~4b7637f769f52a25: Delete: VC++Files/InstallShield/Script Files/Setup.rul
* Many files:unknown2004-06-2568-0/+7790
| | | | | | | new file
* Merge mysql.com:/space/my/mysql-4.1unknown2004-06-243-0/+12
|\ | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.1-build VC++Files/libmysqld/libmysqld.dsp: Auto merged VC++Files/sql/mysqld.dsp: Auto merged
| * - Windows compile fix: added missing file tztime.cpp to the mysqldunknown2004-06-241-0/+4
| | | | | | | | | | | | | | | | project file VC++Files/sql/mysqld.dsp: - added missing file tztime.cpp to the mysqld project file
| * - Windows compile fix: added srv/srv0que.c to the innobase projectunknown2004-06-242-0/+8
| | | | | | | | | | | | | | | | | | | | file and sql/tztime.cpp to the libmysqld project file VC++Files/innobase/innobase.dsp: - added missing file srv/srv0que.c to the project file VC++Files/libmysqld/libmysqld.dsp: - added missing file sql/tztime.cpp to the project file
* | Fix for Bug#4030 "Client side conversion string -> date type doesn't unknown2004-06-243-0/+12
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. VC++Files/libmysql/libmysql.dsp: new file: my_time.c VC++Files/libmysqld/libmysqld.dsp: new file: my_time.c VC++Files/sql/mysqld.dsp: new file: my_time.c include/Makefile.am: - mysql_time.h added to the list of installed client library headers include/mysql.h: - declarations for MYSQL_TIME and enum_mysql_timestamp_type moved to mysql_time.h, which is in shared use of client library and mysys. libmysql/Makefile.shared: - my_time.lo added to the list of libmysql objects libmysql/libmysql.c: Fix for bug#4030 "Client side conversion string -> date type doesn't work (prepared statements)" and cleanup. - added case labels for TIME/DATE/DATETIME types to send_data_str - comments for read_binary_{date,time,datetime}, fetch_result_*, fetch_results. libmysqld/Makefile.am: - my_time.c added sql-common/Makefile.am: - my_time.c added to the list of files included into source distribution. sql/Makefile.am: my_time.c added to the list of mysqld sources. sql/field.cc: - TIMESTAMP_{TIME,DATE,DATETIME,...} renamed to MYSQL_TIMESTAMP_{TIME,DATETIME,DATE,...} sql/item.cc: - TIMESTAMP_{TIME,DATE,DATETIME,...} renamed to MYSQL_TIMESTAMP_{TIME,DATETIME,DATE,...} sql/item_timefunc.cc: - TIMESTAMP_{TIME,DATE,DATETIME,...} renamed to MYSQL_TIMESTAMP_{TIME,DATETIME,DATE,...} sql/mysql_priv.h: - added typedefs for TIME and timestamp_type - removed declarations for str_to_time and str_to_TIME (now this functions reside in mysys) sql/mysqld.cc: - log_10_int moved to mysys (it's used by str_to_TIME and str_to_time) - enum values TIMESTAMP_{TIME,DATE,DATETIME} were renamed to MYSQL_TIMESTAMP_{TIME,DATE,DATETIME} sql/set_var.cc: - TIMESTAMP_{TIME,DATE,DATETIME,...} renamed to MYSQL_TIMESTAMP_{TIME,DATETIME,DATE,...} sql/set_var.h: - fixed timestamp_type usage to be compatible with typedef. sql/sql_prepare.cc: - TIMESTAMP_{TIME,DATE,DATETIME} were renamed to MYSQL_TIMESTAMP_{TIME,DATE,DATETIME} - embedded library implementation of set_param_{time,date,datetime} is much simplier now, as MYSQL_TIME is the same as TIME. sql/sql_yacc.yy: - s/\<TIMESTAMP_/MYSQL_TIMESTAMP/gc sql/structs.h: - declarations for TIME and timestamp_type replaced with typedefs - str_to_datetime arguments moved to mysys headers sql/time.cc: - str_to_time and str_to_TIME moved to mysys - TIMESTAMP_{TIME,DATE,DATETIME,...} renamed to MYSQL_TIMESTAMP_{TIME,DATETIME,DATE,...} as these names are now exported to client. - str_to_TIME renamed to str_to_datetime to pair with str_to_time - str_to_TIME_with_warn renamed accordingly sql/tztime.cc: - TIMESTAMP_{TIME,DATE,DATETIME,...} renamed to MYSQL_TIMESTAMP_{TIME,DATETIME,DATE,...} tests/client_test.c: - a test case for Bug#4030 "Client side conversion string -> date type doesn't work (prepared statements)"
* Including in enum_shutdown_level the 2 types of KILL of 5.0unknown2004-06-211-1/+5
| | | | | | | | | | (enum_shutdown_level is going to replace enum killed_state in 5.0). VC++Files/winmysqladmin/mysql_com.h: putting in place the 2 types of KILL of 5.0 include/mysql_com.h: putting in place the two types of KILL of 5.0
* Merge gbichot@213.136.52.20:/home/bk/mysql-4.1unknown2004-06-211-5/+6
|\ | | | | | | | | | | | | into mysql.com:/home/mysql_src/mysql-4.1-874
| * changing order of enum_shutdown_level (easier; we can test if we should die withunknown2004-06-211-5/+6
| | | | | | | | | | | | | | | | "if (thd->killed > thd->killable)", if we simply do thd->killed= level;
* | mergeunknown2004-06-214-77/+158
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/ignore: auto-union BitKeeper/etc/logging_ok: auto-union Build-tools/Do-compile: Auto merged include/my_global.h: Auto merged innobase/row/row0ins.c: Auto merged libmysql/libmysql.c: Auto merged libmysqld/Makefile.am: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysql-test/r/func_time.result: Auto merged mysql-test/r/subselect.result: Auto merged scripts/mysql_install_db.sh: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/mysqld.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged innobase/fil/fil0fil.c: merge (Use heikki's code)
| * Merge with 4.0.21unknown2004-06-184-77/+158
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union Build-tools/mysql-copyright-2: Auto merged include/violite.h: Auto merged innobase/btr/btr0btr.c: Auto merged innobase/buf/buf0buf.c: Auto merged innobase/buf/buf0flu.c: Auto merged innobase/buf/buf0lru.c: Auto merged innobase/dict/dict0dict.c: Auto merged innobase/dict/dict0mem.c: Auto merged innobase/fsp/fsp0fsp.c: Auto merged innobase/fut/fut0lst.c: Auto merged innobase/ha/hash0hash.c: Auto merged innobase/include/buf0buf.ic: Auto merged innobase/include/buf0lru.h: Auto merged innobase/include/data0data.h: Auto merged innobase/include/dict0dict.h: Auto merged innobase/include/dict0mem.h: Auto merged innobase/include/fsp0fsp.h: Auto merged innobase/include/hash0hash.h: Auto merged innobase/include/lock0lock.h: Auto merged innobase/include/log0log.h: Auto merged innobase/include/log0log.ic: Auto merged innobase/include/mem0dbg.ic: Auto merged innobase/include/mem0pool.h: Auto merged innobase/include/mtr0mtr.h: Auto merged innobase/include/sync0rw.h: Auto merged innobase/include/sync0sync.h: Auto merged innobase/include/trx0roll.h: Auto merged innobase/include/trx0trx.h: Auto merged innobase/include/ut0mem.h: Auto merged innobase/lock/lock0lock.c: Auto merged innobase/log/log0log.c: Auto merged innobase/mem/mem0dbg.c: Auto merged innobase/mem/mem0pool.c: Auto merged innobase/mtr/mtr0mtr.c: Auto merged innobase/pars/lexyy.c: Auto merged innobase/pars/pars0opt.c: Auto merged innobase/que/que0que.c: Auto merged innobase/rem/rem0cmp.c: Auto merged innobase/row/row0ins.c: Auto merged innobase/row/row0mysql.c: Auto merged innobase/row/row0upd.c: Auto merged innobase/srv/srv0srv.c: Auto merged innobase/srv/srv0start.c: Auto merged innobase/sync/sync0rw.c: Auto merged innobase/sync/sync0sync.c: Auto merged innobase/thr/thr0loc.c: Auto merged innobase/trx/trx0purge.c: Auto merged innobase/trx/trx0roll.c: Auto merged innobase/trx/trx0sys.c: Auto merged innobase/trx/trx0trx.c: Auto merged innobase/usr/usr0sess.c: Auto merged innobase/ut/ut0mem.c: Auto merged mysql-test/r/func_if.result: Auto merged mysql-test/r/type_date.result: Auto merged mysql-test/t/type_date.test: Auto merged mysql-test/t/type_decimal.test: Auto merged mysys/mf_tempfile.c: Auto merged netware/BUILD/nwbootstrap: Auto merged netware/Makefile.am: Auto merged scripts/mysqld_safe.sh: Auto merged sql/item_cmpfunc.cc: Auto merged mysql-test/t/func_if.test: Auto merged sql/mysqld.cc: Auto merged sql/opt_range.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_parse.cc: Auto merged support-files/my-innodb-heavy-4G.cnf.sh: Auto merged Build-tools/Do-compile: Merge with 4.0 Build-tools/mysql-copyright: Merge with 4.0 client/mysqltest.c: Merge with 4.0 include/my_global.h: Merge with 4.0 innobase/buf/buf0rea.c: Merge with 4.0 innobase/data/data0type.c: Merge with 4.0 innobase/ibuf/ibuf0ibuf.c: Merge with 4.0 innobase/include/buf0buf.h: Merge with 4.0 innobase/include/data0type.h: Merge with 4.0 innobase/include/mem0mem.h: Merge with 4.0 innobase/include/mem0mem.ic: Merge with 4.0 innobase/log/log0recv.c: Merge with 4.0 libmysql/libmysql.c: Merge with 4.0 libmysqld/Makefile.am: Merge with 4.0 mysql-test/r/range.result: Merge with 4.0 mysql-test/r/type_decimal.result: Merge with 4.0 mysql-test/t/range.test: Merge with 4.0 netware/BUILD/mwenv: Merge with 4.0 netware/mysql_test_run.c: Merge with 4.0 scripts/mysql_install_db.sh: Merge with 4.0 sql/field.cc: Merge with 4.0 sql/field.h: Merge with 4.0 sql/item_cmpfunc.h: Merge with 4.0 support-files/my-huge.cnf.sh: Merge with 4.0 support-files/my-large.cnf.sh: Merge with 4.0 support-files/my-medium.cnf.sh: Merge with 4.0 support-files/my-small.cnf.sh: Merge with 4.0 support-files/mysql.spec.sh: Merge with 4.0
| | * mysql-copyright -> more fixes to deal with problems in removing temporary ↵unknown2004-06-153-72/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tar directory. Had to use `cd $WD` vs chdir($WD). Servers.fgl -> made sure all charset files were accounted for (cp 1256 was missing) Build-tools/mysql-copyright: more fixes to deal with problems in removing temporary tar directory. Had to use `cd $WD` vs chdir($WD). VC++Files/InstallShield/4.0.XX-classic/File Groups/Servers.fgl: made sure all charset files were accounted for (cp 1256 was missing) VC++Files/InstallShield/4.0.XX-gpl/File Groups/Servers.fgl: made sure all charset files were accounted for (cp 1256 was missing) VC++Files/InstallShield/4.0.XX-pro/File Groups/Servers.fgl: made sure all charset files were accounted for (cp 1256 was missing)
| | * BUG#3439 problem with UDF functionsunknown2004-06-081-5/+14
| | | | | | | | | | | | | | | VC++Files/examples/udf_example/udf_example.def: Add definitions of init and deinit functions
* | | API change: mysql_shutdown() now requires a 2nd argument, the shutdown level.unknown2004-06-183-2/+25
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. VC++Files/winmysqladmin/main.cpp: 2nd argument to mysql_shutdown() VC++Files/winmysqladmin/mysql.h: 2nd argument to mysql_shutdown() VC++Files/winmysqladmin/mysql_com.h: Several types of shutdown now. include/mysql_com.h: SHUTDOWN_DEFAULT is now 0 instead of 255, this saves one test in sql_parse.cc libmysql/libmysql.c: correcting mistake (how come that my tests still all worked with this? - should recheck, for curiosity). sql/sql_parse.cc: with SHUTDOWN_DEFAULT==0, no need for testing packet_length.
* | Added authentication code that was missed in mergeunknown2004-06-032-0/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Added new windows configuration VC++Files/client/mysqlclient.dsp: Added new configuration VC++Files/zlib/zlib.dsp: Added new configuration libmysql/libmysql.c: Moved check function from libmysql.c to client.c sql-common/client.c: Moved check function from libmysql.c to client.c
* | Merge with 4.0 to get fixes for netwareunknown2004-06-023-0/+149
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client/mysqltest.c: Auto merged include/mysql.h: Auto merged innobase/dict/dict0dict.c: Auto merged innobase/include/row0mysql.h: Auto merged innobase/lock/lock0lock.c: Auto merged innobase/row/row0mysql.c: Auto merged libmysql/libmysql.c: Auto merged mysql-test/README: Auto merged mysql-test/r/select_found.result: Auto merged mysql-test/t/select_found.test: Auto merged mysys/mf_wcomp.c: Auto merged mysys/mf_wfile.c: Auto merged sql/ha_innodb.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_base.cc: Auto merged configure.in: Get changes for netware include/my_sys.h: Use local file innobase/include/os0file.h: auto merge innobase/os/os0file.c: auto merge sql/mysqld.cc: auto merge sql/sql_acl.cc: indentation change sql/sql_acl.h: use local file sql/sql_class.h: auto merge sql/sql_db.cc: use local file sql/sql_parse.cc: use local file sql/sql_select.cc: Merge sql/sql_show.cc: use local file
| * VC++ project for to compile the udf_example.cc onunknown2004-05-303-0/+149
| | | | | | | | | | | | | | Windows
* | merge with 4.0 to get fix to VC++ project filesunknown2004-05-271-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | VC++Files/comp_err/comp_err.dsp: Auto merged VC++Files/sql/mysqld.dsp: Auto merged myisam/ft_boolean_search.c: Auto merged mysql-test/t/fulltext.test: Auto merged myisam/ft_parser.c: Keep old code mysql-test/r/fulltext.result: Remove duplicate test from 4.0
| * removed reference to not existing library lib_release\dbug.libunknown2004-05-272-2/+2
| |
* | Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1unknown2004-05-271-0/+4
|\ \ | |/ | | | | | | VC++Files/innobase/innobase.dsp: Auto merged
| * Add back wrongly deleted fileunknown2004-05-271-0/+4
| |
* | merge with 4.0 to get windows fixesunknown2004-05-272-10/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VC++Files/client/mysqlclient.dsp: Auto merged VC++Files/innobase/innobase.dsp: Auto merged include/mysql.h: Auto merged include/mysql_com.h: Auto merged innobase/include/log0log.h: Auto merged innobase/include/log0log.ic: Auto merged innobase/include/mtr0mtr.h: Auto merged innobase/log/log0log.c: Auto merged innobase/log/log0recv.c: Auto merged innobase/que/que0que.c: Auto merged libmysql/libmysql.c: Auto merged libmysql_r/Makefile.am: Auto merged sql/log_event.cc: Auto merged sql/mysqld.cc: Auto merged tools/mysqlmanager.c: Auto merged
| * VC++ portability fixunknown2004-05-262-6/+2
| | | | | | | | | | | | | | | | | | VC++Files/client/mysqlclient.dsp: Added missing /D MYSQL_CLIENT VC++Files/innobase/innobase.dsp: Remove not existing file sql/mysqld.cc: Fixed comment
| * Fix to make Windows compilation smootherunknown2004-05-261-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VC++Files/innobase/innobase.dsp: non-existent file removed client/mysql.cc: local opt_max_allowed_packet and opt_net_buffer_length introduced client/mysqldump.c: local opt_max_allowed_packet and opt_net_buffer_length introduced include/mysql.h: mysql_get_parameters() interface added #define max_allowed_packet added include/mysql_com.h: these should not be exported libmysql/libmysql.c: mysql_get_parameters implementations libmysql/libmysql.def: interface changed libmysql_r/Makefile.am: MYSQL_CLIENT define added libmysqld/lib_sql.cc: line moved to be above the '#include "mysql.cc"' libmysqld/libmysqld.c: mysql_get_parameters implementation (embedded) libmysqld/libmysqld.def: interface changed sql/log_event.cc: should be like that in this case tools/mysqlmanager.c: compiler warns on this line
* | merge with 4.0 to get Netware patches and fixes for libmysqld.dllunknown2004-05-258-8/+323
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | configure.in: Auto merged Build-tools/Do-compile: Auto merged client/mysql.cc: Auto merged client/mysqladmin.c: Auto merged client/mysqlcheck.c: Auto merged client/mysqldump.c: Auto merged client/mysqlimport.c: Auto merged client/mysqlshow.c: Auto merged client/mysqltest.c: Auto merged include/my_global.h: Auto merged include/thr_alarm.h: Auto merged innobase/include/trx0roll.h: Auto merged innobase/include/trx0trx.h: Auto merged innobase/que/que0que.c: Auto merged innobase/srv/srv0srv.c: Auto merged innobase/trx/trx0purge.c: Auto merged innobase/trx/trx0roll.c: Auto merged innobase/trx/trx0trx.c: Auto merged innobase/usr/usr0sess.c: Auto merged isam/isamchk.c: Auto merged myisam/myisam_ftdump.c: Auto merged myisam/myisamchk.c: Auto merged myisam/myisampack.c: Auto merged mysys/default.c: Auto merged mysys/my_getopt.c: Auto merged mysys/my_init.c: Auto merged mysys/my_pthread.c: Auto merged netware/Makefile.am: Auto merged netware/init_db.sql: Auto merged scripts/make_binary_distribution.sh: Auto merged tools/mysqlmanager.c: Auto merged VC++Files/dbug/dbug.dsp: Auto merged VC++Files/heap/heap.dsp: Auto merged VC++Files/isam/isam.dsp: Auto merged VC++Files/libmysql/libmysql.dsp: Auto merged VC++Files/myisam/myisam.dsp: Auto merged VC++Files/myisammrg/myisammrg.dsp: Auto merged VC++Files/mysys/mysys.dsp: Auto merged VC++Files/libmysqld/libmysqld.dsp: merge client/mysqlbinlog.cc: merge extra/perror.c: merge include/mysql_com.h: merge libmysqld/Makefile.am: merge netware/BUILD/mwenv: merge sql/mysqld.cc: merge
| * Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-05-268-8/+321
| |\ | | | | | | | | | | | | | | | | | | into deer.(none):/home/hf/work/mysql-4.0
| | * Proposed fix for bug #3818 (libmysqld.dll leads to program's crash)unknown2004-05-268-8/+321
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | configurations added to build the libraries with USE_TLS flag to be used for libmysqld VC++Files/dbug/dbug.dsp: TLS_DEBUG configuration added VC++Files/heap/heap.dsp: TLS and TLS_DEBUG configurations added VC++Files/isam/isam.dsp: TLS and TLS_DEBUG configurations added VC++Files/libmysql/libmysql.dsp: MYSQL_CLIENT define enabled VC++Files/libmysqld/libmysqld.dsp: using of _tls libraries added VC++Files/myisam/myisam.dsp: TLS and TLS_DEBUG configurations added VC++Files/myisammrg/myisammrg.dsp: TLS and TLS_DEBUG configurations added VC++Files/mysys/mysys.dsp: TLS and TLS_DEBUG configurations added include/mysql_com.h: __declspec(dllimport) seems to be necessary when one uses .dll on Windows
* | | Remove not needed sql_olap.cc from Makefile.amunknown2004-05-251-1/+1
| | | | | | | | | | | | | | | | | | | | | VC++Files/comp_err/comp_err.dsp: removed not needed library libmysqld/Makefile.am: Remove not needed sql_olap.cc
* | | Merge with 4.0 to get fixes for project filesunknown2004-05-254-16/+16
|\ \ \ | |/ /
| * | Fixed VC++ project filesunknown2004-05-252-7/+7
| |/ | | | | | | | | | | | | | | VC++Files/copy_mysql_files.bat: Added /Y to avoid questions Fixed wrong path for copying data files VC++Files/sql/mysqld.dsp: Added missing compiler option
| * Removed references to BDB and InnoDB from 'classic' releaseunknown2004-05-252-5/+5
| | | | | | | | | | | | | | VC++Files/mysqldemb/mysqldemb.dsp: Removed references to BDB and InnoDB from 'classic' VC++Files/sql/mysqld.dsp: Removed references to BDB and InnoDB from 'classic'
| * fixed typosunknown2004-05-253-5/+5
| |
* | Merge with 4.0 to get typo-fixunknown2004-05-2515-15/+15
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VC++Files/client/mysql.dsp: Auto merged VC++Files/client/mysqladmin.dsp: Auto merged VC++Files/client/mysqldump.dsp: Auto merged VC++Files/client/mysqlimport.dsp: Auto merged VC++Files/client/mysqlshow.dsp: Auto merged VC++Files/isamchk/isamchk.dsp: Auto merged VC++Files/my_print_defaults/my_print_defaults.dsp: Auto merged VC++Files/myisamchk/myisamchk.dsp: Auto merged VC++Files/myisamlog/myisamlog.dsp: Auto merged VC++Files/myisampack/myisampack.dsp: Auto merged VC++Files/mysqlbinlog/mysqlbinlog.dsp: Auto merged VC++Files/mysqlcheck/mysqlcheck.dsp: Auto merged VC++Files/pack_isam/pack_isam.dsp: Auto merged VC++Files/perror/perror.dsp: Auto merged VC++Files/replace/replace.dsp: Auto merged VC++Files/sql/mysqld.dsp: Auto merged VC++Files/libmysqld/libmysqld.dsp: Merge
| * Fixed typounknown2004-05-2517-17/+17
| |
* | Merge with 4.0 to get fixes for Windows project filesunknown2004-05-2543-41/+40
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VC++Files/client/mysql.dsp: Auto merged VC++Files/client/mysqladmin.dsp: Auto merged VC++Files/client/mysqldump.dsp: Auto merged VC++Files/mysql.dsw: Auto merged VC++Files/client/mysqlimport.dsp: Auto merged VC++Files/client/mysqlshow.dsp: Auto merged VC++Files/isamchk/isamchk.dsp: Auto merged VC++Files/libmysql/libmysql.dsp: Auto merged VC++Files/my_print_defaults/my_print_defaults.dsp: Auto merged VC++Files/myisamchk/myisamchk.dsp: Auto merged VC++Files/myisamlog/myisamlog.dsp: Auto merged VC++Files/myisampack/myisampack.dsp: Auto merged VC++Files/mysqlbinlog/mysqlbinlog.dsp: Auto merged VC++Files/mysqlcheck/mysqlcheck.dsp: Auto merged VC++Files/mysqlmanager/mysqlmanager.dsp: Auto merged VC++Files/mysys/mysys.dsp: Auto merged VC++Files/pack_isam/pack_isam.dsp: Auto merged VC++Files/perror/perror.dsp: Auto merged VC++Files/replace/replace.dsp: Auto merged include/my_global.h: Auto merged include/mysql_version.h.in: Auto merged innobase/eval/eval0eval.c: Auto merged innobase/sync/sync0arr.c: Auto merged libmysql/libmysql.c: Auto merged sql-bench/crash-me.sh: Auto merged sql-bench/limits/mysql-4.0.cfg: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/slave.cc: Auto merged
| * New MYSQL_SERVER_SUFFIX usage (for easier compilation)unknown2004-05-2542-48/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update of VC++ project files. VC++Files/mysqlmanager/childfrm.cpp: Rename: VC++Files/mysqlmanager/CHILDFRM.CPP -> VC++Files/mysqlmanager/childfrm.cpp VC++Files/mysqlmanager/childfrm.h: Rename: VC++Files/mysqlmanager/CHILDFRM.H -> VC++Files/mysqlmanager/childfrm.h VC++Files/mysqlmanager/mainfrm.cpp: Rename: VC++Files/mysqlmanager/MAINFRM.CPP -> VC++Files/mysqlmanager/mainfrm.cpp VC++Files/mysqlmanager/mainfrm.h: Rename: VC++Files/mysqlmanager/MAINFRM.H -> VC++Files/mysqlmanager/mainfrm.h VC++Files/mysqlmanager/mysqlmanager.dsp: Rename: VC++Files/mysqlmanager/MySqlManager.dsp -> VC++Files/mysqlmanager/mysqlmanager.dsp VC++Files/mysqlmanager/mysqlmanager.mak: Rename: VC++Files/mysqlmanager/MySqlManager.mak -> VC++Files/mysqlmanager/mysqlmanager.mak VC++Files/mysqlmanager/resource.h: Rename: VC++Files/mysqlmanager/RESOURCE.H -> VC++Files/mysqlmanager/resource.h VC++Files/mysqlmanager/stdafx.cpp: Rename: VC++Files/mysqlmanager/STDAFX.CPP -> VC++Files/mysqlmanager/stdafx.cpp VC++Files/mysqlmanager/stdafx.h: Rename: VC++Files/mysqlmanager/STDAFX.H -> VC++Files/mysqlmanager/stdafx.h VC++Files/mysqlmanager/toolsql.cpp: Rename: VC++Files/mysqlmanager/TOOLSQL.CPP -> VC++Files/mysqlmanager/toolsql.cpp VC++Files/mysqlmanager/toolsql.h: Rename: VC++Files/mysqlmanager/TOOLSQL.H -> VC++Files/mysqlmanager/toolsql.h VC++Files/mysqlmanager/RES/bitmap1.bmp: Rename: VC++Files/mysqlmanager/RES/BITMAP1.BMP -> VC++Files/mysqlmanager/RES/bitmap1.bmp VC++Files/mysqlmanager/RES/bitmap3.bmp: Rename: VC++Files/mysqlmanager/RES/BITMAP3.BMP -> VC++Files/mysqlmanager/RES/bitmap3.bmp VC++Files/mysqlmanager/RES/bmp00001.bmp: Rename: VC++Files/mysqlmanager/RES/BMP00001.BMP -> VC++Files/mysqlmanager/RES/bmp00001.bmp VC++Files/mysqlmanager/RES/bmp00002.bmp: Rename: VC++Files/mysqlmanager/RES/BMP00002.BMP -> VC++Files/mysqlmanager/RES/bmp00002.bmp VC++Files/mysqlmanager/RES/database.bmp: Rename: VC++Files/mysqlmanager/RES/DATABASE.BMP -> VC++Files/mysqlmanager/RES/database.bmp VC++Files/mysqlmanager/RES/fontd.bmp: Rename: VC++Files/mysqlmanager/RES/FONTD.BMP -> VC++Files/mysqlmanager/RES/fontd.bmp VC++Files/mysqlmanager/RES/fontu.bmp: Rename: VC++Files/mysqlmanager/RES/FONTU.BMP -> VC++Files/mysqlmanager/RES/fontu.bmp VC++Files/mysqlmanager/RES/query_ex.bmp: Rename: VC++Files/mysqlmanager/RES/QUERY_EX.BMP -> VC++Files/mysqlmanager/RES/query_ex.bmp VC++Files/mysqlmanager/RES/toolbar.bmp: Rename: VC++Files/mysqlmanager/RES/TOOLBAR.BMP -> VC++Files/mysqlmanager/RES/toolbar.bmp BUILD/compile-pentium-valgrind-max: Use MYSQL_SERVER_SUFFIX VC++Files/bdb/bdb.dsp: Use new version of MYSQL_SERVER_SUFFIX VC++Files/client/mysql.dsp: Use new version of MYSQL_SERVER_SUFFIX VC++Files/client/mysqladmin.dsp: Use new version of MYSQL_SERVER_SUFFIX VC++Files/client/mysqldump.dsp: Use new version of MYSQL_SERVER_SUFFIX VC++Files/client/mysqlimport.dsp: Use new version of MYSQL_SERVER_SUFFIX VC++Files/client/mysqlshow.dsp: Use new version of MYSQL_SERVER_SUFFIX VC++Files/copy_mysql_files.bat: Assume we are in correct directory VC++Files/innobase/innobase.dsp: Use new version of MYSQL_SERVER_SUFFIX Remove old files VC++Files/isamchk/isamchk.dsp: Use new version of MYSQL_SERVER_SUFFIX VC++Files/libmysqld/libmysqld.dsp: Use new version of MYSQL_SERVER_SUFFIX VC++Files/my_print_defaults/my_print_defaults.dsp: Use new version of MYSQL_SERVER_SUFFIX VC++Files/myisamchk/myisamchk.dsp: Use new version of MYSQL_SERVER_SUFFIX VC++Files/myisamlog/myisamlog.dsp: Use new version of MYSQL_SERVER_SUFFIX VC++Files/myisampack/myisampack.dsp: Use new version of MYSQL_SERVER_SUFFIX VC++Files/mysql.dsw: Use new version of MYSQL_SERVER_SUFFIX VC++Files/mysqlbinlog/mysqlbinlog.dsp: Use new version of MYSQL_SERVER_SUFFIX VC++Files/mysqlcheck/mysqlcheck.dsp: Use new version of MYSQL_SERVER_SUFFIX VC++Files/mysys/mysys.dsp: Use new version of MYSQL_SERVER_SUFFIX VC++Files/pack_isam/pack_isam.dsp: Use new version of MYSQL_SERVER_SUFFIX VC++Files/perror/perror.dsp: Use new version of MYSQL_SERVER_SUFFIX VC++Files/replace/replace.dsp: Use new version of MYSQL_SERVER_SUFFIX VC++Files/sql/mysqld.dsp: Use new version of MYSQL_SERVER_SUFFIX include/my_global.h: Added QUOTE and STRINGIFY include/mysql_version.h.in: New MYSQL_SERVER_SUFFIX handling innobase/eval/eval0eval.c: Fixed compiler warning libmysql/libmysql.c: Use STRINGIFY() sql/mysqld.cc: New MYSQL_SERVER_SUFFIX handling sql/mysqld_suffix.h: New MYSQL_SERVER_SUFFIX handling sql/set_var.cc: Use STRINGIFY() zlib/contrib/asm386/zlibvc.dsp: Updated for 4.0
| * Bug fixes:unknown2004-05-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Use %windir% instead of c:\winnt\ (Bug #3786) Fixed wrong foreign key test in crash-me (Bug #3740) VC++Files/libmysql/libmysql.dsp: Use %windir% instead of c:\winnt\ (Bug #3786) sql-bench/crash-me.sh: Fixed wrong foreign key test (Bug #3740) sql-bench/limits/mysql.cfg: Updated results
* | After merge fixesunknown2004-05-249-63/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove compiler warnings Update windows project files VC++Files/innobase/innobase.dsp: Update project files after merge VC++Files/libmysqld/examples/test_libmysqld.dsp: Update project files after merge VC++Files/libmysqld/libmysqld.dsp: Update project files after merge VC++Files/myisamchk/myisamchk.dsp: Update project files after merge VC++Files/myisamlog/myisamlog.dsp: Update project files after merge VC++Files/myisampack/myisampack.dsp: Update project files after merge VC++Files/mysqldemb/mysqldemb.dsp: Update project files after merge VC++Files/sql/mysqld.dsp: Update project files after merge VC++Files/strings/strings.dsp: Update project files after merge innobase/include/data0data.ic: Fix compiler warning innobase/include/mem0pool.h: Remove reference to not existing variable (after merge fix) innobase/srv/srv0srv.c: Remove reference to not existing variable (after merge fix) libmysqld/libmysqld.def: Add function used by test programs mysql-test/r/func_str.result: After merge fixes mysql-test/r/variables.result: After merge fixes mysql-test/t/variables.test: After merge fixes sql/discover.cc: Remove not used lable sql/opt_range.cc: Removed compiler warnings strings/ctype-tis620.c: After merge fixes
* | Merge with 4.0, mainly to get changes to windows project filesunknown2004-05-2046-228/+1407
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VC++Files/client/mysqladmin.dsp: Auto merged VC++Files/client/mysqldump.dsp: Auto merged VC++Files/client/mysqlimport.dsp: Auto merged VC++Files/client/mysqlshow.dsp: Auto merged VC++Files/dbug/dbug.dsp: Auto merged VC++Files/heap/heap.dsp: Auto merged VC++Files/innobase/innobase.dsp: Auto merged VC++Files/isam/isam.dsp: Auto merged VC++Files/isamchk/isamchk.dsp: Auto merged VC++Files/libmysql/libmysql.dsp: Auto merged VC++Files/mysql.dsw: Auto merged BitKeeper/deleted/.del-sync0ipm.ic~2024167f6418de39: Auto merged VC++Files/libmysqltest/myTest.dsp: Auto merged VC++Files/merge/merge.dsp: Auto merged VC++Files/my_print_defaults/my_print_defaults.dsp: Auto merged VC++Files/myisam/myisam.dsp: Auto merged VC++Files/myisam_ftdump/myisam_ftdump.dsp: Auto merged VC++Files/myisammrg/myisammrg.dsp: Auto merged VC++Files/mysqlbinlog/mysqlbinlog.dsp: Auto merged VC++Files/mysqlcheck/mysqlcheck.dsp: Auto merged VC++Files/mysqlshutdown/mysqlshutdown.dsp: Auto merged VC++Files/mysqlwatch/mysqlwatch.dsp: Auto merged VC++Files/mysys/mysys.dsp: Auto merged VC++Files/pack_isam/pack_isam.dsp: Auto merged VC++Files/perror/perror.dsp: Auto merged VC++Files/regex/regex.dsp: Auto merged VC++Files/replace/replace.dsp: Auto merged VC++Files/test1/test1.dsp: Auto merged VC++Files/thr_test/thr_test.dsp: Auto merged VC++Files/vio/vio.dsp: Auto merged VC++Files/zlib/zlib.dsp: Auto merged extra/my_print_defaults.c: Auto merged include/m_string.h: Auto merged include/mysql_embed.h: Auto merged include/mysql_version.h.in: Auto merged innobase/dict/dict0dict.c: Auto merged innobase/mem/mem0pool.c: Auto merged innobase/srv/srv0srv.c: Auto merged innobase/trx/trx0sys.c: Auto merged myisam/myisam_ftdump.c: Auto merged VC++Files/bdb/bdb.dsp: Merge with 4.0 VC++Files/client/mysql.dsp: Merge with 4.0 VC++Files/client/mysqlclient.dsp: Merge with 4.0 VC++Files/comp_err/comp_err.dsp: Merge with 4.0 VC++Files/libmysqld/examples/test_libmysqld.dsp: Merge with 4.0 VC++Files/libmysqld/libmysqld.dsp: Merge with 4.0 VC++Files/myisamchk/myisamchk.dsp: Merge with 4.0 VC++Files/myisamlog/myisamlog.dsp: Merge with 4.0 VC++Files/myisampack/myisampack.dsp: Merge with 4.0 VC++Files/mysqldemb/mysqldemb.dsp: Merge with 4.0 VC++Files/mysqlserver/mysqlserver.dsp: Merge with 4.0 VC++Files/sql/mysqld.dsp: Merge with 4.0 VC++Files/strings/strings.dsp: Merge with 4.0 libmysqld/lib_sql.cc: Merge with 4.0 libmysqld/libmysqld.def: Merge with 4.0 mysql-test/r/func_str.result: Merge with 4.0 mysql-test/r/handler.result: auto mysql-test/r/variables.result: Merge with 4.0 mysql-test/t/func_str.test: auto mysql-test/t/handler.test: auto mysql-test/t/variables.test: Merge with 4.0 scripts/make_win_src_distribution.sh: auto scripts/mysql_install_db.sh: Use original file sql/Makefile.am: Merge with 4.0 sql/ha_innodb.cc: auto sql/item_strfunc.cc: Merge with 4.0 sql/mysql_priv.h: auto sql/mysqld.cc: Merge with 4.0 sql/set_var.cc: Merge with 4.0 sql/slave.cc: auto sql/sql_class.h: auto sql/sql_handler.cc: Merge with 4.0 strings/ctype-tis620.c: Merge with 4.0
| * Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'unknown2004-05-1946-275/+1445
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensured that all projects compile Removed compiler warnings Better setting of server_version variable. Fix that make_win_src_distribution creates the privilege tables. VC++Files/bdb/bdb.dsp: Small, automatic changes VC++Files/client/mysql.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/client/mysqladmin.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/client/mysqlclient.dsp: Removed files that should only be used with mysql command line client VC++Files/client/mysqldump.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/client/mysqlimport.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/client/mysqlshow.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/comp_err/comp_err.dsp: Automatic changes VC++Files/dbug/dbug.dsp: Automatic changes VC++Files/heap/heap.dsp: automatic changes VC++Files/innobase/innobase.dsp: Automatic changes VC++Files/isam/isam.dsp: Automatic changes VC++Files/isamchk/isamchk.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/libmysql/libmysql.dsp: Automatic changes VC++Files/libmysqld/examples/test_libmysqld.dsp: Add missing files VC++Files/libmysqld/libmysqld.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/libmysqltest/myTest.dsp: Automatic changes VC++Files/merge/merge.dsp: Automatic changes VC++Files/my_print_defaults/my_print_defaults.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/myisam/myisam.dsp: automatic changes VC++Files/myisam_ftdump/myisam_ftdump.dsp: automatic changes VC++Files/myisamchk/myisamchk.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/myisamlog/myisamlog.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/myisammrg/myisammrg.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/myisampack/myisampack.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/mysql.dsw: Automatic changes VC++Files/mysqlbinlog/mysqlbinlog.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/mysqlcheck/mysqlcheck.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/mysqldemb/mysqldemb.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/mysqlserver/mysqlserver.dsp: Automatic changes VC++Files/mysqlshutdown/mysqlshutdown.dsp: Automatic changes VC++Files/mysqlwatch/mysqlwatch.dsp: Automatic changes VC++Files/mysys/mysys.dsp: Automatic changes VC++Files/pack_isam/pack_isam.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/perror/perror.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/regex/regex.dsp: Automatic changes VC++Files/replace/replace.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/sql/mysqld.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/strings/strings.dsp: Removed duplicate code for strnlen VC++Files/test1/test1.dsp: Automatic changes VC++Files/thr_test/thr_test.dsp: Automatic changes VC++Files/vio/vio.dsp: Automatic changes VC++Files/zlib/contrib/asm386/zlibvc.dsp: Automatic changes VC++Files/zlib/zlib.dsp: Automatic changes extra/my_print_defaults.c: Fixed bug in --verbose include/m_string.h: Portability fix include/mysql_embed.h: Better setting of server_version variable include/mysql_version.h.in: Better license text handling innobase/pars/pars0lex.l: Remove compiler warnings innobase/trx/trx0sys.c: Remove compiler warnings libmysqld/lib_sql.cc: Better setting of server_version variable libmysqld/libmysqld.def: Add functions needed for mysql command line client myisam/myisam_ftdump.c: Remove compiler warnings mysys/sha1.c: Remove compiler warnings scripts/make_win_src_distribution.sh: Safety fix scripts/mysql_install_db.sh: Backport from 4.1 to allow make_win_src_distribution create the privilege tables sql/Makefile.am: Add new file mysqld_suffix.h Remove not used file sql_olap.h sql/ha_innodb.cc: Remove not used variable sql/mysqld.cc: Better setting of server_version variable sql/set_var.cc: Fixed bug when showing lower_case_file_system strings/ctype-tis620.c: Remove compiler warnings
* | - removed duplicate file ..\strings\strxnmov.c from the mysqlclient.dspunknown2004-05-061-4/+0
| | | | | | | | | | | | | | | | | | that was accidently added by the last BK auto merge VC++Files/client/mysqlclient.dsp: - removed duplicate file ..\strings\strxnmov.c that was added by the last auto merge
* | - Windows compile fixes: added some missing files to the Windows Projectunknown2004-05-065-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | files, fixed linking of myisam_ftdump VC++Files/client/mysqlclient.dsp: - added strings/ctype.uca.c VC++Files/libmysql/libmysql.dsp: - added strings/ctype.uca.c VC++Files/myisam_ftdump/myisam_ftdump.dsp: - added zlib to the link line VC++Files/sql/mysqld.dsp: - added discover.cpp VC++Files/strings/strings.dsp: - added strings/ctype.uca.c
* | Merge with 4.0.19unknown2004-05-052-152/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union VC++Files/client/mysqlclient.dsp: Auto merged VC++Files/mysql.dsw: Auto merged extra/perror.c: Auto merged extra/replace.c: Auto merged innobase/configure.in: Auto merged innobase/include/lock0lock.h: Auto merged innobase/include/row0mysql.h: Auto merged innobase/include/sync0sync.h: Auto merged innobase/lock/lock0lock.c: Auto merged ltmain.sh: Auto merged BitKeeper/deleted/.del-libmysqld.def~8edf7b8780ce943c: Auto merged innobase/os/os0file.c: Auto merged innobase/pars/lexyy.c: Auto merged innobase/row/row0mysql.c: Auto merged innobase/srv/srv0srv.c: Auto merged innobase/srv/srv0start.c: Auto merged innobase/sync/sync0arr.c: Auto merged innobase/sync/sync0sync.c: Auto merged innobase/trx/trx0trx.c: Auto merged mysql-test/r/alias.result: Auto merged mysql-test/t/system_mysql_db_fix-master.opt: Auto merged mysql-test/r/func_time.result: Automatic merge mysql-test/r/innodb.result: Automatic merge mysql-test/t/alias.test: Automatic merge mysql-test/t/create.test: Automatic merge mysql-test/t/func_time.test: Automatic merge sql/ha_innodb.cc: Automatic merge sql/mysql_priv.h: Automatic merge mysql-test/r/rpl_multi_update.result: Automatic merge mysql-test/t/rpl_error_ignored_table.test: Automatic merge mysql-test/t/rpl_multi_update.test: Automatic merge sql/slave.h: Automatic merge sql/sql_base.cc: Automatic merge sql/sql_db.cc: Automatic merge sql/sql_insert.cc: Automatic merge sql/structs.h: Automatic merge sql/table.cc: Automatic merge strings/longlong2str-x86.s: Automatic merge strings/strings-x86.s: Automatic merge support-files/my-medium.cnf.sh: Automatic merge
| * Fixes to Windows project files for 4.0.19unknown2004-05-042-11/+18
| | | | | | | | | | | | | | VC++Files/client/mysqlclient.dsp: Add strxnmov to project files VC++Files/mysql.dsw: Add dependency to prevent compile error
| * Fixed compiler error in slave.cc on some platforms.unknown2004-04-211-65/+0
| | | | | | | | | | | | | | BitKeeper/deleted/.del-libmysqld.def~8edf7b8780ce943c: Delete: VC++Files/libmysqld/libmysqld.def sql/slave.cc: Fix to modify tmp_buf instead of buf, which is a const char *
* | Merge with 4.0unknown2004-03-253-8/+8
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union BitKeeper/deleted/.del-libmysql.def~f5dffcb3ed925d28: Auto merged BitKeeper/deleted/.del-post-incoming~9f2168f531f09f3b: Auto merged BitKeeper/deleted/.del-post-outgoing~1dd3d8f0f6e8f3cd: Auto merged VC++Files/innobase/innobase.dsp: Auto merged VC++Files/strings/MASM6x/strings.dsp: Auto merged client/mysqldump.c: Auto merged innobase/sync/sync0sync.c: Auto merged myisam/mi_check.c: Auto merged mysql-test/t/union.test: Auto merged mysql-test/t/update.test: Auto merged mysys/mf_iocache.c: Auto merged sql/nt_servc.cc: Auto merged mysql-test/r/system_mysql_db.result: Auto merged sql/sql_base.cc: Auto merged
| * Changes to project files precipitated from 4.1 test builds.unknown2004-03-224-102/+8
| | | | | | | | | | | | | | | | | | | | | | BitKeeper/deleted/.del-libmysql.def~f5dffcb3ed925d28: Delete: VC++Files/libmysql/libmysql.def VC++Files/innobase/innobase.dsp: 'com' module no longer exists. VC++Files/strings/MASM6x/strings.dsp: Add strnlen VC++Files/strings/strings.dsp: Add strnlen
* | Merge gweir@build.mysql.com:/home/bk/mysql-4.1unknown2004-03-222-4/+8
|\ \ | | | | | | | | | | | | | | | | | | | | | into greg-laptop.:C:/cygwin/bk/mysql-4.1 sql/item.h: Auto merged
View Lorry Controller Status