gluh@mysql.com
7f4b27cf29
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/gluh/MySQL/Merge/5.0
2006-03-06 15:58:16 +04:00
msvensson@devsrv-b.mysql.com
ee97bebc8c
Merge bk-internal:/home/bk/mysql-5.0
...
into devsrv-b.mysql.com:/space/magnus/bug17377/my50-bug17377
2006-03-06 12:28:30 +01:00
gluh@mysql.com
321eb3dce6
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/gluh/MySQL/Merge/5.0
2006-03-06 15:15:23 +04:00
msvensson@devsrv-b.mysql.com
2660607096
Merge devsrv-b.mysql.com:/space/magnus/mysql-5.0
...
into devsrv-b.mysql.com:/space/magnus/bug17377/my50-bug17377
2006-03-06 12:04:54 +01:00
gluh@mysql.com
69e8b9d06e
4.1 -> 5.0 merge
2006-03-06 14:38:31 +04:00
gluh@eagle.intranet.mysql.r18.ru
f1eaf7e8ec
Fix for bug#14385 GRANT and mapping to correct user account problems
...
Check if the host of table hash record exactly matches host from GRANT command
2006-03-06 14:03:40 +04:00
timour@mysql.com
593bd1d3b8
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
...
into mysql.com:/home/timka/mysql/src/5.0-bug-15229
2006-03-06 11:41:19 +02:00
gluh@eagle.intranet.mysql.r18.ru
33e7d20f37
Fix for bug#16678 FORMAT gives wrong result if client run with default-character-set=utf8
...
calculate Item_func_format::max_length using charset->mbmaxlen
2006-03-06 12:52:38 +04:00
dlenev@mysql.com
0fb4a6645e
Merge mysql.com:/home/dlenev/src/mysql-5.0-bg17866-2
...
into mysql.com:/home/dlenev/src/mysql-5.0-merges
2006-03-04 23:58:48 +03:00
konstantin@mysql.com
40b368af16
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/opt/local/work/mysql-4.1-root
2006-03-04 22:33:19 +03:00
dlenev@mysql.com
efe0900669
Fix for bug #17866 "Problem with renaming table with triggers with fully
...
qualified subject table" which was introduced during work on bug #13525
"Rename table does not keep info of triggers".
The bug was caused by the fact that during reconstruction of CREATE TRIGGER
statement stored in .TRG file which happened during RENAME TABLE we damaged
trigger definition in case when it contained fully qualified name of subject
table (see comment for sql_yacc.yy for more info).
2006-03-04 16:55:06 +03:00
cmiller@zippy.(none)
e5e1760292
Merge mysqldev@production.mysql.com:my/mysql-5.0-release
...
into zippy.(none):/home/cmiller/work/mysql/mysql-5.0.19-tbr
2006-03-03 16:27:43 -05:00
cmiller@zippy.(none)
599c710a5b
Bug#16859 involves truncating column data at NUL characters. Instead, the
...
client will now substitute spaces for NULs, so that the grid isn't messed up
due to silently consumed NULs and that the full field is shown.
2006-03-03 16:26:38 -05:00
pem@mysql.com
2b6f510350
Merge mysql.com:/extern/mysql/5.0/bug16887/mysql-5.0-runtime
...
into mysql.com:/extern/mysql/5.0/bug16887/mysql-5.0
2006-03-03 19:18:17 +01:00
pem@mysql.com
b66567f619
Merge mysql.com:/extern/mysql/5.0/bug16887/mysql-5.0-runtime
...
into mysql.com:/extern/mysql/5.0/bug16887/mysql-5.0-release
2006-03-03 18:51:13 +01:00
joerg@debian.(none)
e5b149d1e7
Merge joerg@trift2:/M50/patch-17595 into debian.(none):/M50/clone-5.0
2006-03-03 12:50:15 +01:00
gluh@mysql.com
ab67605976
Merge mysql.com:/home/gluh/MySQL/Merge/mysql-5.0-release
...
into mysql.com:/home/gluh/MySQL/Merge/5.0
2006-03-03 15:39:38 +04:00
gluh@eagle.intranet.mysql.r18.ru
f3e993d9a6
Fix for bug#17826 'type_decimal' fails with ps-protocol
...
removed unnecessary calculation of cache value
otherwise Join::preapre tries to calculate
undefined values(filed values)
2006-03-03 15:29:39 +04:00
ramil@mysql.com
1a07140515
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0.b17615
2006-03-03 09:35:25 +04:00
cmiller@zippy.(none)
c672c119e3
Expanding a binary field should result in 0x00-filled positions, not 0x20
...
(ASCII space). For Bug#16857.
2006-03-02 20:49:10 -05:00
cmiller@zippy.(none)
5147bb8e9b
Expanding a binary field should result in 0x00-filled positions, not 0x20
...
(ASCII space). For Bug#16857.
2006-03-02 19:59:49 -05:00
SergeyV@selena.
1bacdef0a7
Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into selena.:H:/MYSQL/src/#17595-mysql-5.0
2006-03-02 20:52:58 +03:00
pem@mysql.com
d85e929547
Fixed BUG#17476: Stored procedure not returning data when it is called first
...
time per connection
Removed const_string() method from Item_string (it was only used in one
place, in a bad way). Defer possible SP variable, and access data directly
instead, in date_format item.
2006-03-02 14:54:04 +01:00
ramil@mysql.com
72da0c6091
Fix for bug #17615 : invalid handling of function results in UPDATE...SET statement.
2006-03-02 15:05:55 +04:00
msvensson@neptunus.(none)
9c91f8034c
Bug#17279 user with no global privs and with create priv in db can create
...
database
- Fix test case for systems with "lowercase names"
2006-03-02 11:01:58 +01:00
timour@mysql.com
103604ed06
Fix for BUG#15229.
...
The cause of this bug was a design flaw due to which the list of natural
join columns was incorrectly computed and stored for nested joins that
are not natural joins, but are operands (possibly indirect) of nested joins.
The patch corrects the flaw in a such a way, that the result columns of a
table reference are materialized only if it is a leaf table (that is, only
if it is a view, stored table, or natural/using join).
2006-03-02 11:50:15 +02:00
holyfoot@mysql.com
5cbcf9388c
Merge bk@192.168.21.1:mysql-5.0
...
into mysql.com:/home/hf/work/mysql-5.0.9088
2006-03-02 12:34:05 +04:00
tkatchaounov@lsmy3.wdf.sap.corp
95fe35437a
Merge lsmy3.wdf.sap.corp:/data/users/tkatchaounov/mysql/src/5.0-virgin
...
into lsmy3.wdf.sap.corp:/data/users/tkatchaounov/mysql/src/5.0-bug-17523
2006-03-01 17:27:39 +01:00
msvensson@shellback.(none)
c26674d7a0
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0
2006-03-01 15:43:57 +01:00
tkatchaounov@lsmy3.wdf.sap.corp
6a44bb6403
Merge lsmy3.wdf.sap.corp:/data/users/tkatchaounov/mysql/src/5.0-virgin
...
into lsmy3.wdf.sap.corp:/data/users/tkatchaounov/mysql/src/5.0-dbg
2006-03-01 15:43:57 +01:00
timour@mysql.com
0408f2bfc7
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
...
into mysql.com:/home/timka/mysql/src/5.0-bug-17523
2006-03-01 16:43:56 +02:00
msvensson@shellback.(none)
b802826fc9
Dont' run the mysql_protocols on Windows
2006-03-01 15:22:47 +01:00
holyfoot@deer.(none)
dc052a3a00
bug #9088 (bigint WHERE fails)
2006-03-01 15:50:15 +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
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
SergeyV@selena.
2c8a6fadf9
Postfix for #17595 . few lines in a test were accidentally commented.
...
Comments removed.
2006-02-27 22:14:48 +03: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
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
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
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
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.
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
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
dlenev@mysql.com
4ca3409390
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
...
into mysql.com:/home/dlenev/src/mysql-5.0-bg13525
2006-02-26 21:20:13 +03:00