mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 12:01:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
35349 commits 2793 branches 343 tags 1.5 GiB
Commit graph

35349 commits

This branch
This branch
All branches
Author SHA1 Message Date
kent@mysql.com/kent-amd64.(none)
aea42a5444 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
 2007-03-14 14:30:54 +01:00
svoj@mysql.com/april.(none)
d7311aab77 Removed tabs. 2007-03-14 02:30:05 +04:00
svoj@mysql.com/april.(none)
de21b9b8ef Merge mysql.com:/home/svoj/devel/mysql/BUG26881/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG26881/mysql-5.0-engines
 2007-03-13 18:11:47 +04:00
svoj@mysql.com/april.(none)
cb132bea8f BUG#26881 - Large MERGE tables report incorrect specification when no 
differences in tables
Certain merge tables were wrongly reported as having incorrect definition:
- Some fields that are 1 byte long (e.g. TINYINT, CHAR(1)), might
  be internally casted (in certain cases) to a different type on a
  storage engine layer. (affects 4.1 and up)
- If tables in a merge (and a MERGE table itself) had short VARCHAR column (less
  than 4 bytes) and at least one (but not all) tables were ALTER'ed (even to an
  identical table: ALTER TABLE xxx ENGINE=yyy), table definitions went ouf of
  sync. (affects 4.1 only)

This is fixed by relaxing a check for underlying conformance and setting
field type to FIELD_TYPE_STRING in case varchar is shorter than 4
when a table is created.
 2007-03-13 18:02:06 +04:00
svoj@mysql.com/april.(none)
14deaa3f61 Merge mysql.com:/home/svoj/devel/mysql/BUG26881/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG26881/mysql-5.0-engines
 2007-03-13 17:00:48 +04:00
svoj@mysql.com/april.(none)
11384fece2 Merge mysql.com:/home/svoj/devel/bk/mysql-5.0 
into  mysql.com:/home/svoj/devel/mysql/BUG26881/mysql-5.0-engines
 2007-03-13 16:58:52 +04:00
svoj@mysql.com/april.(none)
576db4f44c Merge mysql.com:/home/svoj/devel/bk/mysql-4.1 
into  mysql.com:/home/svoj/devel/mysql/BUG26881/mysql-4.1-engines
 2007-03-13 16:57:16 +04:00
kent@mysql.com/kent-amd64.(none)
25e91313c9 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
 2007-03-12 21:32:59 +01:00
kent@mysql.com/kent-amd64.(none)
d6476788fe Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
 2007-03-12 21:29:05 +01:00
kent@mysql.com/kent-amd64.(none)
512202a88f configure.in: 
Restored accidently removed line to check for zlib
 2007-03-12 21:27:07 +01:00
joerg@trift2.
860bebcf2c Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into  trift2.:/MySQL/M50/push-5.0
 2007-03-12 16:00:35 +01:00
kent@mysql.com/kent-amd64.(none)
43cc303b26 Makefile.am, CMakeLists.txt: 
Removed references to my_winsem.c
 2007-03-12 14:52:37 +01:00
kent@mysql.com/kent-amd64.(none)
30537c7d75 Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
 2007-03-12 13:22:02 +01:00
kent@mysql.com/kent-amd64.(none)
e10e81d154 mysys_ia64.dsp, mysys.vcproj: 
Removed references to unused files
 2007-03-12 13:18:48 +01:00
kent@mysql.com/kent-amd64.(none)
cad1c35618 Merge mysql.com:/home/kent/bk/tmp/mysql-4.0 
into  mysql.com:/home/kent/bk/tmp/mysql-4.1-build
 2007-03-12 13:15:11 +01:00
kent@mysql.com/kent-amd64.(none)
4e4f184170 Makefile.am, configure.in, mysys.dsp: 
Removed unused files
.del-my_winsem.c:
  Delete: mysys/my_winsem.c
