mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 07:14:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
48616 commits 2776 branches 343 tags 1.6 GiB
Commit graph

48616 commits

This branch
This branch
All branches
Author SHA1 Message Date
tsmith@ramayana.hindu.god
2bc5179c5a Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/jul24/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/jul24/51
 2007-07-24 18:28:23 -06:00
tsmith@ramayana.hindu.god
8a671513da Merge ramayana.hindu.god:/home/tsmith/m/bk/51 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/jul24/51
 2007-07-24 16:16:16 -06:00
tsmith@ramayana.hindu.god
9524c9670d Merge ramayana.hindu.god:/home/tsmith/m/bk/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/jul24/50
 2007-07-24 16:12:23 -06:00
joerg@trift2.
8b5f22a0c3 Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-07-21 12:36:37 +02:00
kent@kent-amd64.(none)
9d247f296a Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/kent/bk/tmp3/mysql-5.0-build
 2007-07-21 01:53:19 +02:00
kent@kent-amd64.(none)
60b78f9f1a Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/kent/bk/tmp3/mysql-5.1-build
 2007-07-21 01:52:15 +02:00
gshchepa/uchum@gleb.loc
27f11688da Merge gleb.loc:/home/uchum/work/bk/5.0-opt 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-07-21 02:25:39 +05:00
evgen@moonbone.local
e50e8c94fc Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  moonbone.local:/mnt/gentoo64/work/29898-bug-5.0-opt-mysql
 2007-07-20 22:05:20 +04:00
joerg@trift-lap.none
00ab6d84cf Merge trift-lap.none:/MySQL/M50/push-5.0 
into  trift-lap.none:/MySQL/M51/push-5.1
 2007-07-20 13:53:52 +02:00
joerg@trift-lap.none
1a86cbd26f Merge trift-lap.none:/MySQL/M50/bug14151-5.0 
into  trift-lap.none:/MySQL/M50/push-5.0
 2007-07-20 13:35:23 +02:00
joerg@trift-lap.none
62c0418e73 Merge trift-lap.none:/MySQL/M51/bug14151-5.1 
into  trift-lap.none:/MySQL/M51/push-5.1
 2007-07-20 13:32:41 +02:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
4a2a13158e after-merge fixup 2007-07-20 15:37:42 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
6881c96eb3 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/home/ram/work/b28125/b28125.5.0
 2007-07-20 15:23:35 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
8e22343c58 after-merge fixup 2007-07-20 15:19:37 +05:00
df@pippilotta.erinye.com
3c2baf3e66 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-07-20 11:41:25 +02:00
ramil/ram@ramil.myoffice.izhnet.ru
93f894903e Merge mysql.com:/home/ram/work/mysql-5.1-maint 
into  mysql.com:/home/ram/work/b28125/b28125.5.1
 2007-07-20 14:08:10 +05:00
df@pippilotta.erinye.com
a51493a4a0 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0.46 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2007-07-20 09:20:48 +02:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
7c156aa286 after-merge fixup. 2007-07-20 11:45:08 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
0d3e93b174 Merge mysql.com:/home/ram/work/b29923/b29923.5.0 
into  mysql.com:/home/ram/work/b29923/b29923.5.1
 2007-07-20 11:40:44 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
4a52b5c885 Fixed #29923: federated.test fails in 5.0-maint, 5.1-maint 
Result adjusted.
 2007-07-20 11:23:38 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
e6550a65f4 Merge mysql.com:/home/ram/work/b28125/b28125.5.0 
into  mysql.com:/home/ram/work/b28125/b28125.5.1
 2007-07-20 10:30:40 +05:00
gshchepa/uchum@gleb.loc
d53374a0ea Merge gleb.loc:/home/uchum/work/bk/5.0-opt 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-07-20 05:23:33 +05:00
gshchepa/uchum@gleb.loc
95d43074cc Merge gleb.loc:/home/uchum/work/bk/5.1 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-07-20 04:21:46 +05:00
gshchepa/uchum@gleb.loc
c06d233d4d Merge gleb.loc:/home/uchum/work/bk/5.0 
into  gleb.loc:/home/uchum/work/bk/5.0-opt
 2007-07-20 04:15:50 +05:00
gshchepa/uchum@gleb.loc
c404cd7c9c Merge gleb.loc:/home/uchum/work/bk/5.0-opt 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-07-20 04:04:57 +05:00
df@pippilotta.erinye.com
9217908ddd Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0.44 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0.46
 2007-07-19 23:30:26 +02:00
