mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 14:54:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
43068 commits 2785 branches 343 tags 1.6 GiB
Commit graph

19704 commits

Author SHA1 Message Date
tomas@poseidon.mysql.com
d56756de0a Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-02-08 00:00:14 +07:00
msvensson@pilot.mysql.com
764d84852e Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-07 15:11:19 +01:00
msvensson@pilot.mysql.com
eee38feda8 Avoid problem with "noinst_HEADERS" being sucked into "mysqld_LDADD" if openssl_libs and yassl_libs are empty strings 2007-02-07 15:11:03 +01:00
mskold/marty@mysql.com/linux.site
5df38bfc3e Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
 2007-02-07 12:29:34 +01:00
mskold/marty@linux.site
65c9dcc011 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2007-02-07 12:06:13 +01:00
mskold/marty@linux.site
8dd443f986 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2007-02-07 11:44:41 +01:00
mskold/marty@linux.site
fd0232b226 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
 2007-02-07 11:40:43 +01:00
tomas@poseidon.mysql.com
7e29b2fed0 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-02-07 17:37:10 +07:00
mskold/marty@mysql.com/linux.site
2d0bd82a06 NdbScanOperation.hpp, NdbScanOperation.cpp, ha_ndbcluster.cc: 
bug#25821  Excessive partition pruning for multi-range index scan in NDB API: added multi_range error checking in end_of_bound
ha_ndbcluster.h:
  Removed stray mthod declaration
 2007-02-07 11:36:34 +01:00
tomas@poseidon.mysql.com
2ab5d67932 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-02-07 17:01:31 +07:00
mskold/marty@linux.site
bb8924cf39 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2007-02-07 09:52:10 +01:00
igor@olga.mysql.com
5ed805bfd6 Fixed bug #26124: SELECT from a view wrapper over a table 
with a column of the DATETIME type could return a wrong 
result set if the WHERE clause included a BETWEEN condition
on the column.
Fixed the method Item_func_between::fix_length_and_dec
where the aggregation type for BETWEEN predicates calculated
incorrectly if the first argument was a view column of the
DATETIME type.
 2007-02-07 00:18:36 -08:00
malff/marcsql@weblab.(none)
6cde77e1ca Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-12976_b 
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-12976-merge
 2007-02-06 16:10:06 -07:00
malff/marcsql@weblab.(none)
b5f8b6363d Bug#12976 (stored procedures local variables of type bit) 
Before this change, a local variables in stored procedures / stored functions
or triggers, when declared with a type of bit(N), would not evaluate their
value properly.

The problem was that the data was incorrectly typed as a string,
causing for example bit b'1', implemented as a byte 0x01, to be interpreted
as a string starting with the character 0x01. This later would cause
implicit conversions to integers or booleans to fail.

The root cause of this problem was an incorrect translation between field
types, like bit(N), and internal types used when representing values in Item
objects.

Also, before this change, the function HEX() would sometime print extra "0"
characters when invoked with bit(N) values.

With this fix, the type translation (sp_map_result_type, sp_map_item_type)
has been changed so that bit(N) fields are represented with integer values.

A consequence is that, for the function HEX(), when called with a stored
procedure local variable of type bit(N) as argument, HEX() is provided with an
integer instead of a string, and therefore does not print "0" padding.

A test case for Bug 12976 was present in the test suite, and has been updated.
 2007-02-06 16:01:22 -07:00
mskold/marty@linux.site
6aee9eedf7 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2007-02-06 23:48:53 +01:00
mskold/marty@linux.site
b13e5b8ee9 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
 2007-02-06 23:42:24 +01:00
mskold/marty@mysql.com/linux.site
0446aa9cbd Fix for bug#25821 Excessive partition pruning for multi-range index scan in NDB API: don't set distribution key if multi_range 2007-02-06 23:06:58 +01:00
evgen@moonbone.local
968369906e Bug#19978: INSERT .. ON DUPLICATE erroneously reports some records were 
updated.

INSERT ... ON DUPLICATE KEY UPDATE reports that a record was updated when
the duplicate key occurs even if the record wasn't actually changed
because the update values are the same as those in the record.

Now the compare_record() function is used to check whether the record was
changed and the update of a record reported only if the record differs
from the original one.
 2007-02-07 00:46:03 +03:00
svoj@mysql.com/april.(none)
db8a7b513c Excluded wrongly merged changeset. 2007-02-07 01:37:21 +04:00
msvensson@pilot.mysql.com
07dd9a61c1 Bug#26015 valgrind warning PollGuard::unlock_and_signal()/NdbCondition_Destroy 
- Add variable "ndbcluster_binlog_terminating" and use that to signal
the cluster binlog thread it's time to shutdown. This allows
exact control of when the thread shutdown, previous implementation 
would start shutdown of the thread as soon as the mysqld started
shutdown. Now we will shutdown cluster binlog thread 
in 'ndbcluster_binlog_end'
 2007-02-06 22:06:13 +01:00