.del-my_semaphore.c:
  Delete: mysys/my_semaphore.c
.del-my_semaphore.h:
  Delete: include/my_semaphore.h
 2007-03-12 13:12:42 +01:00
knielsen@ymer.(none)
2e43ab09cb Merge ymer.(none):/usr/local/mysql/mysql-5.1-new-ndb 
into  ymer.(none):/usr/local/mysql/mysql-5.0-ndb
 2007-03-12 10:18:34 +01:00
evgen@moonbone.local
f3e56b5adb Merge moonbone.local:/mnt/gentoo64/work/15757-bug-5.0-opt-mysql 
into  moonbone.local:/mnt/gentoo64/work/25373-bug-5.0-opt-mysql
 2007-03-10 19:57:18 +03:00
evgen@moonbone.local
6f6b9ae3ad Bug#15757: Wrong SUBSTRING() result when a tmp table was employed. 
When the SUBSTRING() function was used over a LONGTEXT field the max_length of
the SUBSTRING() result was wrongly calculated and set to 0. As the max_length
parameter is used while tmp field creation it limits the length of the result
field and leads to printing an empty string instead of the correct result.

Now the Item_func_substr::fix_length_and_dec() function correctly calculates
the max_length parameter.
 2007-03-10 19:55:34 +03:00
evgen@moonbone.local
e7a309197b Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  moonbone.local:/mnt/gentoo64/work/25373-bug-5.0-opt-mysql
 2007-03-10 19:53:59 +03:00
istruewing@chilla.local
17dcc22a6e Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines 
into  chilla.local:/home/mydev/mysql-4.1-bug25673
 2007-03-10 17:01:52 +01:00
istruewing@blade08.mysql.com
8fb003f503 Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0-engines 
into  blade08.mysql.com:/data0/istruewing/autopush/mysql-5.0-bug25673
 2007-03-10 15:08:56 +01:00
igor@olga.mysql.com
ec4593f59a Fixed bug #26830: a crash for the query with a subselect containing ROLLUP. 
Crash happened because the function get_best_group_min_max detected
joins with ROLLUP incorrectly.
 2007-03-10 02:47:47 -08:00
tomas@poseidon.mysql.com
52b975a1c8 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  poseidon.mysql.com:/home/tomas/mysql-5.0
 2007-03-10 11:49:04 +07:00
tomas@poseidon.mysql.com
9ef9bfddd4 disabling _new_ unstable test case 2007-03-10 11:46:20 +07:00
knielsen@ymer.(none)
24a816e813 BUG#27018: Partial blob write inside blob clobbers data after the write. 
When doing partial blob update with NdbBlob::writeData(), zero-padding
after the write was wrongly done, causing part of the old blob value
to be overwritten with zeros (or spaces for text field).

Fixed by only padding when needed (when writing at end of the blob).
 2007-03-09 23:37:33 +01:00
mjorgensen@production.mysql.com
6be30eec86 Merge bk-internal:/home/bk/mysql-5.0 
into  production.mysql.com:/usersnfs/mjorgensen/bktrees/mysql-5.0-build
 2007-03-09 23:01:12 +01:00
evgen@moonbone.local
04f5c46d5d Bug#22331: Wrong WHERE in EXPLAIN EXTENDED when all expressions were optimized 
away.

Additional fix for bug#22331. Now Item_field prints its value in the case of
the const field.
 2007-03-10 00:29:02 +03:00
istruewing@chilla.local
0c77069ca6 Merge chilla.local:/home/mydev/mysql-4.1-bug25673 
into  chilla.local:/home/mydev/mysql-5.0-bug25673
 2007-03-09 16:40:30 +01:00
istruewing@chilla.local
af17853d5e Bug#25673 - spatial index corruption, error 126 incorrect key file for table 
Fixed a compiler warning, deteced by pushbuild only.
 2007-03-09 16:19:42 +01:00
