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
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
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
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
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
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
cmiller@zippy.cornsilk.net
184467a2cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-10-17 11:23:07 -04:00
msvensson@shellback.(none)
ffc9538bb4
Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-14 19:55:06 +02:00
msvensson@shellback.(none)
a9e60bab29
Use char as datatype for the byte that are read with my_fgetc, fixes problem with
...
mysqltest.test on Solaris and Mac. write_file produced nice files with all zeroes.
2006-10-14 17:09:06 +02:00
msvensson@shellback.(none)
d8b9f7cb0e
Improving debugging support in 'read_line' function
2006-10-14 17:02:43 +02:00
kent@mysql.com/c-584072d5.010-2112-6f72651.cust.bredbandsbolaget.se
0b7132eaf1
CMakeLists.txt:
...
Added mysql_upgrade target to Windows CMake build
2006-10-13 21:48:27 +02:00
msvensson@shellback.(none)
de3f217e10
Use 'my_strnncoll_simple' instead of 'strncasecmp'
2006-10-13 11:38:32 +02:00
msvensson@shellback.(none)
889e7147f6
Add ATTRIBUTE_FORMAT specifier to _db_doprnt, which is used by DBUG_PRINT
...
This will hopefully avoiid annoying crashes when running with --debug
Fix warnings from the above in mysqltest.c
2006-10-12 20:15:56 +02:00
msvensson@shellback.(none)
1be01ceea8
Merge bk-internal:/home/bk/mysql-4.1-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-10-12 18:48:03 +02:00
msvensson@shellback.(none)
1b06c7c78e
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint-new
2006-10-12 17:37:59 +02:00
msvensson@shellback.(none)
57ad872b24
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-10-12 13:53:21 +02:00
msvensson@shellback.(none)
925220627c
Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-12 13:51:54 +02:00
msvensson@shellback.(none)
6c31690bbd
Move the reconnect variable to beginning of function
...
Fix warning about value from "*ptr++" not being used. Changed it to ptr++
2006-10-12 13:50:50 +02:00
msvensson@shellback.(none)
1c9b35cdd7
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-10-12 11:39:41 +02:00