msvensson@pilot.mysql.com
6050927f76 Merge bk-internal:/home/bk/mysql-5.1-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-06 20:24:42 +01:00
msvensson@pilot.mysql.com
5959ca40d7 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-06 20:23:58 +01:00
msvensson@pilot.mysql.com
d9439eda43 Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-06 15:52:33 +01:00
msvensson@pilot.mysql.com
69510b7089 Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-06 15:50:53 +01:00
msvensson@pilot.mysql.com
6ba81ba5eb Merge 192.168.0.10:mysql/mysql-5.1-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-06 15:50:24 +01:00
msvensson@neptunus.(none)
e4001b3b5a Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2007-02-06 15:46:17 +01:00
msvensson@pilot.mysql.com
d018030b20 Merge 192.168.0.10:mysql/mysql-5.0-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-06 14:48:22 +01:00
msvensson@neptunus.(none)
ede3afe470 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2007-02-06 14:45:08 +01:00
msvensson@pilot.mysql.com
256cb08ba9 Merge 192.168.0.10:mysql/mysql-4.1-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
 2007-02-06 14:44:05 +01:00
msvensson@neptunus.(none)
6502f4300b Merge neptunus.(none):/home/msvensson/mysql/my41-nmj 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2007-02-06 14:42:40 +01:00
msvensson@pilot.mysql.com
f6d3ac52dd Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-06 14:32:08 +01:00
msvensson@pilot.mysql.com
36207f8088 Merge bk-internal:/home/bk/mysql-4.1-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
 2007-02-06 14:27:43 +01:00
msvensson@pilot.mysql.com
3f06339d7c Merge 192.168.0.10:mysql/mysql-4.1-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
 2007-02-06 14:27:00 +01:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
878759b218 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/home/ram/work/b23782/b23782.5.0
 2007-02-06 17:18:43 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
8222657a1c Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/home/ram/work/b23782/b23782.5.1
 2007-02-06 17:16:39 +04:00
msvensson@neptunus.(none)
8c37b28c0b Bug#8983 one place that isn't strict-aliasing-safe 
- Backport fix from 5.0
 2007-02-06 14:07:40 +01:00
ramil/ram@myoffice.izhnet.ru
d5b11a5e7a Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/usr/home/ram/work/bug23938/my51-bug23938
 2007-02-06 17:06:19 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
61ec25116e Merge mysql.com:/home/ram/work/b23782/b23782.5.0 
into  mysql.com:/home/ram/work/b23782/b23782.5.1
 2007-02-06 15:59:37 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
85f2f924fd Fix for bug #23782: Stored procedures: crash if variable in procedure 
analyse

We have to call fix_fields() for procedure analyse' arguments as they may   
not be
fixed in some circumstances.

(as the crash appears when mysqld starts skipping binlog, a test case
will be added when we can --skip-bin-log in -master.opt)
 2007-02-06 15:58:40 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
d69e5063b2 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  mysql.com:/usr/home/ram/work/bug23938/my41-bug23938
 2007-02-06 14:58:07 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
a4bbd5bf76 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/usr/home/ram/work/bug23938/my50-bug23938
 2007-02-06 14:28:46 +04:00
ramil/ram@myoffice.izhnet.ru
6fea92a146 Merge mysql.com:/usr/home/ram/work/bug23938/my50-bug23938 
into  mysql.com:/usr/home/ram/work/bug23938/my51-bug23938
 2007-02-06 14:20:46 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
f103fde258 Merge mysql.com:/usr/home/ram/work/bug23938/my41-bug23938 
into  mysql.com:/usr/home/ram/work/bug23938/my50-bug23938
 2007-02-06 13:57:20 +04:00
gkodinov/kgeorge@macbook.gmz
5092f7ab26 Bug #22344: InnoDB keys act strange on datetime vs timestamp comparison 
Ignoring error codes from type conversion allows default (wrong) values to
 go unnoticed in the formation of index search conditions.
 Fixed by correctly checking for conversion errors.
 2007-02-06 11:08:57 +02:00
tomas@poseidon.mysql.com
3fc4f75ec7 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-02-06 15:00:19 +07:00
tomas@poseidon.mysql.com
54bd795f12 Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-cga 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-02-06 12:45:42 +07:00
tomas@poseidon.mysql.com
bbe3008a49 Bug #26021 - ndb: valgrind warning handle_trailing_share/ndbcluster_free_share invalid read 2007-02-06 12:40:26 +07:00
tomas@poseidon.mysql.com
77ee8eab9c Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-cga 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-02-06 00:10:56 +07:00
tomas@poseidon.mysql.com
addb495339 Bug #26021 valgrind warning handle_trailing_share/ndbcluster_free_share invalid read 
- revert bugfix, needs more work
 2007-02-06 00:09:45 +07:00
kroki/tomash@moonlight.home
5dc4f103ae Merge moonlight.home:/home/tomash/src/mysql_ab/mysql-5.0-bug25897 
into  moonlight.home:/home/tomash/src/mysql_ab/mysql-5.1
 2007-02-05 18:29:36 +03:00