tomas@poseidon.mysql.com
6cb0c79c06 Merge poseidon.mysql.com:/home/tomas/mysql-5.0-ndb-clean 
into  poseidon.mysql.com:/home/tomas/mysql-5.0
 2007-03-09 20:39:59 +07:00
tomas@poseidon.mysql.com
e28ea98aab Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca 
into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb-clean
 2007-03-09 20:36:04 +07:00
tomas@poseidon.mysql.com
839f582969 added error code for failing send signal and timeout waiting for node failure 
added error code for failing send signal and timeout waiting for node failure
 2007-03-09 20:34:00 +07:00
gkodinov/kgeorge@magare.gmz
9625f2e902 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B26281-5.0-opt
 2007-03-09 14:48:19 +02:00
gkodinov/kgeorge@magare.gmz
86cba48b8f Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B26281-5.0-opt
 2007-03-09 13:05:41 +02:00
gkodinov/kgeorge@magare.gmz
740a5fd7fe Bug #26281: 
Fixed boundry checks in the INSERT() function:
 were one off.
 2007-03-09 12:47:12 +02:00
igor@olga.mysql.com
e10d74cff9 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/mysql-5.0-opt
 2007-03-09 02:45:17 -08:00
tomas@poseidon.mysql.com
0a6f51075a Merge poseidon.mysql.com:/home/tomas/mysql-5.0-ndb-clean 
into  poseidon.mysql.com:/home/tomas/mysql-5.0
 2007-03-09 17:28:38 +07:00
igor@olga.mysql.com
6f4da47843 Merge olga.mysql.com:/home/igor/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug26661
 2007-03-09 01:50:17 -08:00
igor@olga.mysql.com
96cfd5ab91 Fixed bug #26661: crash when order by clause in a union 
construct references invalid name.
Derived tables currently cannot use outer references.
Thus there is no outer context for them.
The 4.1 code takes this fact into account while the 
Item_field::fix_outer_field code of 5.0 lost the check that blocks
any attempts to resolve names in outer context for derived tables.
 2007-03-09 01:45:32 -08:00
holyfoot/hf@mysql.com/hfmain.(none)
2b1179ad07 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt
 2007-03-09 13:44:43 +04:00
tomas@poseidon.mysql.com
322b535a32 Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca 
into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb-clean
 2007-03-09 16:40:19 +07:00
tomas@poseidon.mysql.com
9b1281bb9a ndb single user basic test 2007-03-09 16:39:13 +07:00
holyfoot/hf@mysql.com/hfmain.(none)
60e0dceae8 Merge mysql.com:/home/hf/work/mrg/mysql-4.1-opt 
into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt
 2007-03-09 13:39:03 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
4752db40e8 aftermerge fix 2007-03-09 13:37:06 +04:00
tomas@poseidon.mysql.com
97683c4a98 Merge poseidon.mysql.com:/home/tomas/mysql-5.0-ndb-clean 
into  poseidon.mysql.com:/home/tomas/mysql-5.0
 2007-03-09 15:50:21 +07:00
tomas@poseidon.mysql.com
56442970a0 Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca 
into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb-clean
 2007-03-09 15:38:44 +07:00
tomas@poseidon.mysql.com
b8fda36478 Bug #25275 SINGLE USER MODE prevents ALTER on non-ndb tables for other mysqld nodes 
- correction of part 1
    add ndb_waiter option to wait for single user mode
 2007-03-09 15:37:10 +07:00
istruewing@chilla.local
c029dbecf7 Merge chilla.local:/home/mydev/mysql-4.1-bug25673 
into  chilla.local:/home/mydev/mysql-5.0-bug25673
 2007-03-08 19:23:36 +01:00
istruewing@chilla.local
90f23116e2 Bug#25673 - spatial index corruption, error 126 incorrect key file for table 
After backport fix.
Added forgotten DBUG_RETURNs, which was detected in 5.1 only.
 2007-03-08 19:22:43 +01:00