mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-21 06:22:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
39155 commits 2781 branches 343 tags 1.6 GiB
Commit graph

39155 commits

This branch
This branch
All branches
Author SHA1 Message Date
cmiller@zippy.cornsilk.net
3c6591ad8f Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776-encore/my50-bug15776-encore 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build
 2008-04-09 20:34:38 -04:00
cmiller@zippy.cornsilk.net
02e6c83950 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my50-bug15776 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776-encore/my50-bug15776-encore
 2008-04-09 17:14:10 -04:00
cmiller@zippy.cornsilk.net
b506166a0c Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my50-bug15776 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build
 2008-04-09 12:27:51 -04:00
cmiller@zippy.cornsilk.net
3e2457b71a Follow-up to B-g#15776, test failures on 64-bit linux. 
Make maximum blob size to be 2**32-1, regardless of word size.

Fix failure of timestamp with size of 2**31-1.  The method of
rounding up to the nearest even number would overflow.
 2008-04-09 12:27:30 -04:00
mleich@five.local.lan
71dd9bda70 Merge five.local.lan:/work/merge/mysql-5.0-funcs_1 
into  five.local.lan:/work/trees/mysql-5.0-build-src-clean
 2008-04-04 18:02:55 +02:00
mleich@five.local.lan
7498f9e6b8 Backport of fix made in 5.1 to 5.0 
mysql-test/Makefile.am   :    Fix a copy-paste error ...
 2008-04-04 17:41:14 +02:00
mleich@five.local.lan
c7efce7e3b Merge five.local.lan:/work/trees/mysql-5.0-build-src-clean 
into  five.local.lan:/work/merge/mysql-5.0-build
 2008-04-04 14:51:43 +02:00
cmiller@zippy.cornsilk.net
61a528c0b2 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26294/my50-bug26294 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build
 2008-04-03 13:19:55 -04:00
