aivanov@mysql.com
d20ccef6e5
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/alexi/bugs/mysql-5.0-merged
2006-03-01 17:43:55 +03:00
msvensson@shellback.(none)
b802826fc9
Dont' run the mysql_protocols on Windows
2006-03-01 15:22:47 +01:00
msvensson@shellback.(none)
3a325cb81e
Bug#2845 client fails to reconnect if using TCP/IP
...
- Change to use non blocking read to empty channel in case of too large sd number
- Don't check for too large socket number on Windows.
2006-03-01 15:21:03 +01:00
bar@mysql.com
a6973ceed0
Bug#15949 union + illegal mix of collations (IMPLICIT + COERCIBLE)
...
union.result, union.test:
Adding test case.
item.cc:
Allow safe character set conversion in UNION
- string constant to column's charset
- to unicode
Thus, UNION now works the same with CONCAT (and other string functions)
in respect of aggregating arguments with different character sets.
2006-03-01 17:58:01 +04:00
aivanov@mysql.com
a3ea894758
Fixed BUG #16175 : Memory leak in rpl_trigger.test
...
Allocating/freeing memory for the db member of THD
is wholy managed by slave thread.
2006-03-01 16:21:01 +03:00
joerg@mysql.com
24cb1ceb81
Merge mysql.com:/M50/comment-5.0 into mysql.com:/M50/mysql-5.0
2006-03-01 13:35:32 +01:00
joerg@mysql.com
30e00b0f7f
Manual merge of the added "--comment=<string>" option
...
to both the Shell and the Perl vaerion of "mysql-test-run"-
2006-03-01 13:29:37 +01:00
joerg@mysql.com
38a7f5551a
mysql-test/mysql-test-run.pl : Add a "--comment=<string>" option (backport from 5.1).
2006-03-01 13:15:37 +01:00
joerg@mysql.com
21a57a8f85
Merge mysql.com:/M40/comment-4.0 into mysql.com:/M41/comment-4.1
2006-03-01 13:10:59 +01:00
holyfoot@deer.(none)
dc052a3a00
bug #9088 (bigint WHERE fails)
2006-03-01 15:50:15 +04:00
joerg@mysql.com
0afe7f1987
mysql-test/mysql-test-run.sh : Add a "--comment=<string>" option, to get it logged when the test is run.
2006-03-01 12:21:44 +01:00
anozdrin@mysql.com
e03e522201
Fix for BUG#16266: Definer is not fully qualified error during replication.
...
The idea of the fix is to extend support of non-SUID triggers for backward
compatibility. Formerly non-SUID triggers were appeared when "new" server
is being started against "old" database. Now, they are also created when
"new" slave receives updates from "old" master.
2006-03-01 14:13:07 +03:00
gluh@mysql.com
70b344f910
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/gluh/MySQL/Bugs/5.0.17602
2006-03-01 09:18:03 +04:00
paul@snake-hub.snake.net
21f0adc7c6
Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
2006-02-28 18:48:58 -06:00
paul@snake-hub.snake.net
5ac33e8eb8
Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1
...
into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
2006-02-28 17:54:50 -06:00
paul@snake-hub.snake.net
7f7f5969c0
mysqltest.test:
...
Add real_sleep tests.
2006-02-28 17:54:11 -06:00
paul@snake-hub.snake.net
67e4580e29
mysqltest.c:
...
expand tab
2006-02-28 15:11:44 -06:00
paul@snake-hub.snake.net
d8a6e41c6b
Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1
...
into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
2006-02-28 15:09:45 -06:00
paul@snake-hub.snake.net
d6654fe9cb
mysql-test-run.sh:
...
Fix URLs.
README:
Fix URL.
mysqltest.result:
Update test result for real_sleep error message.
mysqltest.c:
Fix do_sleep() to print correct command name for real_sleep.
2006-02-28 15:08:16 -06:00
paul@snake-hub.snake.net
7ff2ede8c9
mysqltest.c:
...
Fix reference to incorrect (non-existent) options in comment.
2006-02-28 14:04:21 -06:00
paul@snake-hub.snake.net
486bd42b06
Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1
...
into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
2006-02-28 14:01:16 -06:00
paul@snake-hub.snake.net
fc8ed82da4
mysqltest.c:
...
Correct/clarify comments.
2006-02-28 14:00:17 -06:00
paul@snake-hub.snake.net
a052ef7d82
mysqltest.c:
...
Fix typos.
2006-02-28 12:19:30 -06:00
paul@snake-hub.snake.net
a2c639d813
Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1
...
into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
2006-02-28 12:10:38 -06:00
paul@snake-hub.snake.net
6d4dc91bbf
mysqltest.c:
...
Fix typos.
2006-02-28 12:01:24 -06:00
evgen@sunlight.local
f641a91943
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into sunlight.local:/work_local/14169-bug-5.0-mysql
2006-02-28 19:42:11 +03:00
evgen@moonbone.local
0ce39664b6
Fixed bug#14169: type of group_concat() result changed to blob if tmp_table was
...
used
In a simple queries a result of the GROUP_CONCAT() function was always of
varchar type.
But if length of GROUP_CONCAT() result is greater than 512 chars and temporary
table is used during select then the result is converted to blob, due to
policy to not to store fields longer than 512 chars in tmp table as varchar
fields.
In order to provide consistent behaviour, result of GROUP_CONCAT() now
will always be converted to blob if it is longer than 512 chars.
Item_func_group_concat::field_type() is modified accordingly.
2006-02-28 19:30:30 +03:00
msvensson@shellback.(none)
916f763b9e
Merge neptunus:/home/msvensson/mysql/bug16795/my50-bug16795
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0
2006-02-28 13:03:00 +01:00
msvensson@devsrv-b.mysql.com
f2444c50fc
Bug#17377 Federated Engine returns wrong Data, always the rows with the highest ID
...
- Always make rnd_pos reposition the cursor in the fetched result set.
2006-02-28 11:17:40 +01:00
msvensson@shellback.(none)
318bee862a
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0
2006-02-28 11:00:35 +01:00
msvensson@neptunus.(none)
7551c8d7f8
Merge msvensson@devsrv-b.mysql.com:/space/magnus/bug17279/my50-bug17279/
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-28 10:52:36 +01:00
gluh@eagle.intranet.mysql.r18.ru
4858032176
Fix for bug#17602 Server crash on AVG/SUM over DECIMAL column(2nd ver)
...
The table may be corrupted and decimal columns may have invalid values in this case.
To prevent crash we need to check that decimal column has allowable value.
In case of invalid value generate warning and set the value to 0.
2006-02-28 13:36:41 +04:00
SergeyV@selena.
2c8a6fadf9
Postfix for #17595 . few lines in a test were accidentally commented.
...
Comments removed.
2006-02-27 22:14:48 +03:00
lars@mysql.com
05d1921181
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
...
into mysql.com:/users/lthalmann/bk/mysql-5.0-bug13418
2006-02-27 19:26:31 +01:00
lars@mysql.com
2ebe57777f
BUG#13418: Virtualized some functions so that Bit_field class will use correct cmp functions
2006-02-27 18:34:04 +01:00
dlenev@mysql.com
db1ecaa1a2
Fix for trigger.test failures on pushbuild hosts introduced by fix for
...
bug #13525 "Rename table does not keep info of triggers".
Now we use MYSQLTEST_VARDIR in order to be able to run this test in different
vardir. Also improved cleanup after the test.
2006-02-27 20:32:32 +03:00
dlenev@mysql.com
3d6839d133
Fixed test results after bad auto-merge.
2006-02-27 20:00:06 +03:00
dlenev@mysql.com
6137476427
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-bg13525
2006-02-27 20:00:05 +03:00
SergeyV@selena.
763475754a
Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into selena.:H:/MYSQL/src/#15943-mysql-5.0
2006-02-27 20:00:03 +03:00
dlenev@mysql.com
6cb5c38c14
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-bg13525
2006-02-27 20:00:03 +03:00
sergefp@mysql.com
db54dc36f5
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug17314-push
2006-02-27 20:00:02 +03:00
msvensson@neptunus.(none)
e2423d5e05
BUG#2845 client fails to reconnect if using TCP/IP
...
- Use 'poll' if available
- Check that sd <= FD_SETSIZE if using 'select'
- Handle case when 'net_data_is_ready' returns -1, ie. sd > FD_SETSIZE and 'select' is used
2006-02-27 16:44:23 +01:00
msvensson@devsrv-b.mysql.com
706070fbf8
Bug#17279 user with no global privs and with create priv in db can create databases
...
- Use binary charset in acl_cache, to make searches case sensitive
- Add testcase
2006-02-27 16:41:58 +01:00
SergeyV@selena.
78f014f0d7
Postfix for #15943 . Explicit call of thd->clear_error() is added.
2006-02-27 16:52:14 +03:00
SergeyV@selena.
01f65c7bb6
project files update for win32 build
2006-02-27 16:30:14 +03:00
SergeyV@selena.
78b33e1835
Fixes bug #17595 . UDFs are not initialized when running mysqld with
...
--skip-grant-tables. However when deleting functions UDFs list was checked
regardless of whther UDFs are initialized or not. Additional check is added
into free_udf() and find_udf() functions to prevent possible runtime errors.
2006-02-27 16:27:34 +03:00
msvensson@neptunus.(none)
4bbf5eb01c
Bug#16795 ndb_cache_multi2
...
- Change && to ||
- Check for return value != 0 in "ndb->init()"
2006-02-27 10:29:55 +01:00
msvensson@neptunus.(none)
44a2855382
Bug#17716 Slave crash in net_clear on qnx
...
- Set FD_SETSIZE before including "sys/select.h"
2006-02-27 10:08:35 +01:00
sergefp@mysql.com
0048ea9bb3
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug17314
2006-02-27 11:36:41 +03:00
msvensson@neptunus.(none)
1b115976b6
Trace mysqlcheck to file mysqlcheck.trcae
2006-02-26 23:36:53 +01:00