mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 13:32:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
41466 commits 2784 branches 343 tags 1.6 GiB
Commit graph

459 commits

Author SHA1 Message Date
joerg@mysql.com
b2f6d4f574 Merge mysql.com:/M50/merge-5.0 into mysql.com:/M51/merge-5.1 2006-01-16 20:21:42 +01:00
joerg@mysql.com
5da306b57e extra/comp_err.c : Fix a merge error. 2006-01-16 17:23:39 +01:00
joerg@mysql.com
fa91e05bf5 Manual merge of the fix for bug#16106. 
Currently failing tests (for me) in non-debug build:
blackhole fulltext fulltext_cache fulltext_left_join fulltext_multi
 2006-01-16 16:48:05 +01:00
joerg@mysql.com
1155bf20d9 Merge mysql.com:/M40/push-4.0 into mysql.com:/M41/merge-4.1 2006-01-13 17:45:01 +01:00
joerg@mysql.com
9d4562e5fe extra/comp_err.c + scripts/mysqld_multi.sh : 
Copyright string fixes (bug#16106)
 2006-01-13 16:25:20 +01:00
dlenev@mysql.com
15c86158a7 Merge mysql.com:/home/dlenev/src/mysql-5.0-bg14836 
into  mysql.com:/home/dlenev/src/mysql-5.1-merges
 2005-12-24 20:13:51 +03:00
msvensson@neptunus.(none)
e50c0fdc3b Bug #15772 Aborted YaSSL connections force threads into busyloops 
- Report error when there is nothing to read after wait.
 2005-12-20 00:47:50 +01:00
hartmut@mysql.com
7244dfd8d2 Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/hartmut/projects/mysql/dev/5.1
 2005-12-19 08:33:27 +01:00
jonas@perch.ndb.mysql.com
b5b0a3d6ac Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
 2005-12-14 14:03:50 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
2ed8d82c61 Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
 2005-12-14 09:42:05 +02:00
knielsen@production.mysql.com
1b846dc2fd Merge knielsen@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  production.mysql.com:/usersnfs/knielsen/mysql-5.0
 2005-12-14 08:24:57 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
834940e9be Patch for Bug#13640 2005-12-14 03:08:59 +02:00
knielsen@mysql.com
bd9b379227 Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/usr/local/mysql/mysql-5.0
 2005-12-08 21:02:11 +01:00
knielsen@mysql.com
51cd5da314 Fix QNX and IRIX compilation 2005-12-08 15:13:25 +01:00
hartmut@mysql.com
e5b7e447ed Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/hartmut/projects/mysql/dev/5.1
 2005-12-08 10:24:30 +01:00
pem@mysql.com
8e0e421943 Merge mysql.com:/usr/home/pem/bug14834/mysql-5.0 
into  mysql.com:/usr/home/pem/mysql-5.1-new
 2005-12-07 15:17:18 +01:00
hartmut@mysql.com
4c20a4da25 fixed "perror --ndb" for 5.1 (bug #15486) 2005-12-05 14:17:53 +01:00
serg@serg.mylan
3595c81bc8 compatibility fix for yassl 2005-12-02 21:40:50 +01:00
jimw@mysql.com
0538845963 Merge mysql.com:/home/jimw/my/mysql-5.1-release 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2005-11-30 13:51:23 -08:00
pem@mysql.com
b2a9961abf Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/mysql-5.1-new
 2005-11-28 20:14:12 +01:00
kent@mysql.com
6430a4901e Makefile.am: 
Distribute "handlerton-win.cc"
mysqld.cc:
  Corrected word lenght for some innobase
  configuration variables
Makefile.am:
  Added Visual Studio 7 project file to EXTRA_DIST
ha_partition.cc, sql_partition.cc:
  Changed include to use "..." for Windows
handlerton-win.cc:
  Handle engine include/exclude with defines for Windows
  new file
 2005-11-26 05:35:37 +01:00
msvensson@devsrv-b.mysql.com
3879027ade Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/bug15168/my50-bug15168 
into  devsrv-b.mysql.com:/space/magnus/mysql-5.0
 2005-11-25 17:01:59 +01:00
msvensson@devsrv-b.mysql.com
8f457699a8 Bug #15168 yassl failure on amd64 
- Use libtool to build libraries
 2005-11-24 17:17:36 +01:00
anozdrin@mysql.com
1d1fd3d459 Make it buildable with -ansi flag on some platforms. 2005-11-24 18:42:39 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
5273071265 Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
 2005-11-23 14:57:00 +02:00
kent@mysql.com
bcdd552d6e Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-distcheck
 2005-11-19 11:20:52 +01:00
guilhem@mysql.com
2f95fc2701 Merge mysql.com:/home/mysql_src/mysql-5.0 
into  mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0 (not all files are good,
I'll fix; I'll ask some devs to check their part)
 2005-11-18 16:38:01 +01:00
kent@mysql.com
b269caecb1 Additional "make distcheck" changes specific to 5.0 2005-11-09 11:56:04 +02:00
acurtis@poseidon.ndb.mysql.com
c01a3b5e5f Make storage engines "pluggable", handlerton work 2005-11-07 16:25:06 +01:00
monty@mysql.com
a6f5375cb0 Merge mysql.com:/home/my/mysql-5.0 
into  mysql.com:/home/my/mysql-5.1
 2005-11-05 01:32:55 +02:00
msvensson@neptunus.(none)
b34fbd8629 Bug#13957 yassl: opensrv6c compile failure 
- Added some ifdefs and turn off auto template instantiation, use explicit template instantiation
 2005-11-03 10:37:49 +01:00
msvensson@neptunus.(none)
3c696721f6 Update after merge, include libtaoint-integer.o into libtaocrypt.a 2005-10-28 17:12:30 +02:00
msvensson@neptunus.(none)
68fa03258a Merge neptunus.(none):/home/msvensson/mysql/bug12985/my50-bug12985 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-10-28 11:45:30 +02:00
msvensson@neptunus.(none)
bb571de368 BUG#12985 Do-mysqlclient-test: Can't find -lyassl when linking 
- Remove yassl_libsfrom CLIENT_LIBS var
 - Add yassl_libs to libmysql and libmysqld
 2005-10-27 21:48:43 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
ea26f5e2ea Had to revert change, because it breaks compilation for 
Netware. Hartmut informed about this.
 2005-10-14 09:32:30 +03:00
tomas@poseidon.ndb.mysql.com
e72fdf5619 Merge 2005-10-07 01:12:46 +02:00
tomas@poseidon.ndb.mysql.com
99d1d975d0 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2005-10-06 10:59:58 +02:00
tomas@poseidon.ndb.mysql.com
620b7bafb0 Merge 2005-10-06 10:54:07 +02:00
jimw@mysql.com
83330214e2 Merge mysql.com:/home/jimw/my/mysql-5.0-13071 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-10-05 10:07:04 -07:00
jimw@mysql.com
6b476cf5cd Fail when two messages exist for the same language for an error in the 
server error messages file. (Bug #13071)
 2005-10-05 10:06:31 -07:00
tomas@poseidon.ndb.mysql.com
b5ac7f31e5 added structured ndbd exit codes 2005-10-03 20:04:44 +02:00
hartmut@mysql.com
16cd4bd332 Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/hartmut/projects/mysql/dev/5.0
 2005-09-30 18:16:57 +02:00
hartmut@mysql.com
95525485b2 CygWin build fix (Bug #13640) 2005-09-30 18:06:38 +02:00
msvensson@neptunus.(none)
39dde505fd Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/bug13163/my50-bug13163
 2005-09-27 16:36:14 +02:00
msvensson@neptunus.(none)
e0b4e273f6 Bug #13163 yassl: aix52 crash with ssl turned on 
- It seems like malloc(0) returns a null pointer on aix52
 2005-09-27 16:34:49 +02:00
msvensson@neptunus.(none)
fa554264ff Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/bug13476/my50-bug13476
 2005-09-27 11:34:11 +02:00
msvensson@neptunus.(none)
69eac2e42d Bug #13476 yassl: openserv compile failure 2005-09-26 12:25:08 +02:00
msvensson@neptunus.(none)
306dcf0620 Merge neptunus.(none):/home/msvensson/mysql/bug13164/my50-bug13164 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-09-22 12:29:11 +02:00
msvensson@neptunus.(none)
139601f997 Bug #13164 yassl: "SSL connection error" on several platforms 
- it's a requirement fo yaSSL that either /dev/urandom or /dev/random is available on the target system.
 - Added a fix that tries to open /dev/random if /dev/urandom is not available.
 2005-09-22 12:19:09 +02:00
msvensson@neptunus.(none)
7acbf0d24f Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/bug13029/my51-bug13029
 2005-09-15 11:26:37 +02:00
msvensson@neptunus.(none)
a9b3767874 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/bug13029/my50-bug13029
 2005-09-15 11:24:28 +02:00
msvensson@neptunus.(none)
b92a933dfe Merge neptunus.(none):/home/msvensson/mysql/bug13029/my50-bug13029 
into  neptunus.(none):/home/msvensson/mysql/bug13029/my51-bug13029
 2005-09-15 09:47:30 +02:00
msvensson@neptunus.(none)
872d85dabe Bug #13029 YaSSL not compatibile w/ JSSE (Java implementation of SSL) 
-Applied patch from Todd
 2005-09-15 09:46:10 +02:00
msvensson@neptunus.(none)
dc0e1d83e1 Merge neptunus.(none):/home/msvensson/mysql/bug12526/my50-bug12526 
into  neptunus.(none):/home/msvensson/mysql/bug12526/my51-bug12526
 2005-09-15 09:09:10 +02:00
msvensson@neptunus.(none)
95197f39a2 Bug #12526 yassl: Crashes in "integer.cpp" 
- Disable inlining in integer.cp for sparc solaris Cun C++ 5.6
 2005-09-15 08:59:29 +02:00
msvensson@neptunus.(none)
c4f5e7f1f9 Cset exclude: msvensson@neptunus.(none)|ChangeSet|20050913150614|63378 2005-09-14 10:34:45 +02:00
msvensson@neptunus.(none)
fb63290635 Merge neptunus.(none):/home/msvensson/mysql/bug10713_new/my50-bug10713_new 
into  neptunus.(none):/home/msvensson/mysql/bug10713_new/my51-bug10713_new
 2005-09-14 09:43:56 +02:00
msvensson@neptunus.(none)
6d99d18876 Merge bk-internal:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/bug12526/my50-bug12526
 2005-09-13 18:01:27 +02:00
msvensson@neptunus.(none)
47a5c451ca BUG#12526 yassl: Crashes in "integer.cpp" 
- Avoid problem with  "Sun C++ 5.6 2004/07/15"
 2005-09-13 17:06:14 +02:00
ndbdev@dl145c.mysql.com
4e8595862d Merge 2005-09-13 05:33:11 +02:00
kent@mysql.com
1313a30c83 innochecksum.c: 
Changed from C++ comments to C comments
  Did some adaption to MySQL Coding Style
 2005-09-13 02:31:47 +02:00
tulin@dl145c.mysql.com
a29132cdc5 Merge 2005-09-12 14:22:06 +02:00
jan@hundin.mysql.fi
cbc0f19566 Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  hundin.mysql.fi:/home/jan/mysql-5.0
 2005-09-12 10:57:42 +03:00
paul@snake-hub.snake.net
c6501cfc0c Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1
 2005-09-10 12:54:59 -05:00
paul@snake-hub.snake.net
7331526a62 comp_err.c: 
Fix some comments.
 2005-09-10 12:31:57 -05:00
ndbdev@dl145b.mysql.com
46cc62e216 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-09-09 15:26:47 +02:00
jan@hundin.mysql.fi
2097f1427b Fix compiler errors on InnoDB offline checksum tool innochecksum. 2005-09-08 15:47:21 +03:00
msvensson@neptunus.(none)
815941fd46 Merge bk-internal:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/bug12717/my50-bug12717
 2005-09-08 12:18:09 +02:00
msvensson@neptunus.(none)
60e3c3be0b yassl fix for ia64 + icc 2005-09-08 11:36:12 +02:00
msvensson@neptunus.(none)
ae180d81d6 Bug #12987 yassl: Compilation of integer.cpp fails on OS X Tiger 2005-09-07 17:04:22 +02:00
msvensson@neptunus.(none)
1cc371d0e9 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/bug12715/my50-bug12715
 2005-09-06 21:12:09 +02:00
msvensson@neptunus.(none)
84a1c7562a Merge neptunus.(none):/home/msvensson/mysql/bug12715/my50-bug12715 
into  neptunus.(none):/home/msvensson/mysql/bug12715/my51-bug12715
 2005-09-06 20:30:47 +02:00
msvensson@neptunus.(none)
ab4f766c32 Bug #12715 Compilation of yassl/algebra.ccp fails on buildqnx2 
- Workaround
 2005-09-06 18:57:21 +02:00
msvensson@neptunus.(none)
3e2f0d16b4 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2005-09-06 18:08:21 +02:00
serg@serg.mylan
db877e9bf1 comment out innochecksum until fixed 2005-09-06 09:36:32 +02:00
ndbdev@dl145c.mysql.com
f40c1576b0 Merge 2005-09-06 09:20:15 +02:00
jan@hundin.mysql.fi
fc4fea68ad Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  hundin.mysql.fi:/home/jan/new/mysql-5.0
 2005-09-05 08:35:58 +03:00
msvensson@neptunus.(none)
345dfef41f Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2005-09-02 08:59:59 +02:00
msvensson@neptunus.(none)
68778715ae Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/bug11286/my50-bug11286
 2005-09-01 14:47:06 +02:00
msvensson@neptunus.(none)
e6b282d9f8 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/bug12526/my50-bug12526
 2005-09-01 14:09:23 +02:00
msvensson@neptunus.(none)
6fb7881f06 Bug #12717 yassl: Crashes in "integer.cpp" when compiled with icc 
- Temporary fix, disable x86 assembler.
 2005-09-01 14:07:45 +02:00
msvensson@neptunus.(none)
8c0f7f82d9 Bug #11286 yassl incompatible with "load data infile" 
- Make sure that mysqltest always uses ssl when connecting to the server.
 - Pass a i32-bit int variable as argument to FIONREAD ioctl.
 2005-09-01 11:46:43 +02:00
ndbdev@dl145b.mysql.com
583979d949 merge 2005-08-31 20:45:48 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
7b7188cea6 Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
 2005-08-26 15:56:52 +03:00
pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se
02056f8e3a Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1
 2005-08-25 13:11:38 -04:00
jani@a193-229-222-105.elisa-laajakaista.fi
e767eb330e Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
 2005-08-25 12:08:26 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
fe977b0cd0 Several fixes for Netware. 2005-08-24 22:03:34 +03:00
jimw@mysql.com
d1db84639c Build YASSL libraries with libtool so correct PIC settings are used 
automatically. (Bug #12324)
 2005-08-11 12:26:17 -07:00
pappa@c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se
69acde961f Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1
 2005-08-05 18:01:34 -04:00
reggie@fedora.(none)
5a0250c349 Conversions of dsp files to vcproj. These files are compatible with 
Visual Studio 2003.  I have not yet changed the windows build scripts
to use these.
 2005-08-02 18:47:02 -05:00
georg@lmy002.wdf.sap.corp
f09d06102a fix for bug#5650 ('replace' does not follow symlinks) 
fix now checks if the original (from) file is a symlink and uses the
link name. This prevents creation of a new file (and loss of symlink)
when renaming the tempfile.
 2005-07-26 07:41:32 +02:00
jan@hundin.mysql.fi
5607acde81 Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  hundin.mysql.fi:/home/jan/new/mysql-5.0
 2005-07-20 13:47:05 +03:00
tulin@dl145b.mysql.com
bf6e3f9aa8 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-07-20 07:53:10 +02:00
tulin@dl145b.mysql.com
a6c21a0791 merge 2005-07-19 21:56:10 +02:00
jimw@mysql.com
80c1c6b33f Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-07-19 11:05:49 -07:00
tulin@dl145b.mysql.com
1c2cfd80a2 perror.c: 
BUG#11999, incorrect --help on perror with ndb
 2005-07-19 11:52:24 +02:00
jan@hundin.mysql.fi
6aeca28a96 Added InnoDB offline file checksum utility. 2005-07-19 10:03:19 +03:00
monty@mishka.local
2278e0319c Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mishka.local:/home/my/mysql-5.0
 2005-07-18 19:03:01 +03:00
monty@mishka.local
78c65b5adc Cleanups during review 
Changed defaults option --instance to --defaults-group-suffix
Changed option handling to allow --defaults-file, --defaults-extra-file and --defaults-group-suffix to be given in any order
Changed MYSQL_INSTANCE to MYSQL_GROUP_SUFFIX
mysql_print_defaults now understands --defaults-group-suffix
Remove usage of my_tempnam() (not safe function)
if( -> if ( and while( to while (
 2005-07-18 15:33:18 +03:00
tomas@poseidon.ndb.mysql.com
674b6bb151 Merge 2005-07-12 20:01:22 +02:00
kent@mysql.com
8e3b393d5c Merge 2005-07-06 00:06:11 +02:00
kent@mysql.com
a7be42163a Makefile.am: 
Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
 2005-07-05 23:24:48 +02:00
svoj@mysql.com
9359cec4ca WL#2286 - Compile MySQL w/YASSL support 
Merge with latest yaSSL. It includes fix for bigendian/littleendian
problem (fixes func_encrypt test failure). Our trees are in sync now.
 2005-07-01 20:00:59 +05:00
georg@lmy002.wdf.sap.corp
813b077105 Fix for Intel compiler 2005-06-27 09:36:43 +02:00
svoj@mysql.com
b720c6e535 WL#2286 - Compile MySQL w/YASSL support 
Fix for "multiple definition of __cxa_pure_virtual" link failure
when compiling with icc.
 2005-06-23 16:04:10 +05:00
ndbdev@dl145b.mysql.com
dcef1c7532 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-06-22 19:07:29 +02:00
svoj@mysql.com
74373e7d54 WL#2286 - Compile MySQL w/YASSL support 
Fix GCC 4.0 link failure.
Better CXX_VERSION guessing.
 2005-06-22 14:08:28 +05:00
tulin@dl145b.mysql.com
b217fc0692 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-06-20 12:42:39 +02:00
svoj@mysql.com
7660f609e6 WL#2286 - Compile MySQL w/YASSL support 
Fix for yaSSL link failures with Forte Developer 7, MIPSpro Compilers, Compaq C++.
These compilers have problem with implicit template instantiation in archives
(libyassl.a, libtaocrypt.a). Instantiate templates explicitly.

Fix for yaSSL link failure on powermacg5 (gcc 3.3). When -O3 is specified gcc inlines
__cxa_pure_virtual. This is wrong behavior, __cxa_pure_virtual must never be inlined.
 2005-06-19 21:46:44 +05:00
ndbdev@dl145b.mysql.com
558488d592 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-06-16 19:10:32 +02:00
konstantin@mysql.com
7602e1591f Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/opt/local/work/mysql-5.0-root
 2005-06-16 16:36:53 +04:00
ndbdev@dl145b.mysql.com
b6eebbecc2 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-06-16 13:42:15 +02:00
svoj@mysql.com
841b232d44 WL#2286 - Compile MySQL w/YASSL support 
Merge with latest yaSSL.
 2005-06-16 16:35:09 +05:00
konstantin@mysql.com
aa5c66323d Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/opt/local/work/mysql-5.0-root
 2005-06-16 13:56:10 +04:00
ndbdev@dl145b.mysql.com
be7c5c1900 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-06-15 20:07:31 +02:00
konstantin@mysql.com
a13597604b gcc 2.96 fixes (workarounds for compiler bugs in namespace handling) 2005-06-15 02:57:23 +04:00
svoj@mysql.com
8c9b9d0bc1 WL#2286 - Compile MySQL w/YASSL support 
Fix for link failures on boxes with non-gnu compiler.
    Fix for compilation failure on hpux11.
 2005-06-15 01:39:58 +05:00
joreland@mysql.com
84a04b4a9d merge 2005-06-13 14:09:09 +02:00
svoj@mysql.com
35dad7352d Merge 2005-06-11 15:48:11 +05:00
svoj@mysql.com
75c13cbe0b Merge with latest yaSSL. 
Fixes IsAligned yaSSL assertion failure.
 2005-06-10 20:09:41 +05:00
serg@serg.mylan
81d070fdcc Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-06-09 15:53:35 +02:00
serg@serg.mylan
62c2a636d6 sql/mysql_priv.h 
comments,
    unused flag OPTION_INTERNAL_SUBTRANSACTIONS removed
    SELECT_ALL flag moved into this free slot.
 2005-06-09 15:48:57 +02:00
svoj@mysql.com
4d85249734 WL#2286 - Compile MySQL w/YASSL support 
Fix for yaSSL compilation failure on ia64 platform.
 2005-06-08 23:58:34 +05:00
ndbdev@dl145b.mysql.com
161a58ab4b merge 2005-06-06 23:39:19 +02:00
konstantin@mysql.com
95da927081 Portability fix, mySTL on Sun Forte 5.4. 2005-06-06 15:52:45 +04:00
konstantin@mysql.com
b6e895ad9f Futher fixes for aCC. 2005-06-06 14:52:43 +04:00
konstantin@mysql.com
dcae1d174f Futher yaSSL portability fixes: hp3750 (HP aCC + HPUX). 2005-06-06 14:43:21 +04:00
konstantin@mysql.com
b24269103c Fix yaSSL compilation failure on ds20 (DEC CXX + Linux) 2005-06-06 14:28:00 +04:00
tomas@poseidon.ndb.mysql.com
f6d51a44f4 Merge 2005-06-04 19:26:35 +02:00
serg@serg.mylan
91f6308d00 yassl template instantiation - don't do too much 
mysys/my_access.c: remove incorrect fix
comments
 2005-06-03 13:43:17 +02:00
svoj@mysql.com
681b974b1e WL#2286 - Compile MySQL w/YASSL support 
Compilation errors fixes.
 2005-06-03 00:28:18 +05:00
serg@serg.mylan
4df47b9e4a cleanup 2005-06-02 15:45:20 +02:00
tomas@poseidon.ndb.mysql.com
c82cb2c26a Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1
 2005-06-01 17:41:36 +02:00
svoj@mysql.com
01f4036989 WL#2286 - Compile MySQL w/YASSL support 
merge with latest yaSSL, move templates instantiation into separate file where it is possible
 2005-05-31 20:56:32 +05:00
tomas@poseidon.ndb.mysql.com
5088b28d09 Merge 2005-05-31 14:37:47 +02:00
svoj@mysql.com
b763679f1c WL#2286 - Compile MySQL w/YASSL support 
Merge with latest yaSSL, fix compilation error for SSE2 processors.
 2005-05-25 19:11:36 +05:00
svoj@mysql.com
1dabee5aad Upgrade yaSSL to 0.9.9. 2005-05-25 00:15:06 +05:00
kent@mysql.com
99f9ff6755 misc.hpp: 
Check _LONGLONG_TYPE as well, to define 'word64', to make it
  work on Solaris 10 x86_64.
  Can't assume all x86_64 share the same assembler syntax.
  For now disabled assembler for x86_64 and Solaris.
 2005-05-22 04:19:54 +02:00
konstantin@mysql.com
b6c93da24c yaSSL fixes for Sun Forte 7 2005-05-20 22:52:41 +04:00
svoj@mysql.com
5ce823ec28 Merge mysqldev@production.mysql.com:my/mysql-5.0-build 
into mysql.com:/home/svoj/devel/mysql/mysql-5.0-build
 2005-05-20 19:42:37 +05:00
svoj@mysql.com
3efa46046d Merge mysql.com:/home/svoj/devel/mysql/mysql-5.0-build 
into mysql.com:/mnt/archive/svoj/mysql/mysql-5.1
 2005-05-20 19:36:19 +05:00
konstantin@mysql.com
d8859b2ee2 Fixes for numerous compatibility problems in yaSSL. 2005-05-20 18:35:49 +04:00
svoj@mysql.com
7c375cab5a WL#2286 - Compile MySQL w/YASSL support 
Portability fixes
 2005-05-20 19:32:51 +05:00
ndbdev@dl145c.mysql.com
f0f8b0a97b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-05-20 06:25:02 +02:00
svoj@mysql.com
36641e3bb7 WL#2286 - Compile MySQL w/YASSL support 
compilation fixes
 2005-05-20 01:44:05 +05:00
tulin@dl145c.mysql.com
03590c20bd merge 2005-05-18 22:26:23 +02:00
monty@mysql.com
db40af2a6f Fix warnings from icc 
Added BUILD scripts for icc
Fixed (one time) memory leak in grant handling
 2005-05-18 19:00:21 +03:00
lars@mysql.com
e76c641190 Merge mysql.com:/home/bk/mysql-5.0 into mysql.com:/home/bk/mysql-5.1 2005-05-09 11:45:59 +02:00
svoj@mysql.com
a7f3aa042b Fix FC3 yaSSL compilation problem. 
This fix is about WL#2286 - Compile MySQL w/YASSL support
 2005-05-06 20:54:38 +05:00
lars@mysql.com
05cbb3962c Manual merge 5.0->5.1 2005-05-06 15:04:07 +02:00
serg@sergbook.mylan
83dfc216a7 gcc 2.92 compatibility 2005-05-05 16:21:17 +02:00
tomas@poseidon.ndb.mysql.com
4f1e27ed00 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-clean
 2005-05-03 00:10:52 +02:00
jimw@mysql.com
2d44d93ce6 Merge mysql.com:/home/jimw/my/mysql-5.0-5354 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-05-02 10:20:22 -07:00
jimw@mysql.com
7bab94f36b Clean up merge from 4.1 2005-05-02 10:19:37 -07:00
serg@serg.mylan
9c332d8d2a yassl changeset 2: 
remove FIX_GCC_LINKING_PROBLEM and -DDEFINE_CXA_PURE_VIRTUAL
  replace echo in configure.in with AC_MSG_WARN/AC_MSG_ERROR
  don't set -DUSE_MYSYS_NEW for gcc 2.95
  set $USE_MYSYS_NEW even if CXX is g++
  yassl bugfixes
  instantiate all yassl templates explicitly
 2005-04-30 19:48:45 +02:00
jimw@mysql.com
2441da8cd9 Add default configuration files to my_print_defaults usage, and 
add handling of configuration file in the Windows shared system
directory. (Bug #5354)
 2005-04-28 12:11:48 -07:00
svoj@mysql.com
c1fd1d6a5b WL#2286 Compile MySQL w/YASSL support 
yaSSL-0.9.7 library bundled.
 2005-04-28 18:23:27 +05:00
brian@zim.(none)
2193fd8666 All changes for change to all storage engines being under storage directory. 2005-04-26 19:04:36 -07:00
jimw@mysql.com
b186f021a8 Fix undersized array in my_print_defaults that caused crash on Sun Solaris 
(and maybe strange results on other platforms). (Bug #9851)
 2005-04-26 17:33:49 -07:00
brian@zim.(none)
473e1ffd3a Removed support for RAID, mit-threads, and MySQL FS (really, if someone wants this feature look at a web-dav hookup). 2005-03-16 16:22:56 -08:00
monty@mysql.com
0a6b7aedb2 Remove compiler warnings and remove not used variables 
(Found during build process)
 2005-02-25 16:53:22 +02:00
jimw@mysql.com
41043bb3f5 Merge 2005-02-22 16:39:21 -08:00
jimw@mysql.com
df3c8db4f3 Merge bk-internal:/home/bk/mysql-4.1 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-02-22 13:14:49 -08:00
monty@mysql.com
e2ea35ec67 Merge with 4.1 2005-02-22 15:47:00 +02:00
Sinisa@sinisa.nasamreza.org
7640c63d26 fix for a bug with my_print_defaults with --defaults-extra-file= option 2005-02-19 19:51:47 +02:00
jimw@mysql.com
64ef4ec2f3 Fix output of perror to include whether the error message 
corresponds to an OS or MySQL error. (Bug #8517)
 2005-02-16 17:37:56 -08:00
ingo@mysql.com
601a4fdfa2 Merge 2005-02-11 11:59:35 +01:00
jimw@mysql.com
3d265e9777 Merge commit trigger 2005-02-10 14:32:01 -08:00
jani@ua141d10.elisa.omakaista.fi
1c2f4ffecb Applied a patch for Netware. 2005-02-08 19:49:40 +02:00
monty@mysql.com
422c2eb868 4.1 -> 5.0 merge 2005-02-03 13:18:30 +02:00
monty@mysql.com
3936edd7fa Fixed during review of new pulled code 2005-02-02 20:28:01 +02:00
ram@gw.mysql.r18.ru
a2df0fdfb0 A fix (bug #7971: set_bit/clear_bit names conflict w/Linux kernel headers >= 2.6.9-rcxx) 2005-02-01 18:35:09 +04:00
reggie@bob.(none)
3066e117b0 Merge bob.(none):/home/reggie/bk/mysql41 
into bob.(none):/home/reggie/bk/mysql5.0
 2005-02-01 08:16:45 -06:00
reggie@bob.(none)
a5bd37e145 Bug #7390 perror.exe doesn't work 
perror.c:
  Copy output of strerr to temp buffer to prevent system overwrite on Windows
 2005-01-31 23:02:32 -06:00
serg@serg.mylan
19186b6238 Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-01-28 17:15:51 +01:00
serg@serg.mylan
852f2e0aba small Makefile.am cleanup 
clean: targets removed
    generated *.h files moved to include/
 2005-01-28 17:14:03 +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
ram@gw.mysql.r18.ru
92545cb3a9 ER_WARN_DATA_TRUNCATED replaced with WARN_DATA_TRUNCATED. 2005-01-19 16:24:06 +04:00
anjuta@arthur.local
8f169155d1 Merge anna@bk-internal.mysql.com:/home/bk/mysql-5.0 
into arthur.local:/my/mysql-5.0-clean
 2005-01-13 21:56:18 +02:00
jani@ua141d10.elisa.omakaista.fi
f3e73e26d7 A patch for Netware. 2005-01-13 19:24:54 +02:00
anjuta@arthur.local
224fcd4717 Merge 2005-01-13 19:14:10 +02:00
anjuta@arthur.local
f23cdbcd4a Bug in InnoDB; 
file closing in extra/comp_err.c
 2005-01-13 19:03:46 +02:00
anjuta@arthur.local
e52dce98da Added creation of mysqld_ername.h 2005-01-04 15:49:51 +02:00
ingo@mysql.com
c39be2d0e7 WL#1895 - Print message to error log in case of detected MyISAM corruption 
Changed my_error() to print error messages, which come from
arbitrary registered ranges of error messages. Messages can
be unregistered (and should be at end of the program).
Added registration of handler error messages.
Added a new mi_print_error() macro and a new 
mi_report_error() function, which supply error
messages with a table name.
Added calls to mi_print_error() or mi_report_error()
at all places in MyISAM, where table corruption is detected.
 2004-12-23 20:11:38 +01:00
pem@mysql.comhem.se
6461d209a5 Fixed compile error in extra/comp_err.c with -debug for some compilers. 2004-12-14 17:02:24 +01:00
anjuta@arthur.local
a045161e5b Added pathes to mysqld_error.h and sql_state.h; fixed segfault bug; 2004-12-14 01:54:16 +02:00
anjuta@arthur.local
f9451974be WL#1051, more maintanable error messages. 2004-12-13 22:51:54 +02:00
serg@serg.mylan
ee933cd198 merged 2004-11-22 21:33:15 +01:00
serg@serg.mylan
41c33c29a3 Bug #6748 heap_rfirst() doesn't work (and never did!) 
range for BETWEEN typo fixed
 2004-11-22 14:53:18 +01:00
serg@serg.mylan
353dd4fe35 dbug: DBUG_EXECUTE_IF macro, build user manual automatically, document all features 
charset2html moved from mysys to extra
ignore: new files added, garbage removed
 2004-11-04 22:29:00 +01:00
monty@mysql.com
054cea4ca8 Merge with 4.0 2004-09-01 04:12:09 +03:00
ram@gw.mysql.r18.ru
b93a973b12 Added global my_getopt_error_reporter function pointer which is 
used in the handle_options() function (instead of using additional 
handle_option() parameter). The default value of the 
my_getopt_error_reporter is default_reporter(). One can set it to
other functions if case of need.
 2004-08-31 21:27:58 +05:00
serg@serg.mylan
88e76d4a6e Merge serg.mylan:/usr/home/serg/Abk/mysql-4.0 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-08-26 15:33:52 +02:00
serg@serg.mylan
a9e98dd7c6 remove warning 2004-08-26 15:32:57 +02:00
serg@serg.mylan
b4bb38e896 merged 2004-08-26 15:19:46 +02:00
tomas@poseidon.(none)
5a9533bbf3 bug#5076 bug#5077 2004-08-18 10:10:50 +00: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
dlenev@brandersnatch.localdomain
ac68868450 Disabling broken building of mysql_tztime_to_sql utility to allow perform test builds. 2004-06-23 02:48:47 +04:00
dlenev@brandersnatch.localdomain
c110ec1a22 Fix for build from bk failures with old automake. 
mysql_tzinfo_to_sql converter was moved to extra/ directory and its build was made 
compatible with older automake versions.
 2004-06-22 23:36:26 +04:00
paul@ice.snake.net
29dff96d96 perror.c: 
MySql -> MySQL (Bug #4182)
 2004-06-18 11:19:29 -05:00