mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 14:54:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
45578 commits 2785 branches 343 tags 1.6 GiB
Commit graph

45578 commits

This branch
This branch
All branches
Author SHA1 Message Date
igor@olga.mysql.com
4bf11f99eb Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/mysql-5.0-opt
 2007-04-11 13:48:02 -07:00
igor@olga.mysql.com
e1efba0225 Post-merge fix. 2007-04-11 12:45:27 -07:00
igor@olga.mysql.com
3b990d2cf4 Merge olga.mysql.com:/home/igor/dev-opt/mysql-4.1-opt-bug27484 
into  olga.mysql.com:/home/igor/mysql-5.0-opt
 2007-04-11 11:57:40 -07:00
igor@olga.mysql.com
520b144007 Fixed bug #27484: a crash when incompatible row expressions with nested rows 
are used as arguments of the IN predicate.
Added a function to check compatibility of row expressions. Made sure that this
function to be called for Item_func_in objects by fix_length_and_dec().
 2007-04-11 11:41:12 -07:00
tomas@whalegate.ndb.mysql.com
ec6476cbef Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-04-11 20:30:23 +02:00
tomas@whalegate.ndb.mysql.com
b86f256d24 remove warning 2007-04-11 20:22:31 +02:00
jani@ua141d10.elisa.omakaista.fi
4a065f5f60 Fixed result. 2007-04-11 21:16:10 +03:00
tomas@whalegate.ndb.mysql.com
537af12420 correct merge error 2007-04-11 19:38:29 +02:00
tomas@whalegate.ndb.mysql.com
3c0e6e3983 missing return 2007-04-11 19:29:32 +02:00
tomas@whalegate.ndb.mysql.com
06acade5c2 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-04-11 18:11:14 +02:00
tomas@whalegate.ndb.mysql.com
deec4449ac Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11 
- try to catch as many malloc failures as possible and give error messages
(more for 5.1)
 2007-04-11 18:10:45 +02:00
tomas@whalegate.ndb.mysql.com
da1ebc7fce Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-04-11 15:51:09 +02:00
tomas@whalegate.ndb.mysql.com
dd4351e96f Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11 
- try to catch as many malloc failures as possible and give error messages
 2007-04-11 15:21:11 +02:00
mats@romeo.(none)
ef44dcd48d Eliminating warnings that pin-pointed a bug in a printout. 2007-04-11 15:06:30 +02:00
df@pippilotta.erinye.com
6d70fd8751 don't copy pdb files from the release target output folder, since this target does not build them 2007-04-11 14:27:03 +02:00
df@pippilotta.erinye.com
3c97d2d48a BUG#27701 don't pass arguments to sourced script if they're not modified as this is either a no-op (if done correctly), a different no-op with some shells (if done the bash way, but with correct quoting) or breaks arguments with whitespace for some shells (if done the bash way, without quotes). 2007-04-11 14:12:00 +02:00
df@pippilotta.erinye.com
a4f292fdc9 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-27701 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-27701
 2007-04-11 14:06:03 +02:00
df@pippilotta.erinye.com
42499a4713 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
 2007-04-11 13:57:52 +02:00
df@pippilotta.erinye.com
e3bfb95665 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-04-11 13:49:04 +02:00
df@pippilotta.erinye.com
d09d2517cf Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-36sp1 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
 2007-04-11 13:37:05 +02:00
df@pippilotta.erinye.com
4869a255be Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-25601 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
 2007-04-11 13:33:15 +02:00
df@pippilotta.erinye.com
f98d1614c3 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-25601 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
 2007-04-11 13:32:40 +02:00
df@pippilotta.erinye.com
b51c346781 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-36sp1 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
 2007-04-11 13:31:28 +02:00
df@pippilotta.erinye.com
d5f6363ba1 make configure handle service pack version strings 2007-04-11 13:01:11 +02:00
gkodinov/kgeorge@magare.gmz
4202454baa Bug #27530: 
The function CRC32() returns unsigned integer.
But the metadata (the unsigned flag) for the 
function was set incorrectly.
As a result type arithmetics based on the 
function's metadata (like finding the concise
type of an temporary table column to hold the result)
returned incorrect results.
Fixed by returning correct type information.

This fix is based on code contributed by Martin Friebe
(martin@hybyte.com) on 2007-03-30.
 2007-04-11 13:58:16 +03:00