df@pippilotta.erinye.com
cccecb833b BUG#20815 Errno 12 on Windows after 197 connections 2007-07-19 23:06:34 +02:00
dkatz@damien-katzs-computer.local
216c669b7e Merge damien-katzs-computer.local:/Users/dkatz/mysql51 
into  damien-katzs-computer.local:/Users/dkatz/51
 2007-07-19 17:03:50 -04:00
evgen@moonbone.local
08b9103d71 Bug#29898: Item_date_typecast::val_int doesn't reset the null_value flag. 
The Item_date_typecast::val_int function doesn't reset null_value flag.
This makes all values that follows the first null value to be treated as nulls
and led to a wrong result.

Now the Item_date_typecast::val_int function correctly sets the null_value flag
for both null and non-null values.
 2007-07-20 00:06:35 +04:00
cmiller@zippy.cornsilk.net
65c59c1d04 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26909/my51-bug26909 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2007-07-19 15:37:43 -04:00
cmiller@zippy.cornsilk.net
784dff6da3 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26909/my50-bug26909 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug26909/my51-bug26909
 2007-07-19 15:34:40 -04:00
cmiller@zippy.cornsilk.net
773861ded7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2007-07-19 15:33:27 -04:00
cmiller@zippy.cornsilk.net
e49d38a382 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26909/my50-bug26909 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2007-07-19 15:30:49 -04:00
dkatz@damien-katzs-computer.local
887a11071f Bug #29910 Sporadic test failure in status.test 2007-07-19 15:25:54 -04:00
holyfoot/hf@mysql.com/hfmain.(none)
c4b12955b3 mysql_client_test fixed 2007-07-20 00:04:30 +05:00
joerg@trift2.
960e895d1d Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-07-19 20:22:29 +02:00
joerg@trift2.
7c4f905d55 Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-07-19 20:16:27 +02:00
joerg@trift2.
f2dee68c3d Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-07-19 20:04:35 +02:00
evgen@moonbone.local
7a2491871d Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  moonbone.local:/mnt/gentoo64/work/29850-bug-5.0-opt-mysql
 2007-07-19 21:40:12 +04:00
dkatz@damien-katzs-computer.local
d81c502b8f Merge damien-katzs-computer.local:/Users/dkatz/mysql50 
into  damien-katzs-computer.local:/Users/dkatz/mysql51
 2007-07-19 13:36:37 -04:00
dkatz@damien-katzs-computer.local
8ca3dc3311 Merge damien-katzs-computer.local:/Users/dkatz/mysql50 
into  damien-katzs-computer.local:/Users/dkatz/50
 2007-07-19 13:27:31 -04:00
evgen@moonbone.local
934089a82b Bug#29850: Wrong charset of GROUP_CONCAT result when the select employs 
a temporary table.

The result string of the Item_func_group_concat wasn't initialized in the 
copying constructor of the Item_func_group_concat class. This led to a
wrong charset of GROUP_CONCAT result when the select employs a temporary
table.

The copying constructor of the Item_func_group_concat class now correctly
initializes the charset of the result string.
 2007-07-19 20:21:23 +04:00
joerg@trift-lap.none
518992b829 After-merge fix for bug#14151. 2007-07-19 18:05:55 +02:00
holyfoot/hf@hfmain.(none)
db2b40b426 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  mysql.com:/home/hf/work/29687/my51-29687
 2007-07-19 21:03:26 +05:00
holyfoot/hf@hfmain.(none)
1657b9e356 Merge bk@192.168.21.1:mysql-5.1-opt 
into  mysql.com:/home/hf/work/29687/my51-29687
 2007-07-19 21:02:11 +05:00
holyfoot/hf@hfmain.(none)
cd70db6656 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/home/hf/work/29687/my50-29687
 2007-07-19 21:01:58 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
d0272fe1d5 test case for memory leak added 2007-07-19 20:59:11 +05:00
holyfoot/hf@hfmain.(none)
02c81671ce Merge bk@192.168.21.1:mysql-5.0-opt 
into  mysql.com:/home/hf/work/29687/my50-29687
 2007-07-19 20:59:08 +05:00
holyfoot/hf@hfmain.(none)
a49bc17fe8 Merge mysql.com:/home/hf/work/29687/my50-29687 
into  mysql.com:/home/hf/work/29687/my51-29687
 2007-07-19 20:58:04 +05:00
tsmith@bk-internal.mysql.com
4223b12523 Merge bk-internal.mysql.com:/data0/bk/tsmith-tmp/mysql-5.0-maint 
into  bk-internal.mysql.com:/data0/bk/tsmith-tmp/mysql-5.1-maint
 2007-07-19 17:44:35 +02:00