mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-26 08:44:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
50602 commits 2779 branches 343 tags 1.6 GiB
Commit graph

50602 commits

This branch
This branch
All branches
Author SHA1 Message Date
gkodinov/kgeorge@magare.gmz
9934eec243 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt
 2007-10-23 15:04:40 +03:00
kaa@polly.(none)
23c65a3b01 Merge polly.(none):/home/kaa/src/opt/bug31742/my50-bug28550 
into  polly.(none):/home/kaa/src/opt/mysql-5.0-opt
 2007-10-23 16:03:48 +04:00
kaa@polly.(none)
17a533e0d0 Merge polly.(none):/home/kaa/src/opt/bug31742/my50-bug28550 
into  polly.(none):/home/kaa/src/opt/bug31742/my51-bug28550
 2007-10-23 15:52:27 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
d029dd89c1 type conversions fixed to get rid of warnings 2007-10-23 16:32:05 +05:00
holyfoot/hf@hfmain.(none)
05f918e999 Merge mysql.com:/home/hf/work/30638/my50-30638 
into  mysql.com:/home/hf/work/30638/my51-30638
 2007-10-23 16:28:52 +05:00
holyfoot/hf@hfmain.(none)
9b61281c01 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  mysql.com:/home/hf/work/30638/my51-30638
 2007-10-23 16:28:51 +05:00
gkodinov/kgeorge@magare.gmz
58bce232a8 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B30825-5.1-opt
 2007-10-23 14:28:50 +03:00
gkodinov/kgeorge@magare.gmz
7ac179bc34 merge 5.0-opt -> 5.1-opt for bug 30825 2007-10-23 14:26:57 +03:00
gkodinov/kgeorge@magare.gmz
bc80b86379 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt
 2007-10-23 14:23:18 +03:00
holyfoot/hf@hfmain.(none)
c3033ace1f Merge mysql.com:/home/hf/work/30638/my50-30638 
into  mysql.com:/home/hf/work/30638/my51-30638
 2007-10-23 16:21:51 +05:00
gkodinov/kgeorge@magare.gmz
7c344185bd Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B28687-5.1-opt
 2007-10-23 14:21:50 +03:00
holyfoot/hf@hfmain.(none)
14c43b980e Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/home/hf/work/30638/my50-30638
 2007-10-23 15:35:52 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
36092b373a type conversion fixed to get rid of warnings 2007-10-23 15:34:10 +05:00
gkodinov/kgeorge@magare.gmz
62737d6d42 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt
 2007-10-23 13:10:35 +03:00
holyfoot/hf@mysql.com/hfmain.(none)
7c8d8b5a74 merging 2007-10-23 14:31:59 +05:00
holyfoot/hf@hfmain.(none)
7fe41df000 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/home/hf/work/30638/my50-30638
 2007-10-23 14:31:24 +05:00
holyfoot/hf@hfmain.(none)
0353ecb29f Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  mysql.com:/home/hf/work/30638/my51-30638
 2007-10-23 14:30:22 +05:00
holyfoot/hf@hfmain.(none)
2a7ae86a35 Merge mysql.com:/home/hf/work/30638/my50-30638 
into  mysql.com:/home/hf/work/30638/my51-30638
 2007-10-23 14:29:20 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
9f323e1a3a type conversions fixed to avoid warnings on Windows 2007-10-23 14:27:11 +05:00
gluh@mysql.com/eagle.(none)
29ea825e57 Merge mysql.com:/home/gluh/MySQL/Merge/4.1 
into  mysql.com:/home/gluh/MySQL/Merge/4.1-opt
 2007-10-23 14:06:56 +05:00
gkodinov/kgeorge@magare.gmz
3553f6eac2 Merge magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/work/B30825-5.1-opt
 2007-10-23 11:44:14 +03:00
gkodinov/kgeorge@magare.gmz
d066e2173c Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt
 2007-10-23 11:26:37 +03:00
gkodinov/kgeorge@magare.gmz
0a14d1a19b Merge magare.gmz:/home/kgeorge/mysql/work/B28687-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/work/B28687-5.1-opt
 2007-10-23 11:22:59 +03:00
gluh@mysql.com/eagle.(none)
ffea2073b1 Bug#31633 Information schema = NULL queries crash the server 
added correct handling of NULL values for lookup fields
 2007-10-23 13:20:51 +05:00
mleich@four.local.lan
51fd4937c4 This changeset contains the following stuff: 
- Fix for
    Bug#28827 Partition test needs archive engine
    Bug#26669 Two tests on partition fail while blackhole engine is missing
  Solution: Move ARCHIVE and BLACKHOLE sub test cases to their own main test.
- The two bugs above + the fact that CSV could be also sometimes not
  available --> Move also CSV sub tests out.
- Minor cleanups
  - Replace error numbers with error names
  - fix typos, wrong comments
  - remove redundant sub test cases
  - add missing drop database
  - SET GLOBAL general_log = default is wrong, = 1 is correct
 2007-10-22 20:10:51 +02:00
gkodinov/kgeorge@magare.gmz
52b35112cf Bug #28687: Search fails on '0000-00-00' date after sql_mode change 
When doing indexed search the server constructs a key image for 
faster comparison to the stored keys. While doing that it must not
perform (and stop if they fail) the additional date checks that can 
be turned on by the SQL mode because there already may be values in 
the table that don't comply with the error checks.
Fixed by ignoring these SQL mode bits while making the key image.
 2007-10-22 19:32:18 +03:00
kaa@polly.(none)
53a9e7f478 Fix for bug #31742: delete from ... order by function call that causes 
an error, asserts server

