msvensson@pilot.blaudden
da3c2d387f
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-24 08:20:00 +01:00
msvensson@pilot.blaudden
b79c217d0e
Link comp_err with zlib
2007-02-24 08:19:37 +01:00
msvensson@pilot.blaudden
e4700df9ed
Replace non portable system commmands in trigger-grant
2007-02-24 08:18:57 +01:00
msvensson@pilot.blaudden
aa9508fe08
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-23 18:10:36 +01:00
msvensson@pilot.blaudden
1c470cfcaa
Extend the max length of second format specifier to max length
...
200 allowing it to print paths a little better
2007-02-23 18:07:08 +01:00
msvensson@pilot.blaudden
92c06038c0
Convert "system cp" to portable mysqltest commands
2007-02-23 18:05:32 +01:00
msvensson@pilot.blaudden
907296b0aa
Merge pilot.blaudden:/home/msvensson/mysql/bug26536/my51-bug26536
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-23 18:00:05 +01:00
msvensson@pilot.blaudden
e50b39a663
Merge pilot.blaudden:/home/msvensson/mysql/bug26536/my50-bug26536
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-02-23 17:59:33 +01:00
msvensson@pilot.blaudden
cb8cbe0033
Bug#26536 func_time failure on vm-win2003-64-b, occurs every time
...
- Fixes for 5.1
- Always use long for my_time_t
2007-02-23 17:59:07 +01:00
msvensson@pilot.blaudden
4294679a8c
Merge pilot.blaudden:/home/msvensson/mysql/comp_err_checksum/my50-comp_err_checksum
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-02-23 17:37:44 +01:00
msvensson@pilot.blaudden
9650b6b45e
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-02-23 17:36:50 +01:00
msvensson@pilot.blaudden
b4d06c0d83
Merge pilot.blaudden:/home/msvensson/mysql/bug26536/my50-bug26536
...
into pilot.blaudden:/home/msvensson/mysql/bug26536/my51-bug26536
2007-02-23 17:34:19 +01:00
msvensson@pilot.blaudden
7e292b9a9a
Bug#26536 func_time failure on vm-win2003-64-b, occurs every time
...
- Avoid overflow in sec_since_epoch by shifting the time
back 2 days for times close to the maximum range of my_time_t
- Improve comment about why we need my_time_t
- Patch will also fix timezone2.test
2007-02-23 17:33:11 +01:00
msvensson@pilot.blaudden
b5ce1899a6
Merge pilot.blaudden:/home/msvensson/mysql/comp_err_checksum/my50-comp_err_checksum
...
into pilot.blaudden:/home/msvensson/mysql/comp_err_checksum/my51-comp_err_checksum
2007-02-23 16:52:22 +01:00
msvensson@pilot.blaudden
bb0948d2ef
Link comp_err with zlib
2007-02-23 16:51:13 +01:00
msvensson@pilot.blaudden
e063f18d97
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/comp_err_checksum/my50-comp_err_checksum
2007-02-22 19:16:18 +01:00
msvensson@pilot.blaudden
4db696a2ba
Merge bk-internal:/home/bk/mysql-5.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/comp_err_checksum/my51-comp_err_checksum
2007-02-22 19:15:32 +01:00
kaa@polly.local
bedde99dbd
Disable mysqlbinlog-cp932.test for row based binlog, since mysqlbinlog is also disabled.
2007-02-22 21:05:45 +03:00
msvensson@pilot.blaudden
1785958c7a
Merge pilot.blaudden:/home/msvensson/mysql/comp_err_checksum/my50-comp_err_checksum
...
into pilot.blaudden:/home/msvensson/mysql/comp_err_checksum/my51-comp_err_checksum
2007-02-22 17:54:07 +01:00
msvensson@pilot.blaudden
43fae314a1
Bug#24617 Typo in Czech translation
2007-02-22 17:53:41 +01:00
msvensson@pilot.blaudden
4702ad54e5
Merge pilot.blaudden:/home/msvensson/mysql/comp_err_checksum/my50-comp_err_checksum
...
into pilot.blaudden:/home/msvensson/mysql/comp_err_checksum/my51-comp_err_checksum
2007-02-22 16:44:37 +01:00
msvensson@pilot.blaudden
05305f462b
Bug #26571 Different format specifiers in errmsg.txt
...
- Add check of format specifiers in error message strings
- Update error message text accordingly to be equal between all translations
2007-02-22 16:41:51 +01:00
kaa@polly.local
1d192c3488
Fixed the binlog_row_ctype_cp932 test failure in PB introduced by the patch for bug #18743 .
2007-02-22 15:41:39 +03:00
kaa@polly.local
6d95e5dbea
Merge polly.local:/home/kaa/src/maint/mysql-5.0-maint
...
into polly.local:/home/kaa/src/maint/mysql-5.1-maint
2007-02-22 15:30:17 +03:00
kaa@polly.local
8aca9d9719
Force the server restart before running mysqlbinlog-cp932.test to fix PB failures introduced by the patch for bug #18743 .
2007-02-22 15:28:42 +03:00
kaa@polly.local
f187430da2
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into polly.local:/home/kaa/src/maint/mysql-5.1-maint
2007-02-21 19:56:19 +03:00
kaa@polly.local
c63c982e6f
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into polly.local:/home/kaa/src/maint/mysql-5.1-maint
2007-02-21 19:52:26 +03:00
kaa@polly.local
05750812d6
Moved the test requiring cp932 to a separate unit.
...
This is for bug #18743 .
2007-02-21 19:50:48 +03:00
msvensson@pilot.blaudden
5ba46a5606
Merge bk-internal:/home/bk/mysql-5.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-21 17:44:16 +01:00
Kristofer.Pettersson@naruto.
63c3819d03
Merge naruto.:C:/cpp/bug25042/my50-bug25042
...
into naruto.:C:/cpp/mysql-5.1-maint
2007-02-21 16:26:33 +01:00
kaa@polly.local
5b5dc7f840
Merge polly.local:/home/kaa/src/maint/mysql-5.0-maint
...
into polly.local:/home/kaa/src/maint/mysql-5.1-maint
2007-02-20 23:23:49 +03:00
kaa@polly.local
41eccda1df
Merge polly.local:/tmp/maint/bug25137/my51-bug25137
...
into polly.local:/home/kaa/src/maint/mysql-5.1-maint
2007-02-20 23:16:18 +03:00
msvensson@pilot.blaudden
63baad73ae
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-20 21:02:06 +01:00
msvensson@pilot.blaudden
9da1b427a7
Test for setting general_log_file to a directory fails
...
since /tmp is used as the directory. It does not always
exist so let's use one that always exists MYSQLTEST_VARDIR
2007-02-20 21:00:05 +01:00
kaa@polly.local
2a2382b284
Fixed the binlog numbering after changes introduced by patch for bug18743.
2007-02-20 22:29:18 +03:00
kaa@polly.local
b7e6df7cc9
Merge polly.local:/tmp/maint/bug25137/my50-bug25137
...
into polly.local:/home/kaa/src/maint/mysql-5.0-maint
2007-02-20 22:23:51 +03:00
msvensson@pilot.blaudden
cf553c4361
Use "diff_files" instead ot "exec diff"
2007-02-20 18:47:47 +01:00
msvensson@pilot.blaudden
55b7f20a80
Use a temporary file to execute SQL commands with utf-8 chararcters
2007-02-20 18:35:59 +01:00
msvensson@pilot.blaudden
c282716844
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-20 18:22:50 +01:00
msvensson@pilot.blaudden
0d1d91e829
Replace "exec diff" with diff_files
2007-02-20 18:22:33 +01:00
msvensson@pilot.blaudden
dd74beb6be
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-02-20 18:21:14 +01:00
msvensson@pilot.blaudden
d6584a920b
Add "diff_files" command to mysqltest
2007-02-20 18:20:58 +01:00
msvensson@pilot.blaudden
c796468004
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-20 14:24:01 +01:00
msvensson@pilot.blaudden
c7d138cfa3
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-02-20 14:21:11 +01:00
msvensson@pilot.blaudden
26432d16e8
New version of 'do_cat_file' that will trim cr/lf to lf
2007-02-20 14:20:49 +01:00
msvensson@pilot.blaudden
cab074cb22
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-20 13:06:25 +01:00
msvensson@pilot.blaudden
a799f2b637
Change "exec echo" commands with different delimiters that are also
...
escape chars to use "write_file" to avoid confusion about what's what.
2007-02-20 13:06:01 +01:00
msvensson@pilot.blaudden
0b5c41acc7
Bug#25807 LOAD DATA INFILE does not work with Pipes
...
- Additional fix for io_cache_init being called on a closed file
2007-02-20 12:06:04 +01:00
msvensson@pilot.blaudden
2d819535c7
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-19 20:34:52 +01:00
msvensson@pilot.blaudden
269d9daf0d
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-02-19 20:34:29 +01:00