msvensson@neptunus.(none)
c76adf6021
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-release
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-23 11:57:18 +01:00
msvensson@neptunus.(none)
176313a679
mysql_upgrade should look for .sql script also in share/ directory
2006-11-23 11:56:05 +01:00
msvensson@neptunus.(none)
2aa0d085e3
Build fixes for NetWare
2006-11-23 11:38:44 +01:00
iggy@rolltop.ignatz42.dyndns.org
bface97ecc
Bug#19799 delimiter command not working correctly when sourcing a sql file
...
- Client side readline functions unconditionally search for Unix '\n' line
endings. In this case, the delimiter statement was set to '//\r' instead
of the intended '//'. When removing the '\n' check for and remove
preceeding '\r' character as well.
2006-11-21 21:10:02 -05:00
msvensson@neptunus.(none)
f25590d8b7
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-21 16:50:40 +01:00
msvensson@neptunus.(none)
fe0fc2d637
Merge 192.168.0.4:mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-11-21 16:42:07 +01:00
msvensson@neptunus.(none)
9594462f72
Remove unused variable
2006-11-21 16:34:10 +01:00
msvensson@shellback.(none)
a9eb1b709a
Add missing semicolon
2006-11-21 09:36:29 +01:00
bar@mysql.com/bar.intranet.mysql.r18.ru
fb419c4241
BUG#13926: --order-by-primary fails if PKEY contains quote character.
...
Backporting from 5.0
2006-11-21 11:09:33 +04:00
msvensson@shellback.(none)
fc144204da
Port mysql_upgrade to be tested on windows
2006-11-21 00:46:13 +01:00
msvensson@shellback.(none)
4dc0aeb7b6
Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-20 23:38:22 +01:00
monty@mysql.com/nosik.monty.fi
e825879800
Remove compiler warnings
...
(Mostly in DBUG_PRINT() and unused arguments)
Fixed bug in query cache when used with traceing (--with-debug)
Fixed memory leak in mysqldump
Removed warnings from mysqltest scripts (replaced -- with #)
2006-11-20 22:42:06 +02:00
msvensson@shellback.(none)
3b57cf0f74
Fix mysqltest to automatically replace \ with / also in
...
$MYSQLTEST_VARDIR, for usage of vardir=e:/var<nnn> on windows
2006-11-20 21:03:40 +01:00
holyfoot/hf@mysql.com/deer.(none)
e95e23b0f3
Merge bk@192.168.21.1:mysql-5.0-opt
...
into mysql.com:/home/hf/work/mysql-5.0-0mrg
2006-11-17 10:30:16 +04:00
holyfoot/hf@mysql.com/deer.(none)
497ccd6b87
Merge mysql.com:/home/hf/work/mysql-4.1-mrg
...
into mysql.com:/home/hf/work/mysql-5.0-mrg
2006-11-16 23:16:44 +04:00
holyfoot/hf@mysql.com/deer.(none)
2963d8ddd2
merging
2006-11-16 21:23:34 +04:00
holyfoot/hf@mysql.com/deer.(none)
db5db841a9
Merge bk@192.168.21.1:mysql-4.1
...
into mysql.com:/home/hf/work/mysql-4.1-mrg
2006-11-16 20:44:37 +04:00
msvensson@neptunus.(none)
f105e0ecd0
Merge neptunus.(none):/home/msvensson/mysql/bug19817/my50-bug19817
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-13 17:51:33 +01:00
msvensson@neptunus.(none)
bf020e5ea6
Bug#19817 error when try to compile PHP5.1 with mysql 5.0.21 static libs
...
- Most likely caused by linking with libmysqlclient using gcc and not g++.
- Removing our "yassl_dummy_link_fix" hacks so some test programs are linked
with gcc
- Remove build of non working test programs in vio
2006-11-13 17:16:37 +01:00
msvensson@neptunus.(none)
bf8a9e544c
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-13 16:39:44 +01:00
msvensson@neptunus.(none)
5110d91ec3
Make it possible for .test suites to run "mysql_upgrade"
...
Add new test file mysql_upgrade.test
2006-11-13 13:39:49 +01:00
ted@ted.mysql.internal
bc9ca699fb
Memory allocation bug fixed
2006-11-10 07:21:10 +03: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
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)
fa79d0fccb
Fix DBUG_PRINT in mysqltest, the real value to print is in ds_cmd
2006-11-03 16:06:13 +01: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@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
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)
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)
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)
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@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
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
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