mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 15:24:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
50156 commits 2778 branches 343 tags 1.6 GiB
Commit graph

50156 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
gkodinov/kgeorge@magare.gmz
c95b24cba7 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B31157-5.1-opt
 2007-10-19 17:01:13 +03:00
gkodinov/kgeorge@magare.gmz
fb640797b8 Bug #31157: crash when select+order by the avg of some field within the group by 
The uncacheable flag should be set at fix_fields() stage.
Fixed by moving the flag setting to match the one in 5.1
 2007-10-19 15:43:19 +03:00
tnurnberg@white.intern.koehntopp.de
30dd4d9fca Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/scratch/tnurnberg/31588/50-31588
 2007-10-18 16:09:03 +02:00
gkodinov/kgeorge@magare.gmz
7f8c4aacf6 Merge magare.gmz:/home/kgeorge/mysql/work/B31221-5.0-gca-opt 
into  magare.gmz:/home/kgeorge/mysql/work/B31221-5.1-opt
 2007-10-18 15:57:59 +03:00
gkodinov/kgeorge@magare.gmz
abdc597b78 Merge magare.gmz:/home/kgeorge/mysql/work/B31221-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/work/B31221-5.0-gca-opt
 2007-10-18 15:53:45 +03:00
gkodinov/kgeorge@magare.gmz
976e0ca154 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B31221-5.0-opt
 2007-10-18 15:32:48 +03:00
gkodinov/kgeorge@magare.gmz
d67cd9e8af Bug #31221: Optimizer incorrectly identifies impossible WHERE clause 
No warning was generated when a TIMESTAMP with a non-zero time part
 was converted to a DATE value. This caused index lookup to assume
 that this is a valid conversion and was returning rows that match 
 a comparison between a TIMESTAMP value and a DATE keypart.
 Fixed by generating a warning on such a truncation.
 2007-10-18 15:19:04 +03:00
holyfoot/hf@mysql.com/hfmain.(none)
047dd70c88 Bug #30638 why doesn't > 4294967295 rows work in myisam on windows. 
The BIG_TABLES define wasn't enabled on Windows.
#define added
 2007-10-18 14:52:19 +05:00
tnurnberg@sin.intern.azundris.com
194b4761dc Bug#31588: buffer overrun when setting variables 
post-merge fixes: format string was changed 5.0 -> 5.1, resulting in longer output
 2007-10-18 11:13:52 +02:00
tnurnberg@sin.intern.azundris.com
2a9d32f8eb Merge sin.intern.azundris.com:/misc/mysql/31588/50-31588 
into  sin.intern.azundris.com:/misc/mysql/31588/51-31588
 2007-10-18 10:55:42 +02:00
tnurnberg@sin.intern.azundris.com
4a48f2b3f4 Merge sin.intern.azundris.com:/misc/mysql/31588/41-31588 
into  sin.intern.azundris.com:/misc/mysql/31588/50-31588
 2007-10-18 10:51:10 +02:00
tnurnberg@sin.intern.azundris.com
e6ef54b31f Bug#31588: buffer overrun when setting variables 
Buffer used when setting variables was not dimensioned to accomodate
trailing '\0'. An overflow by one character was therefore possible.
CS corrects limits to prevent such overflows.
 2007-10-18 10:47:54 +02:00
gkodinov/kgeorge@magare.gmz
5f5b7cc311 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B27099-5.1-opt
 2007-10-17 13:39:41 +03:00
gluh@mysql.com/eagle.(none)
9992761343 Bug#31381 Error in retrieving Data from INFORMATION_SCHEMA 
move 'table_collation' field filling outside of if(file) condition
because this field has 'OPEN_FRM_ONLY' attribute
 2007-10-17 14:08:03 +05:00
gluh@eagle.(none)
9659588287 Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
 2007-10-17 13:26:20 +05:00
gluh@mysql.com/eagle.(none)
7f67efccef Bug#31568 Some "information_schema" entries suddenly report a NULL default 
updated result files
 2007-10-17 13:22:34 +05:00
gluh@eagle.(none)
97ce1f8cf1 Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
 2007-10-16 14:10:07 +05:00
gluh@eagle.(none)
20baa313b5 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
 2007-10-16 13:19:01 +05:00
gkodinov/kgeorge@magare.gmz
ba03c12b24 Bug #27099: system_mysql fail in pushbuild windows 
On Windows the debug log was doing freopen () instead of
fflush() and that was slowing the logging down that much 
that some tests timed out.
Fixed by replacing the freopen() with an syncing-to-disk
flag to fopen() and fflush().
Also increased the timeout of the tests running with --debug
on windows : seems to slow down as much as valgrind on linux.
 2007-10-15 19:56:24 +03:00
gluh@mysql.com/eagle.(none)
55a7338f39 Bug#30986 Character set introducer followed by a HEX string can return bad result(addon) 
issue an error if string has illegal characters
 2007-10-15 18:40:58 +05:00
gshchepa/uchum@gleb.loc
88aa7b0a6e Merge gleb.loc:/home/uchum/work/bk/PA/5.0-opt-31019 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-10-15 14:18:26 +05:00
gshchepa/uchum@gleb.loc
18ecc5bb5a Merge gleb.loc:/home/uchum/work/bk/PA/5.0-opt-31019 
into  gleb.loc:/home/uchum/work/bk/5.0-opt
 2007-10-15 13:34:58 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
f8958d0572 bug #29801 Federated engine crashes local server 
if remote server sends malicious response.

We need to check if the SHOW TABLE STATUS query we issue inside the
FEDERATED engine returned the result with the proper (or just sufficient)
number of rows. Otherwise statements like row[12] can crash the server.
 2007-10-15 10:11:52 +05:00
gkodinov/kgeorge@magare.gmz
deb62b6c77 Merge magare.gmz:/home/kgeorge/mysql/autopush/B31156-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B31156-5.1-opt
 2007-10-14 11:30:28 +03:00
gkodinov/kgeorge@magare.gmz
f0d5ed8147 item_sum.cc: 
Fixed dbug macros usage errors
 2007-10-14 11:28:43 +03:00
gkodinov/kgeorge@magare.gmz
3c0ca8259f Merge magare.gmz:/home/kgeorge/mysql/autopush/B31156-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/work/B31156-5.1-opt
 2007-10-13 09:22:37 +03:00
gkodinov/kgeorge@magare.gmz
a4da332ea5 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B31156-5.0-opt
 2007-10-13 09:20:23 +03:00
gkodinov/kgeorge@magare.gmz
ce1ce20e73 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B31440-5.1-opt
 2007-10-13 09:13:00 +03:00
gkodinov/kgeorge@magare.gmz
737dd70435 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B31440-5.0-opt
 2007-10-13 09:12:15 +03:00
gshchepa/uchum@gleb.loc
1e3fd4942e Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-10-12 22:55:33 +05:00
gshchepa/uchum@gleb.loc
f9c7587d8e Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  gleb.loc:/home/uchum/work/bk/5.0-opt
 2007-10-12 20:54:54 +05:00