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
46685 commits 2774 branches 343 tags 1.6 GiB
Commit graph

2565 commits

Author SHA1 Message Date
lars@black.(none)
63c906f749 Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/home/bk/MERGE/mysql-5.1-merge
 2006-11-13 12:45:31 +01:00
mskold/marty@linux.site
6ad1b4f92c Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2006-11-10 11:38:54 +01:00
ted@ted.mysql.internal
1c8a6cfc37 Merge ted.mysql.internal:/home/ted/src/mysql/50-gca 
into  ted.mysql.internal:/home/ted/src/mysql/mysql-5.1-new-maint
 2006-11-10 07:23:42 +03:00
ted@ted.mysql.internal
bc9ca699fb Memory allocation bug fixed 2006-11-10 07:21:10 +03:00
tsmith@quadxeon.mysql.com
a7b142446f Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51
 2006-11-09 00:38:34 +01:00
msvensson@neptunus.(none)
f032a223b7 Fix warnings and NetWare compile failure 2006-11-09 00:17:22 +01:00
msvensson@neptunus.(none)
0ec6432636 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-08 23:24:16 +01:00
msvensson@neptunus.(none)
4dfbc712ed Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-08 22:54:22 +01:00
msvensson@neptunus.(none)
1437500c1b Pass location of charsets dir to mysqltest to avoid using the charsetdir locally installed on machine. 2006-11-08 22:53:40 +01:00
ted@ted.mysql.internal
09925858de Merge ted.mysql.internal:/home/ted/src/mysql/50-gca 
into  ted.mysql.internal:/home/ted/src/mysql/mysql-5.1-new-maint
 2006-11-08 05:47:44 +03:00
ted@ted.mysql.internal
3e6735e277 BUG#20100 fix: mysql_upgrade modified to also accept all 
the communication parameters from the command line
and pass 'em correctly to both mysqlcheck and mysql
 2006-11-08 05:45:50 +03:00
lars/lthalmann@dl145h.mysql.com
3776e9622b Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
 2006-11-07 19:26:31 +01:00
msvensson@neptunus.(none)
899dca14ee Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-11-03 17:53:10 +01:00
msvensson@neptunus.(none)
fa79d0fccb Fix DBUG_PRINT in mysqltest, the real value to print is in ds_cmd 2006-11-03 16:06:13 +01:00
cmiller@zippy.cornsilk.net
b074e13483 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-11-02 17:51:59 -05:00
msvensson@shellback.(none)
15835edddd Merge bk-internal:/home/bk/mysql-4.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-11-02 23:09:32 +01:00
cbell/Chuck@mysql_cab.
801f03381c BUG#23735 Changes to comments in code for explanation of fix. 2006-11-02 08:34:16 -05:00
ramil/ram@mysql.com/myoffice.izhnet.ru
9658dc9127 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  mysql.com:/usr/home/ram/work/bug22913/my41-bug22913
 2006-11-02 16:25:01 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
82ec5bd111 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/usr/home/ram/work/bug22913/my50-bug22913
 2006-11-02 16:20:52 +04:00
ramil/ram@myoffice.izhnet.ru
c8aa094849 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/usr/home/ram/work/bug22913/my51-bug22913
 2006-11-02 16:15:01 +04:00
ramil/ram@myoffice.izhnet.ru
9b99d8c747 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/usr/home/ram/work/bug22913/my51-bug22913
 2006-11-02 14:42:45 +04:00
ramil/ram@myoffice.izhnet.ru
77b0a44146 Merge mysql.com:/usr/home/ram/work/bug22913/my50-bug22913 
into  mysql.com:/usr/home/ram/work/bug22913/my51-bug22913
 2006-11-02 14:35:42 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
9361705934 Merge mysql.com:/usr/home/ram/work/bug22913/my41-bug22913 
into  mysql.com:/usr/home/ram/work/bug22913/my50-bug22913
 2006-11-02 14:33:22 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
a072688eea Fix for bug #22913: mysql --quick doesn't report some errors. 
We don't check for errors that may occur during data printing.
 2006-11-02 14:32:00 +04:00
thek@kpdesk.mysql.com
5f2424ead7 Merge kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maint 
into  kpdesk.mysql.com:/home/thek/dev/mysql-5.1-maint
 2006-11-02 08:47:21 +01:00