hakank/hakan@lu0011.wdf.sap.corp
48b2d85708 Added comment about changing major version number. 2007-04-11 12:30:30 +02:00
jani@ua141d10.elisa.omakaista.fi
77251d2268 Added warn_root as argument for push_back() 2007-04-11 13:27:36 +03:00
mats@romeo.(none)
651358e1f5 BUG#27583 (slave sql fails to read from iocache when slave got 
stopped at pos==4):

Submitting patch on behalf of Andrei, who discovered the problem
and provided the patch.

An update of the group relay log coordinates when rotating forgot to
update the group relay log name and only updated the group relay log
position (and group master log name and position).

This patch adds code to update the group relay log *name* as well as
the position
 2007-04-11 11:10:14 +02:00
gkodinov/kgeorge@magare.gmz
4aeb1c896e Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B19372-5.0-opt
 2007-04-11 09:37:01 +03:00
jonas@perch.ndb.mysql.com
e0a4d1b4c7 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2007-04-11 08:28:09 +02:00
jonas@perch.ndb.mysql.com
d76e039ae7 Merge perch.ndb.mysql.com:/home/jonas/src/41-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
 2007-04-11 08:26:52 +02:00
jonas@perch.ndb.mysql.com
bb1adff862 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
 2007-04-11 08:26:23 +02:00
jonas@perch.ndb.mysql.com
aba4abea1b Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
 2007-04-11 08:25:26 +02:00
jonas@perch.ndb.mysql.com
4954962388 Merge perch.ndb.mysql.com:/home/jonas/src/41-work 
into  perch.ndb.mysql.com:/home/jonas/src/50-work
 2007-04-11 08:24:11 +02:00
jonas@perch.ndb.mysql.com
f52b0e3768 ndb - bug#27748 
fix commit trigger on multi-update
 2007-04-11 08:23:16 +02:00
df@pippilotta.erinye.com
7bff5112cc Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-04-11 08:06:36 +02:00
jonas@perch.ndb.mysql.com
d5f665ce5b Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-04-11 07:59:26 +02:00
jonas@perch.ndb.mysql.com
382b2fa9ae ndb - bug#27748 
testcase
 2007-04-11 07:56:11 +02:00
kent@mysql.com/kent-amd64.(none)
c92faf9d61 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/home/kent/bk/tmp3/mysql-4.1-build
 2007-04-11 01:51:33 +02:00
kent@mysql.com/kent-amd64.(none)
7e02bed924 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/kent/bk/tmp3/mysql-5.0-build
 2007-04-11 01:50:58 +02:00
kent@kent-amd64.(none)
d7286028c4 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/kent/bk/tmp3/mysql-5.1-build
 2007-04-11 01:50:06 +02:00
kent@kent-amd64.(none)
473b1f31d5 Merge mysql.com:/home/kent/bk/tmp3/mysql-5.0-build 
into  mysql.com:/home/kent/bk/tmp3/mysql-5.1-build
 2007-04-11 01:48:43 +02:00
kent@mysql.com/kent-amd64.(none)
8bcdaa86cf my_memmem.c: 
Back port of include change and copyright from 5.1
Makefile.am, zlib.m4:
  Use separate libtool convenience library for the bundled
  zlib to embed into executables and shared libraries created,
  and one to install into the pkglib directory
 2007-04-11 01:47:42 +02:00
lars/lthalmann@dl145k.mysql.com
f1589702f7 Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-04-10 18:43:43 +02:00
lars/lthalmann@dl145h.mysql.com
1e5d279451 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-04-10 18:26:14 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
904c75ede5 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
 2007-04-10 18:25:27 +02:00
gkodinov/kgeorge@magare.gmz
9514ac9f29 Bug #19372: 
Added a test case.
The problem was fixed by the fix for bug #17379.
The problem was that because of some conditions 
the optimizer always preferred range or full index
scan access methods to lookup access methods even
when the latter were much cheaper.
 2007-04-10 19:08:08 +03:00
jani@ua141d10.elisa.omakaista.fi
3db7cdd536 Patch for displaying questions per second average correctly. 2007-04-10 19:07:06 +03:00
df@pippilotta.erinye.com
05f4e9ea05 BUG#27701 Arguments to some compile-pentium* scripts were not properly passed to SETUP.sh. Besides the old way not working with some shells, single arguments that contained whitespace were also broken up. This patch tries to fix both errors. 2007-04-10 17:50:43 +02:00
jani@ua141d10.elisa.omakaista.fi
1e38c22ef8 Small fixes for merge. 2007-04-10 18:01:29 +03:00