cmiller@zippy.cornsilk.net
9ff7a0cedc Bug#26294: library name conflict between MySQL 4.x, 5.0 and Qt 3.3 
When linking with some external programs, "multiple definition 
of `init_time'"

Rename init_time() to my_init_time() to avoid collision with other
libraries (particularly libmng).
 2008-04-03 11:32:00 -04:00
cmiller@zippy.cornsilk.net
a296df9581 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build
 2008-04-03 11:28:10 -04:00
joerg@trift2.
c62e5bbe46 Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2008-04-03 15:30:39 +02:00
mleich@five.local.lan
d14e25bf7b Merge five.local.lan:/work/merge/mysql-5.0-funcs_1 
into  five.local.lan:/work/trees/mysql-5.0-build-src-clean
 2008-04-02 21:29:43 +02:00
mleich@five.local.lan
c01918948c Correct the location of the directory for 
"funcs_1" data load
 2008-04-02 19:47:20 +02:00
cmiller@zippy.cornsilk.net
844939eed6 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build
 2008-04-02 10:58:37 -04:00
cmiller@zippy.cornsilk.net
c83c18c058 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my50-bug15776 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build
 2008-04-02 10:56:49 -04:00
mleich@five.local.lan
4f4d10da03 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  five.local.lan:/work/trees/mysql-5.0-build-src-clean
 2008-04-02 14:55:35 +02:00
mleich@five.local.lan
4822079f0a Merge five.local.lan:/work/merge/mysql-5.0-Bug 
into  five.local.lan:/work/trees/mysql-5.0-build-src-clean
 2008-04-01 23:03:23 +02:00
cmiller@zippy.cornsilk.net
7a9f12e1c4 Test updated. 2008-04-01 12:26:12 -04:00
mkindahl@dl145h.mysql.com
edc7090a5a Post-merge fixes. 2008-04-01 12:29:53 +02:00
mkindahl@dl145h.mysql.com
fb9e8ed5e8 Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
 2008-04-01 08:43:15 +02:00
mleich@five.local.lan
89ddc0aa52 Fix for 
Bug#35335 funcs_1: Some tests fail within load_file during
                      pushbuild runs
   Solution: 1. Move files with input data used in load_file, 
                load data etc. 
                from suite/funcs_1/<whatever>
                to std_data
             2. Use for testsuite funcs_1 the server option
                --secure-file-priv=<MYSQLTEST_VARDIR>
             3. Outfiles have to be stored under MYSQLTEST_VARDIR 
+ changes according to WL#4304 Cleanup in funcs_1 tests
  - backport of fixes/improvements made in 5.1 to 5.0
    The differences between scripts in 5.0 and 5.1 cause
    much additional and annoying work during any upmerge.
  - replace error numbers with names
  - improved comments
  - improved formatting
  - Unify storage engine names so that result files for
    storage engine variants do not differ (some tests)
  - remove a script no more used (tests are done in other scripts)
 2008-03-31 19:48:02 +02:00
mkindahl@dl145h.mysql.com
6c8a0887cc Removing race conditions from rpl_packet causing test to fail. 2008-03-31 16:32:45 +02:00
mkindahl@dl145h.mysql.com
a7fe4abc55 Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
 2008-03-31 09:57:29 +02:00
iggy@amd64.(none)
f13f6eaff3 Bug#26243 - Cleanup Valgrind error 2008-03-30 15:46:37 -04:00
gkodinov/kgeorge@macbook.gmz
fd9993db87 fixed warnings from the fix of 26243 2008-03-29 17:50:46 +02:00
gkodinov/kgeorge@macbook.gmz
84f761daaf fixes for warnings and compile errors for the fix of bug 26243 2008-03-29 16:12:23 +02:00
gkodinov/kgeorge@macbook.gmz
7cb4b7c19d fixed warnings and compile errors from the fix for bug 26243 2008-03-29 09:52:16 +02:00
iggy@amd64.(none)
d0b1e944f5 Merge amd64.(none):/src/mysql-5.0-bugteam 
into  amd64.(none):/src/bug26243/my50-bug26243
 2008-03-28 16:48:02 -04:00
anozdrin/alik@quad.opbmk
814e2613b0 Fix tree: 
1. Use 'dat' extension, because it is handled in Makefile.am;
  2. Fix typo: the bug id is 35469, not 35649.
 2008-03-28 23:39:47 +03:00
iggy@amd64.(none)
b9877b84ac Merge amd64.(none):/src/mysql-5.0-bugteam 
into  amd64.(none):/src/bug26243/my50-bug26243
 2008-03-28 16:01:05 -04:00
anozdrin/alik@quad.opbmk
1e9e009e21 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-bugteam 
into  quad.opbmk:/mnt/raid/alik/MySQL/devel/5.0-bt
 2008-03-28 21:43:23 +03:00
iggy@amd64.(none)
79e434bc67 Bug#26243 mysql command line crash after control-c 
- Backported the 5.1 DBUG to 5.0.
- Avoid memory cleanup race on Windows client for CTRL-C
 2008-03-28 14:02:27 -04:00
anozdrin/alik@quad.opbmk
2880d2081e Fix for Bug#35469: server crash with LOAD DATA INFILE to a VIEW. 
The problem was that LOAD DATA code (sql_load.cc) didn't take into
account that there may be items, representing references to other
columns. This is a usual case in views. The crash happened because
Item_direct_view_ref was casted to Item_user_var_as_out_param,
which is not a base class.

The fix is to
  1) Handle references properly;
  2) Ensure that an item is treated as a user variable only when
     it is a user variable indeed;
  3) Report an error if LOAD DATA is used to load data into
     non-updatable column.
 2008-03-28 18:59:13 +03:00
mattiasj@witty.
6369418b1f Merge witty.:/Users/mattiasj/clones/bug21413-50-engines 
into  witty.:/Users/mattiasj/clones/bug21413-50-bugteam
 2008-03-28 15:17:36 +01:00
mattiasj@witty.
0ef4532611 Merge witty.:/Users/mattiasj/Public/shared-vms/bug21413-41-engines 
into  witty.:/Users/mattiasj/clones/bug21413-50-engines
 2008-03-28 14:34:06 +01:00
mattiasj@witty.
b008ac3aac Bug#21413 - Engine table handler used by multiple threads 
in REPLACE DELAYED
    
post push patch, removing the optimization for
copying delayed_insert variables.
 2008-03-28 14:27:22 +01:00
evgen@moonbone.local
0bce8e6f9b Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-bugteam 
into  moonbone.local:/work/27219-5.0-opt-mysql
 2008-03-28 14:31:52 +03:00
gkodinov/kgeorge@magare.gmz
fb931bad54 Merge bk-internal:/home/bk/mysql-5.0 
into  magare.gmz:/home/kgeorge/mysql/work/merge-5.0-bugteam
 2008-03-28 11:26:40 +02:00
gkodinov/kgeorge@magare.gmz
c95b11713c Merge bk-internal:/home/bk/mysql-5.0 
into  magare.gmz:/home/kgeorge/mysql/work/merge-5.0-bugteam
 2008-03-28 10:08:24 +02:00
tnurnberg@white.intern.koehntopp.de
282825af33 Merge mysql.com:/misc/mysql/mysql-5.0 
into  mysql.com:/misc/mysql/mysql-5.0-opt
 2008-03-27 23:35:56 +01:00
evgen@moonbone.local
21c6145a6e Bug#27219: Aggregate functions in ORDER BY. 
Mixing aggregate functions and non-grouping columns is not allowed in the
ONLY_FULL_GROUP_BY mode. However in some cases the error wasn't thrown because
of insufficient check.

In order to check more thoroughly the new algorithm employs a list of outer
fields used in a sum function and a SELECT_LEX::full_group_by_flag.
Each non-outer field checked to find out whether it's aggregated or not and
the current select is marked accordingly.
All outer fields that are used under an aggregate function are added to the
Item_sum::outer_fields list and later checked by the Item_sum::check_sum_func
function.
 2008-03-27 19:49:32 +03:00
gshchepa/uchum@host.loc
931582bb58 Merge host.loc:/home/uchum/work/mysql-5.0 
into  host.loc:/home/uchum/work/5.0-opt
 2008-03-27 20:05:51 +04:00
mattiasj@witty.
16e83e55e6 Merge witty.:/Users/mattiasj/Public/shared-vms/bug21413-41-engines 
into  witty.:/Users/mattiasj/clones/bug21413-50-engines
 2008-03-27 16:24:11 +01:00
davi@mysql.com/endora.local
65c1cf30ff Patch clean up. 
Fixed interference between tests: Users were added but not properly removed.
This caused later tests to fail.
 2008-03-27 09:37:20 -03:00
joerg@trift2.
dc00a52464 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  trift2.:/MySQL/M50/push-5.0
 2008-03-27 13:21:34 +01:00
davi@endora.local
c0aff004b9 Merge mysql.com:/Users/davi/mysql/mysql-5.1-bug33201 
into  mysql.com:/Users/davi/mysql/mysql-5.0-bugteam
 2008-03-27 09:13:51 -03:00
df@pippilotta.erinye.com
7297fe1950 BUG#25340 2008-03-27 13:02:59 +01:00
gshchepa/uchum@host.loc
faf4737bce Merge host.loc:/home/uchum/work/4.1-opt 
into  host.loc:/home/uchum/work/5.0-opt
 2008-03-27 16:00:26 +04:00
gshchepa/uchum@host.loc
7edeebc9ab Merge host.loc:/home/uchum/work/mysql-5.0 
into  host.loc:/home/uchum/work/5.0-opt
 2008-03-27 15:52:55 +04:00
joerg@trift2.
270aaa17b2 Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2008-03-27 12:38:21 +01:00