stewart@willster.(none)
8d05d38992 Merge willster.(none):/home/stewart/Documents/MySQL/5.1/ndb 
into  willster.(none):/home/stewart/Documents/MySQL/5.1/pending
 2006-11-02 17:25:53 +11:00
cbell/Chuck@mysql_cab.
c062178781 BUG#23735 Test rpl_row_mysqlbinlog fails on Windows. The errors report a file discrepency on reading a binlog from the command line. 2006-11-01 10:56:43 -05:00
msvensson@shellback.(none)
b9d4ccbf18 Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-31 19:08:30 +01:00
msvensson@shellback.(none)
64eb65533e Make variables static to please Netware compiler 2006-10-31 18:51:23 +01:00
msvensson@neptunus.(none)
7946e8c3c8 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-10-26 20:11:13 +02:00
msvensson@neptunus.(none)
74a29e5db4 Bug#20894 Reproducible MySQL client segmentation fault 
- Add two null bytes in  "buff" variable allowing us to call
   get_arg two times also for strings longer than sizeof(buff)
 2006-10-26 19:51:29 +02:00
stewart@willster.(none)
8f3ac043e8 Merge willster.(none):/home/stewart/Documents/MySQL/5.1/ndb 
into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug20839
 2006-10-26 21:29:27 +10:00
msvensson@neptunus.(none)
fb01ba8455 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-10-24 16:01:19 +02:00
msvensson@neptunus.(none)
ccc33b4e53 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-24 16:00:42 +02:00
msvensson@neptunus.(none)
e8881843a9 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-10-24 15:46:54 +02:00
msvensson@neptunus.(none)
26183402d1 Use same type for local variables as arguments, avoid compile error on NetWare 2006-10-24 13:52:50 +02:00
msvensson@neptunus.(none)
c972edc663 Enable the ATTRIBUTE_FORMAT macros to check format of variable arg parameters 2006-10-24 13:34:10 +02:00
holyfoot/hf@deer.(none)
933464305d Merge mysql.com:/home/hf/work/w3475/my50-w3475 
into  mysql.com:/home/hf/work/w3475/my51-w3475
 2006-10-24 15:43:10 +05:00
holyfoot/hf@mysql.com/deer.(none)
97df0fce16 WL#3475 merging 2006-10-24 15:28:16 +05:00
holyfoot/hf@mysql.com/deer.(none)
836e159ff3 merging fix 2006-10-24 12:35:32 +05:00
holyfoot/hf@mysql.com/deer.(none)
cd5684543c Merge mysql.com:/home/hf/work/w3475/my41-w3475 
into  mysql.com:/home/hf/work/w3475/my50-w3475
 2006-10-23 16:50:01 +05:00
holyfoot/hf@mysql.com/deer.(none)
4d23559806 WL#3475 (Threads for the embedded server in mysqltest) 
Necessary code added to mysqltest.c.
Disabled tests are available now.
 2006-10-23 15:02:51 +05:00
stewart@willster.(none)
910e4d974c BUG#20839 Illegal error code: 155 returned downgrading from 5.1.12-> 5.1.11 
post-review fixups - magnus suggested creating dynstr_trunc instead of doing
it manually.
 2006-10-20 22:47:28 +10:00
msvensson@neptunus.(none)
81cf15ae27 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-10-19 17:39:12 +02:00
msvensson@neptunus.(none)
c7710510ac Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-19 17:15:49 +02:00
msvensson@neptunus.(none)
9a5b4a1151 Add command "exit" to mysqltest, it will stop processing any more 
commands and go directly to result file processing
 2006-10-19 13:34:09 +02:00
msvensson@neptunus.(none)
b11dee73ca Backport test cases fixes from 5.0 2006-10-19 10:54:23 +02:00
iggy@rolltop.ignatz42.dyndns.org
39bda9e3cf Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19745/my50-bug19745 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
 2006-10-18 19:27:14 -04:00
iggy@rolltop.ignatz42.dyndns.org
3c31c84200 Bug#19745: mysqldump --xml produces invalid xml 
The mysqldump command with both the --xml and --hex-blob options will output blob data encoded as hexBinary.  
The proper XML datatype is xs:hexBinary.  
The correct XML datatype is specified be setting the xsi_type attribute equal to xs:hexBinary for each encoded element.
 2006-10-18 18:43:51 -04:00
cmiller@zippy.cornsilk.net
91c4edfbfb Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint_20061016 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-10-17 12:00:36 -04:00