mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 11:31:51 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
45341 commits 2791 branches 343 tags 1.7 GiB
Commit graph

20603 commits

Author SHA1 Message Date
tomas@whalegate.ndb.mysql.com
3129179178 Bug #27378 update becomes delete on slave 
- quick workaround, better patch is needed later
 - test case
 2007-03-29 14:14:42 +02:00
msvensson@pilot.blaudden
a71d195183 Bug#25482 GRANT statements are not replicated if you use "replicate-ignore-table" 
- GRANT and REVOKE statments didn't have the "updating" flag set and
   thus statements with a table specified would not replicate if
   slave filtering rules where turned on.
   For example "GRANT ... ON test.t1 TO ..." would not replicate.
 2007-03-29 14:12:32 +02:00
lars/lthalmann@dl145j.mysql.com
771e05d657 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-03-29 13:49:10 +02:00
tsmith@quadxeon.mysql.com
a778498fc1 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
 2007-03-29 13:37:32 +02:00
tsmith@quadxeon.mysql.com
6a897bf132 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
 2007-03-29 13:36:41 +02:00
msvensson@pilot.blaudden
eac521a9f6 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-03-29 13:30:21 +02:00
tsmith@quadxeon.mysql.com
9e99b24305 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
 2007-03-29 13:09:16 +02:00
tsmith@quadxeon.mysql.com
4f95bd3438 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
 2007-03-29 13:08:32 +02:00
tsmith@quadxeon.mysql.com
0b0d2c3258 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
 2007-03-29 12:58:26 +02:00
sergefp@mysql.com
064157b6e8 BUG#26624, merge to 5.1: make partition pruning module account for the 
changes made by the bug fix.
 2007-03-29 14:54:08 +04:00
msvensson@pilot.blaudden
cdd07a17ba Merge bk-internal:/home/bk/mysql-5.1-new-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-03-29 12:53:49 +02:00
tsmith@quadxeon.mysql.com
a7f506db2a Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/41 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
 2007-03-29 12:52:31 +02:00
msvensson@pilot.blaudden
5d8208416b Merge pilot.blaudden:/home/msvensson/mysql/bug26837/my51-bug26837 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-03-29 12:45:55 +02:00
msvensson@pilot.blaudden
0e2de06a2a Merge pilot.blaudden:/home/msvensson/mysql/bug26837/my50-bug26837 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-03-29 12:34:44 +02:00
msvensson@pilot.blaudden
38172437e3 Merge pilot.blaudden:/home/msvensson/mysql/bug26837/my50-bug26837 
into  pilot.blaudden:/home/msvensson/mysql/bug26837/my51-bug26837
 2007-03-29 12:34:18 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
75668471d1 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
 2007-03-29 12:25:28 +02:00
ramil/ram@ramil.myoffice.izhnet.ru
c29f404e53 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/home/ram/work/b21976/my51-b21976
 2007-03-29 15:16:48 +05:00
gkodinov/kgeorge@magare.gmz
82ecff6a76 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B27300-5.0-opt
 2007-03-29 12:09:55 +03:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
c132038451 Merge mysql.com:/home/ram/work/mysql-5.0-maint 
into  mysql.com:/home/ram/work/b21976/my50-b21976
 2007-03-29 13:37:07 +05:00
sergefp@pylon.mylan
87d98bec74 Merge mysql.com:/home/psergey/mysql-5.0-merge 
into  mysql.com:/home/psergey/mysql-5.1-merge
 2007-03-29 12:24:23 +04:00
gkodinov/kgeorge@magare.gmz
1a2ca44e2b Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B27300-5.0-opt
 2007-03-29 11:01:32 +03:00
joerg@trift-lap.fambruehe
4507c6757a Merge trift-lap.fambruehe:/MySQL/M51/mysql-5.1 
into  trift-lap.fambruehe:/MySQL/M51/push-5.1
 2007-03-29 09:41:39 +02:00
ramil/ram@ramil.myoffice.izhnet.ru
8c5b59e416 Merge mysql.com:/home/ram/work/b21976/my50-b21976 
into  mysql.com:/home/ram/work/b21976/my51-b21976
 2007-03-29 12:04:02 +05:00
istruewing@chilla.local
d0ad6cd45b Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-03-29 08:36:57 +02:00
sergefp@mysql.com
399bc9861e Merge of BUG#26624 and BUG#26625 2007-03-29 10:35:28 +04:00
sergefp@mysql.com
9939b3b75e BUG#26624: high mem usage (crash) in range optimizer 
- Post-review fixes
 2007-03-29 10:27:58 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
73f0c5d7c6 Merge mysql.com:/home/ram/work/mysql-5.0-maint 
into  mysql.com:/home/ram/work/b26359/b26359.5.0
 2007-03-29 11:06:15 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
95b58449f9 Merge mysql.com:/home/ram/work/b26359/b26359.5.0 
into  mysql.com:/home/ram/work/b26359/b26359.5.1
 2007-03-29 09:38:46 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