In case of a fatal error during filesort in find_all_keys() the error
was returned without the necessary handler uninitialization.
Fixed by changing the code so that handler uninitialization is performed
before returning the error.
 2007-10-22 16:10:08 +04:00
joerg@trift2.
14241c8297 Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-10-22 11:40:41 +02:00
joerg@trift2.
242fdacdfe Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-10-22 11:18:01 +02:00
joerg@trift2.
5779d062e2 Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-10-22 11:08:55 +02:00
holyfoot/hf@hfmain.(none)
9e6091fcbc Merge mysql.com:/home/hf/work/30638/my50-30638 
into  mysql.com:/home/hf/work/30638/my51-30638
 2007-10-22 10:30:09 +05:00
holyfoot/hf@hfmain.(none)
f5bc9d3c82 Merge bk@192.168.21.1:mysql-5.1-opt 
into  mysql.com:/home/hf/work/30638/my51-30638
 2007-10-22 10:28:12 +05:00
holyfoot/hf@hfmain.(none)
5b67dca442 Merge bk@192.168.21.1:mysql-5.0-opt 
into  mysql.com:/home/hf/work/30638/my50-30638
 2007-10-22 10:27:35 +05:00
holyfoot/hf@hfmain.(none)
bf19259d83 Merge mysql.com:/home/hf/work/29801/my50-29801 
into  mysql.com:/home/hf/work/30638/my50-30638
 2007-10-22 10:26:16 +05:00
holyfoot/hf@hfmain.(none)
f4785845b4 Merge mysql.com:/home/hf/work/29801/my51-29801 
into  mysql.com:/home/hf/work/30638/my51-30638
 2007-10-22 10:25:35 +05:00
holyfoot/hf@hfmain.(none)
0065b7800e Merge mysql.com:/home/hf/work/30638/my50-30638 
into  mysql.com:/home/hf/work/30638/my51-30638
 2007-10-22 10:24:12 +05:00
holyfoot/hf@hfmain.(none)
5a20acc709 Merge mysql.com:/home/hf/work/29801/my50-29801 
into  mysql.com:/home/hf/work/29801/my51-29801
 2007-10-22 10:21:32 +05:00
tnurnberg@white.intern.koehntopp.de
478079b2e8 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/scratch/tnurnberg/31588/50-31588
 2007-10-22 01:57:49 +02:00
tnurnberg@white.intern.koehntopp.de
44fbb702b9 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  mysql.com:/scratch/tnurnberg/31588/51-31588
 2007-10-21 22:49:16 +02:00
kaa@polly.(none)
079bdfc5af Merge polly.(none):/home/kaa/src/opt/mysql-5.0-opt 
into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt
 2007-10-21 22:01:12 +04:00
kaa@polly.(none)
d998b471c9 Merge polly.(none):/home/kaa/src/opt/bug28550/my51-bug28550 
into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt
 2007-10-21 21:57:57 +04:00
kaa@polly.(none)
f9ba86ee86 Merge polly.(none):/home/kaa/src/opt/bug28550/my50-bug28550 
into  polly.(none):/home/kaa/src/opt/mysql-5.0-opt
 2007-10-21 21:55:26 +04:00
kaa@polly.(none)
d55d309380 Merge polly.(none):/home/kaa/src/opt/bug28550/my50-bug28550 
into  polly.(none):/home/kaa/src/opt/bug28550/my51-bug28550
 2007-10-21 21:49:30 +04:00
kaa@polly.(none)
349841118f Bug #28550 "Potential bugs related to the return type of the CHAR function". 
Since, as of MySQL 5.0.15, CHAR() arguments larger than 255 are converted into multiple result bytes, a single CHAR() argument can now take up to 4 bytes. This patch fixes Item_func_char::fix_length_and_dec() to take this into account.
  
This patch also fixes a regression introduced by the patch for bug21513. As now we do not always have the 'name' member of Item set for Item_hex_string and Item_bin_string, an own print() method has been added to Item_hex_string so that it could correctly be printed by Item_func::print_args().
 2007-10-21 21:45:31 +04:00
tnurnberg@sin.intern.azundris.com
b8feb23321 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  sin.intern.azundris.com:/misc/mysql/31588/51-31588
 2007-10-20 17:18:23 +02:00
antony@anubis.xiphis.org
3f33002fc4 Merge anubis.xiphis.org:/usr/home/antony/work/mysql-5.0-engines.merge 
into  anubis.xiphis.org:/usr/home/antony/work/mysql-5.1-engines.merge
 2007-10-19 13:12:14 -07:00
antony@anubis.xiphis.org
9732efe7f8 Merge anubis.xiphis.org:/usr/home/antony/work/mysql-4.1-engines.merge 
into  anubis.xiphis.org:/usr/home/antony/work/mysql-5.0-engines.merge
 2007-10-19 13:10:41 -07:00
antony@pcg5ppc.xiphis.org
3b95727600 Merge anubis.xiphis.org:/usr/home/antony/work/mysql-5.1-engines 
into  anubis.xiphis.org:/usr/home/antony/work/mysql-5.1-engines.merge
 2007-10-19 13:06:37 -07:00
antony@pcg5ppc.xiphis.org
fb27ce61bc Merge anubis.xiphis.org:/usr/home/antony/work/mysql-5.0-engines 
into  anubis.xiphis.org:/usr/home/antony/work/mysql-5.0-engines.merge
 2007-10-19 13:04:30 -07:00
acurtis/antony@xiphis.org/ltamd64.xiphis.org
8619e7df83 Merge anubis.xiphis.org:/usr/home/antony/work/mysql-4.1-engines 
into  anubis.xiphis.org:/usr/home/antony/work/mysql-4.1-engines.merge
 2007-10-19 13:01:08 -07:00