mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-25 00:04:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
39101 commits 2774 branches 343 tags 1.6 GiB
Commit graph

39101 commits

This branch
This branch
All branches
Author SHA1 Message Date
msvensson@neptunus.(none)
cc0f26c83f Merge bk-internal:/home/bk/mysql-4.1-rpl 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-10-03 11:20:37 +02:00
jani@ua141d10.elisa.omakaista.fi
7a6b1ca963 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
 2006-10-03 12:20:23 +03:00
msvensson@neptunus.(none)
ffeaf3eb85 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-10-03 11:19:00 +02:00
bar@mysql.com/bar.intranet.mysql.r18.ru
1dc22a833b Merge mysql.com:/usr/home/bar/mysql-4.1-rpl.b8663 
into  mysql.com:/usr/home/bar/mysql-5.0-rpl
 2006-10-03 14:17:12 +05:00
bar@mysql.com/bar.intranet.mysql.r18.ru
5c38da179c Bug#22052 Trailing spaces are not removed from UNICODE fields in an index 
Fix: using charset-aware functions cs->cset->lengthsp() and cs->cset->fill()
  instead of single byte code which is not UCS2 compatible.
 2006-10-03 14:11:57 +05:00
kroki/tomash@moonlight.intranet
3910542096 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-real 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-real-bug21726
 2006-10-03 12:43:14 +04:00
msvensson@neptunus.(none)
ca21b57992 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-10-03 09:28:44 +02:00
msvensson@neptunus.(none)
7f21400c52 Merge bk-internal:/home/bk/mysql-5.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-10-03 09:22:49 +02:00
msvensson@shellback.(none)
9a8bc01f8c Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-03 09:05:34 +02:00
bar@mysql.com/bar.intranet.mysql.r18.ru
40bcedf4e3 Merge mysql.com:/usr/home/bar/mysql-4.1-rpl.b8663 
into  mysql.com:/usr/home/bar/mysql-5.0-rpl
 2006-10-03 12:03:35 +05:00
msvensson@shellback.(none)
b08195785c Merge bk-internal:/home/bk/mysql-5.0-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-03 09:03:28 +02:00
msvensson@shellback.(none)
60f9a9a8aa Merge bk-internal:/home/bk/mysql-4.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-10-03 08:59:00 +02:00
bar@mysql.com/bar.intranet.mysql.r18.ru
72ad606ece Merge mysql.com:/usr/home/bar/mysql-4.1.b8663 
into  mysql.com:/usr/home/bar/mysql-4.1-rpl
 2006-10-03 11:53:01 +05:00
ramil/ram@mysql.com/myoffice.izhnet.ru
5b491de247 after-merge fix: warning adjusted. 2006-10-03 11:05:25 +05:00
dlenev@mockturtle.local
c30b6eafac Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mockturtle.local:/home/dlenev/src/mysql-4.1-rt-merge
 2006-10-03 08:19:06 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
f2a3f1a679 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/usr/home/ram/work/bug22271/my50-bug22271
 2006-10-03 09:00:03 +05:00
ramil/ram@myoffice.izhnet.ru
b1463a4b42 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/usr/home/ram/work/bug22271/my51-bug22271
 2006-10-03 08:56:19 +05:00
ramil/ram@myoffice.izhnet.ru
9241230b69 Merge mysql.com:/usr/home/ram/work/bug22271/my50-bug22271 
into  mysql.com:/usr/home/ram/work/bug22271/my51-bug22271
 2006-10-03 08:51:59 +05:00
scottlee@calico.site
3eaee36070 Back port change from 5.1 that adds the Windows database files to the source package. 
This is needed for WiX pacakging.
 2006-10-02 23:05:52 -04:00
msvensson@shellback.(none)
5126dcc878 Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-03 01:04:18 +02:00
msvensson@shellback.(none)
3bed246481 Merge shellback.(none):/home/msvensson/mysql/mysql-5.0 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-03 01:01:06 +02:00
msvensson@shellback.(none)
3f8686514f Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0
 2006-10-03 00:58:13 +02:00
msvensson@shellback.(none)
600586c680 Merge bk-internal:/home/bk/mysql-4.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-10-03 00:51:23 +02:00
msvensson@shellback.(none)
b975b4a793 Add ATTRIBUTE_FORMAT_FPTR macro for setting format specifier also on function pointers 
This was available from gcc 3.1, so diable it before that
Update m_ctype.h to use the new macro
 2006-10-03 00:48:26 +02:00