e3c34c9cbf Fix for bugs 
#27176: Assigning a string to an year column has unexpected results
#26359: Strings becoming truncated and converted to numbers under STRICT mode

Problems: 
1. storing a string to an integer field we don't check 
   if strntoull10rnd() returns MY_ERRNO_EDOM error.
   Fix: check for MY_ERRNO_EDOM.
2. storing a string to an year field we use my_strntol() function.
   Fix: use strntoull10rnd() instead.
 2007-03-29 09:08:30 +05:00
tsmith@siva.hindu.god
0d65ee796b Merge siva.hindu.god:/home/tsmith/m/bk/maint/50 
into  siva.hindu.god:/home/tsmith/m/bk/maint/51
 2007-03-28 19:50:41 -06:00
tsmith@siva.hindu.god
024be23a82 Fix warning on Windows 2007-03-28 19:49:30 -06:00
tsmith@siva.hindu.god
16640ef3fe Merge siva.hindu.god:/home/tsmith/m/bk/maint/50 
into  siva.hindu.god:/home/tsmith/m/bk/maint/51
 2007-03-28 17:54:11 -06:00
tsmith@siva.hindu.god
979102de3b Remove warning when compiling libmysqld/log.cc 2007-03-28 17:50:06 -06:00
tsmith@siva.hindu.god
ecd22993cf Bug #26642: create index corrupts table definition in .frm 
Thanks to Martin Friebe for finding and submitting a fix for this bug!

A table with maximum number of key segments and maximum length key name
would have a corrupted .frm file, due to an incorrect calculation of the
complete key length.  Now the key length is computed correctly (I hope) :-)

MyISAM would reject a table with the maximum number of keys and the maximum
number of key segments in all keys.  It would allow one less than this total
maximum.  Now MyISAM accepts a table defined with the maximum.  (This is a
very minor issue.)
 2007-03-28 15:25:13 -06:00
kent@kent-amd64.(none)
082de779b3 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
 2007-03-28 22:50:43 +02:00
baker@bk-internal.mysql.com
1b9c4358a8 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2007-03-28 22:31:10 +02:00
tsmith@siva.hindu.god
7366ecdb0e Merge siva.hindu.god:/home/tsmith/m/bk/maint/bmisc/50 
into  siva.hindu.god:/home/tsmith/m/bk/maint/50
 2007-03-28 12:27:37 -06:00
tsmith@siva.hindu.god
c01629a7cd Merge siva.hindu.god:/home/tsmith/m/bk/maint/bmisc/51 
into  siva.hindu.god:/home/tsmith/m/bk/maint/51
 2007-03-28 11:47:28 -06:00
jani@ua141d10.elisa.omakaista.fi
3c3b0391f8 Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-main 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-marvel
 2007-03-28 20:46:42 +03:00
msvensson@pilot.blaudden
80f35d6307 Merge pilot.blaudden:/home/msvensson/mysql/bug27490/my51-bug27490 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-03-28 18:43:49 +02:00
msvensson@pilot.blaudden
0302f48c2d Merge pilot.blaudden:/home/msvensson/mysql/bug27490/my50-bug27490 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-03-28 18:43:39 +02:00
msvensson@pilot.blaudden
b95a1819bf Merge pilot.blaudden:/home/msvensson/mysql/bug27490/my50-bug27490 
into  pilot.blaudden:/home/msvensson/mysql/bug27490/my51-bug27490
 2007-03-28 18:37:27 +02:00
sergefp@mysql.com
264697e83b Merge mysql.com:/home/psergey/mysql-4.1-bug26625 
into  mysql.com:/home/psergey/mysql-4.1-bug26624-r2
 2007-03-28 20:31:13 +04:00
sergefp@mysql.com
a8d439728f BUG#26624: high mem usage (crash) in range optimizer 
- Added PARAM::alloced_sel_args where we count the # of SEL_ARGs
  created by SEL_ARG tree cloning operations.
- Made the range analyzer to shortcut and not do any more cloning 
  if we've already created MAX_SEL_ARGS SEL_ARG objects in cloning.
- Added comments about space complexity of SEL_ARG-graph 
  representation.
 2007-03-28 20:16:01 +04:00
jani@ua141d10.elisa.omakaista.fi
3bd0494eb9 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-marvel
 2007-03-28 18:31:49 +03:00
serg@janus.mylan
fd1d4f864e compiler warnings 2007-03-28 17:12:38 +02:00
istruewing@chilla.local
3f0bfd831a Merge chilla.local:/home/mydev/mysql-5.0-axmrg 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-03-28 17:06:09 +02:00
sergefp@mysql.com
ce28ca336b Delete: sql/mysqld.cc.rej 2007-03-28 19:05:30 +04:00
istruewing@chilla.local
20bb4ae8cf Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-03-28 16:59:09 +02:00
istruewing@chilla.local
350c5da724 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-03-28 16:57:08 +02:00