msvensson@pilot.blaudden
2f36118018
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-27 15:29:44 +01:00
msvensson@pilot.blaudden
c66f902862
Bug#23669 mysql.proc not created in default install
...
- Remove DEFAULT values for blob's in mysql_system_tables.sql
2007-02-27 15:28:19 +01:00
msvensson@pilot.blaudden
b03f54df25
Merge pilot.blaudden:/home/msvensson/mysql/bug20166/my51-bug20166
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-27 14:55:00 +01:00
msvensson@pilot.blaudden
14cfc7e1ba
Merge pilot.blaudden:/home/msvensson/mysql/bug20166/my50-bug20166
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-02-27 14:54:33 +01:00
msvensson@pilot.blaudden
e91792c9b9
Merge pilot.blaudden:/home/msvensson/mysql/bug26678/my50-bug26678
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-02-27 14:35:25 +01:00
msvensson@pilot.blaudden
885e4fb5b9
Merge pilot.blaudden:/home/msvensson/mysql/bug20166/my50-bug20166
...
into pilot.blaudden:/home/msvensson/mysql/bug20166/my51-bug20166
2007-02-27 14:25:56 +01:00
msvensson@pilot.blaudden
6a8127c8c7
Merge pilot.blaudden:/home/msvensson/mysql/bug26678/my50-bug26678
...
into pilot.blaudden:/home/msvensson/mysql/bug26678/my51-bug26678
2007-02-27 14:21:40 +01:00
msvensson@pilot.blaudden
be72518031
Bug#26678 SSL tests fail on win64
...
- Import a patch from yaSSL CVS that uses "word" instead
of "unsigned long" in three function's that uses sizeof to find
out the word size being used. NOTE! long is 32 bit also on
64 bit windows.
2007-02-27 14:18:12 +01:00
msvensson@pilot.blaudden
394e9e86d6
Bug#20166 mysql-test-run.pl does not test system privilege tables creation
...
- Escape undercore character in mysql.db to only allow
access test_% and not test%
2007-02-27 14:10:27 +01:00
msvensson@pilot.blaudden
846e5ad8d3
Bug#20166 mysql-test-run.pl does not test system privilege tables creation
...
- Updates for 5.1
2007-02-27 11:39:29 +01:00
msvensson@pilot.blaudden
eb135547eb
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-02-26 14:56:23 +01:00
msvensson@pilot.blaudden
23b6b4a565
Only allow a version number to be read from "/etc/debian_version"
2007-02-26 14:52:51 +01:00
msvensson@pilot.blaudden
fce4cd3ec0
Remove another spurious "
2007-02-26 14:49:41 +01:00
msvensson@pilot.blaudden
386e08af1e
Remove spurious "
2007-02-26 14:48:41 +01:00
msvensson@pilot.blaudden
f6e31a2cd1
Merge pilot.blaudden:/home/msvensson/mysql/bug20166/my50-bug20166
...
into pilot.blaudden:/home/msvensson/mysql/bug20166/my51-bug20166
2007-02-26 14:25:59 +01:00
msvensson@pilot.blaudden
c550a45522
Bug#20166 mysql-test-run.pl does not test system privilege tables creation
...
- Use mysql_system_tables.sql to create MySQL system tables in
all places where we create them(mysql_install_db, mysql-test-run-pl
and mysql_fix_privilege_tables.sql)
2007-02-26 11:49:24 +01:00
msvensson@pilot.blaudden
5f7dbe07cd
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-26 11:00:17 +01:00
msvensson@pilot.blaudden
1770993db7
Use binary file mode when writing the modified .TRG file to avoid CR/LF's being added on windows
2007-02-26 09:24:03 +01:00
msvensson@pilot.blaudden
5068ef8854
Workaround non portable use of "grep" and "cut" by loading the whole processlist
...
into temporary table and selecting the correct row with SQL
2007-02-26 09:16:22 +01:00
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