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

37050 commits

This branch
This branch
All branches
Author SHA1 Message Date
igor@olga.mysql.com
63ab91090d Fixed bug #27130. If the third argument of the function SUBSTR was 
represented by an expression of the type UNSIGNED INT and this 
expression was evaluated to 0 then the function erroneously returned
the value of the first argument instead of an empty string. 

This problem was introduced by the patch for bug 10963.

The problem has been resolved by a proper modification of the code of
Item_func_substr::val_str.
 2007-06-17 11:23:19 -07:00
tomas@whalegate.ndb.mysql.com
8eb940de27 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-engines
 2007-06-17 19:52:01 +02:00
tomas@whalegate.ndb.mysql.com
b5f30a99f9 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-06-17 19:50:07 +02:00
tomas@whalegate.ndb.mysql.com
9c5183ace9 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-engines
 2007-06-17 19:28:01 +02:00
tomas@whalegate.ndb.mysql.com
9e3c14fae3 BUG#27640 
- correct test and result file
 2007-06-17 19:27:20 +02:00
tomas@whalegate.ndb.mysql.com
95ed412809 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-engines
 2007-06-17 16:26:35 +02:00
ramil/ram@ramil.myoffice.izhnet.ru
e63f983970 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/home/ram/work/b28144/b28144.5.0
 2007-06-17 10:10:36 +05:00
gshchepa/uchum@gleb.loc
dac7ce2d12 bigint.test: 
Updated test case for bug #28625.
 2007-06-16 17:00:29 +05:00
istruewing@chilla.local
70600c15d8 Merge chilla.local:/home/mydev/mysql-5.0-amain 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2007-06-16 11:34:21 +02:00
gshchepa/uchum@gleb.loc
3d4e75d583 Merge gleb.loc:/home/uchum/work/bk/5.0-opt 
into  gleb.loc:/home/uchum/work/bk/5.0-opt-28625
 2007-06-16 13:49:26 +05:00
gshchepa/uchum@gleb.loc
8f09a374ea Fixed bug #28625: 
DECIMAL column was used instead of BIGINT for the minimal possible
BIGINT (-9223372036854775808).

The Item_func_neg::fix_length_and_dec has been adjusted to
to inherit the type of the argument in the case when it's an 
Item_int object whose value is equal to LONGLONG_MIN.
 2007-06-16 13:05:07 +05:00
df@pippilotta.erinye.com
872c090b83 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2007-06-16 06:19:47 +02:00
df@pippilotta.erinye.com
b2b965b534 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2007-06-16 06:16:00 +02:00
tsmith@quadxeon.mysql.com
891116551e binlog.result, binlog.test: 
Post-merge fix: replace xid=* with XID to isolate from number of transactions
 2007-06-15 23:57:53 +02:00
malff/marcsql@weblab.(none)
4b427bde82 Fixed warnings raised from mysqltest (unknown -- commands) 2007-06-15 11:15:22 -06:00
malff/marcsql@weblab.(none)
e20232cf63 manual merge 2007-06-15 10:59:40 -06:00
tsmith@quadxeon.mysql.com
2095627468 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun14/50
 2007-06-15 18:58:07 +02:00
tsmith@quadxeon.mysql.com
73035c274f Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun14/50
 2007-06-15 17:59:04 +02:00
istruewing@chilla.local
f95d0b0f78 Merge chilla.local:/home/mydev/mysql-4.1-axmrg 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2007-06-15 17:47:50 +02:00
istruewing@chilla.local
676ea58252 Merge chilla.local:/home/mydev/mysql-5.0-amain 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2007-06-15 17:47:02 +02:00
istruewing@chilla.local
dceae35549 Merge chilla.local:/home/mydev/mysql-5.0-ateam 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2007-06-15 17:45:50 +02:00
malff/marcsql@weblab.(none)
b80692b9ff Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-base 
into  weblab.(none):/home/marcsql/TREE/mysql-5.0-rt-merge
 2007-06-15 08:56:40 -06:00
istruewing@chilla.local
52200be6d0 Merge chilla.local:/home/mydev/mysql-4.1-amain 
into  chilla.local:/home/mydev/mysql-4.1-axmrg
 2007-06-15 16:24:43 +02:00
cmiller@zippy.cornsilk.net
08ec6652bc Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2007-06-15 08:57:57 -04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
9c9464d566 Fix for bug #28144: "Slave_IO_Running" differs in replication tests 
Problem: show slave status may return different Slave_IO_Running values running some tests.
Fix: wait for a certain slave state if needed to get tests more predictable.
 2007-06-15 16:09:28 +05:00
df@pippilotta.erinye.com
c64fca9e24 follow-up fix 2007-06-15 11:28:15 +02:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
44c3524026 Backport of 
mysql-test/include/wait_for_slave_io_to_stop.inc
mysql-test/include/wait_for_slave_sql_to_stop.inc
mysql-test/include/wait_for_slave_to_start.inc
mysql-test/include/wait_for_slave_to_stop.inc
from 5.1
 2007-06-15 13:53:36 +05:00