tsmith/tim@siva.hindu.god
1d5d5a1c4a Merge siva.hindu.god:/usr/home/tim/m/bk/40 
into  siva.hindu.god:/usr/home/tim/m/bk/41
 2006-10-02 16:18:42 -06:00
tsmith/tim@siva.hindu.god
65dd6e0c1e Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  siva.hindu.god:/usr/home/tim/m/bk/41
 2006-10-02 16:16:24 -06:00
tsmith/tim@siva.hindu.god
3e20a10899 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.0 
into  siva.hindu.god:/usr/home/tim/m/bk/40
 2006-10-02 16:13:58 -06:00
msvensson@neptunus.(none)
3da45a6da9 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-10-02 23:08:30 +02:00
mikael/pappa@dator5.(none)
1cdf82e012 BUG#18198: Partition function handling 
Fixes of after review fixes
 2006-10-02 15:52:29 -04:00
tsmith/tim@siva.hindu.god
4c6dc3c461 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  siva.hindu.god:/usr/home/tim/m/bk/wl3516/51
 2006-10-02 13:42:30 -06:00
dlenev@mockturtle.local
cc9ab7d0b7 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mockturtle.local:/home/dlenev/src/mysql-5.1-rt-merge
 2006-10-02 23:40:56 +04:00
tsmith/tim@siva.hindu.god
ae24bc21de Merge siva.hindu.god:/usr/home/tim/m/bk/50 
into  siva.hindu.god:/usr/home/tim/m/bk/wl3516/50
 2006-10-02 13:29:55 -06:00
kroki/tomash@moonlight.intranet
b9173c1023 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-real 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-real-bug21726
 2006-10-02 23:17:40 +04:00
dlenev@mockturtle.local
8eb4401c59 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mockturtle.local:/home/dlenev/src/mysql-5.0-rt-merge
 2006-10-02 22:53:10 +04:00
dlenev@mockturtle.local
0868629129 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mockturtle.local:/home/dlenev/src/mysql-5.1-rt-merge
 2006-10-02 21:41:35 +04:00
msvensson@neptunus.(none)
14186cbdca Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-02 18:46:41 +02:00
kroki/tomash@moonlight.intranet
9402038287 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug21081
 2006-10-02 18:01:32 +04:00
kroki/tomash@moonlight.intranet
f732270e5b Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug21081
 2006-10-02 18:01:04 +04:00
lars/lthalmann@dl145j.mysql.com
9b17d0d332 Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 
into  mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
 2006-10-02 15:33:15 +02:00
bteam/mysqldev@mysql.com/production.mysql.com
d74621142b Raise version number 2006-10-02 15:15:16 +02:00
mats@romeo.(none)
d1b9686245 BUG#19459 (BINLOG RBR command does not lock tables correctly causing 
crash for, e.g., NDB):
Adding new function my_b_copy_to_file() to copy an IO_CACHE to a file.
 2006-10-02 15:08:40 +02:00
mats@romeo.(none)
7b85fb5c13 BUG#19459 (BINLOG RBR command does not lock tables correctly causing 
crash for, e.g., NDB):
Submitting patch to base64_decode() adding extra parameter.
 2006-10-02 15:05:05 +02:00
kroki/tomash@moonlight.intranet
8f3f277642 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-real-bug21726
 2006-10-02 17:00:39 +04:00
bteam/mysqldev@mysql.com/production.mysql.com
36a28d1f37 Merge mysqldev@bk-internal:/home/bk/mysql-5.0-engines 
into  mysql.com:/data0/mysqldev/my/mysql-5.0-release
 2006-10-02 14:26:06 +02:00
lars/lthalmann@dl145h.mysql.com
4f2b786bf3 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
 2006-10-02 14:21:49 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
a8e845a6d2 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
 2006-10-02 14:19:51 +02:00
msvensson@neptunus.(none)
d5ad8ff4a2 Remove faulty merge 2006-10-02 14:05:36 +02:00
mats@romeo.(none)
c8ec10e4a4 Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl 
into  romeo.(none):/home/bk/fix-mysql-5.1-new-rpl
 2006-10-02 14:03:54 +02:00
msvensson@neptunus.(none)
cb0a874c11 When compiling with qcc on QNC the define __GNUC__will be set although it doesn't support full GNU syntax 
- disable __attribute__ when using qcc
 2006-10-02 13:53:10 +02:00
msvensson@neptunus.(none)
c3a1980e16 Remove faulty merge causing ctype_utf8 failure 2006-10-02 13:47:18 +02:00