df@pippilotta.erinye.com
973c541b5c Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
 2007-06-15 09:36:05 +02:00
df@pippilotta.erinye.com
b1b1c8adc9 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
 2007-06-15 09:25:53 +02:00
georg@bing.site
7c02fbd147 Added yassl and taocrypt sources to mysqlclientlib 2007-06-15 09:18:58 +02:00
bar@mysql.com/bar.myoffice.izhnet.ru
caf85332ba Bug#28862 Extended Latin1 characters get lost in CVS engine 
Problem: Temporary buffer which is used for quoting and escaping
  was initialized to character set utf8, and thus didn't allow
  to store data in other character sets.
  Fix: changing character set of the buffer to be able to
  store any arbitrary sequence of bytes.
 2007-06-15 11:19:35 +05:00
igor@olga.mysql.com
0f0d4720b8 Fixed bug #27932: the function LOCATE returned NULL if any 
of its arguments was evaluated to NULL, while the predicate
LOCATE(str,NULL) IS NULL erroneously was evaluated to FALSE.

This happened because the Item_func_locate::fix_length_and_dec
method by mistake set the value of the maybe_null flag for 
the function item to 0. In consequence of this the function 
was considered as the one that could not ever return NULL.
 2007-06-14 18:55:07 -07:00
cmiller@zippy.cornsilk.net
85caa3540e Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2007-06-14 18:17:26 -04:00
tsmith@quadxeon.mysql.com
87fdad4ce8 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun14/50
 2007-06-14 23:23:30 +02:00
mskold/marty@linux.site
dea70c74dd Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
 2007-06-14 21:58:45 +02:00
joerg@trift2.
9ab46d0088 Merge trift2.:/MySQL/M41/push-4.1 
into  trift2.:/MySQL/M50/push-5.0
 2007-06-14 21:34:41 +02:00
joerg@trift2.
b5c9cab55c Merge trift2.:/MySQL/M41/mysql-4.1 
into  trift2.:/MySQL/M41/push-4.1
 2007-06-14 21:27:33 +02:00
joerg@trift2.
ae1ff2e84c Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-06-14 21:25:10 +02:00
cmiller@zippy.cornsilk.net
d37e579411 Bug#21723: Should be able to dump core after setuid() under Linux 
In many cases, binaries can no longer dump core after calling setuid().

Where the PR_SET_DUMPABLE macro is set, use the prctl() system call 
to tell the kernel that it's allowed to dump the core of the server.
 2007-06-14 14:24:59 -04:00
holyfoot/hf@hfmain.(none)
a877145db8 Merge mysql.com:/d2/hf/mrg/mysql-4.1-opt 
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
 2007-06-14 23:02:28 +05:00
tomas@whalegate.ndb.mysql.com
ad81e83c70 Bug #27640 backup id not displayed in the output of "ndb_mgm start backup wait completed" 
- correction, missing node id
 2007-06-14 18:40:32 +02:00
mskold/marty@linux.site
8945183fc3 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
 2007-06-14 16:21:52 +02:00
mskold/marty@mysql.com/linux.site
c41a4472c7 Bug#26342 auto_increment_increment AND auto_increment_offset REALLY REALLY anger NDB cluster, implemented support for auto_increment_offset and auto_increment_increment for Ndb, post review fix 2007-06-14 16:01:51 +02:00
gkodinov/kgeorge@magare.gmz
37deabacb2 Merge bk-internal:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/work/valgrind-errs-merge-5.0-opt
 2007-06-14 16:43:14 +03:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
ad88a849c8 Merge jhe@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/bug27640-5.0-ndb
 2007-06-14 20:45:12 +08:00
gkodinov/kgeorge@magare.gmz
78f477c9d9 corrected valgrind problems for bug 28505 and 28934 2007-06-14 15:38:52 +03:00
holyfoot/hf@hfmain.(none)
8ccc50b303 Merge bk@192.168.21.1:mysql-5.0 
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
 2007-06-14 16:41:10 +05:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
51fe11b494 Bug#27640, backup id not displayed in the output of "ndb_mgm start backup wait completed" 2007-06-14 19:40:44 +08:00
holyfoot/hf@mysql.com/hfmain.(none)
79062df3fb Merge bk@192.168.21.1:mysql-4.1 
into  mysql.com:/d2/hf/mrg/mysql-4.1-opt
 2007-06-14 16:35:46 +05:00
svoj@mysql.com/june.mysql.com
01c9419cec BUG#26976 - Missing table in merge not noted in related error msg + 
SHOW CREATE TABLE fails
Addition to the fix: report db name + table name instead of table path.
This solves embedded merge test failure.
 2007-06-14 16:18:01 +05:00