msvensson@shellback.(none)
51ef90a329
Merge bk-internal:/home/bk/mysql-5.0
...
into shellback.(none):/home/msvensson/mysql/bug17574/my50-bug17574
2006-03-08 07:47:26 +01:00
kent@mysql.com
64ed7f1481
mysql-test-run.pl:
...
Allow space in base directory path, bug#15736
2006-03-08 03:51:59 +01:00
anozdrin@mysql.com
615357b96c
After-merge fix: fix the test case for BUG#16266 to query
...
only its own tables to prevent getting tables from others.
2006-03-08 00:13:27 +03:00
msvensson@shellback.(none)
78edd3788f
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into shellback.(none):/home/msvensson/mysql/bug17574/my50-bug17574
2006-03-07 20:41:04 +01:00
anozdrin@mysql.com
d5e641fec7
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-rt
2006-03-07 21:47:41 +03:00
msvensson@shellback.(none)
87209d560c
Bug#17574 Detect cluster start failure and "fail" ndb_* tests
2006-03-07 19:44:58 +01:00
msvensson@neptunus.(none)
48bef14042
Fix missing call to init_tmp_sh_file
2006-03-07 14:34:20 +01:00
anozdrin@mysql.com
d9d4dc5ef8
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-rt
2006-03-07 14:28:09 +03:00
msvensson@neptunus.(none)
647a940649
Enable ifdef for windows specific functions
2006-03-07 08:57:57 +01:00
msvensson@neptunus.(none)
456b2d6b14
Improve error message for faulty usage of "inc" and "dec"
2006-03-07 07:50:04 +01:00
msvensson@neptunus.(none)
f063ce8e31
Merge bk-internal:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-03-07 07:42:51 +01:00
serg@serg.mylan
6d6d11787f
after merge
2006-03-06 23:43:47 +01:00
msvensson@neptunus.(none)
f2ce7dc787
Fix typo
2006-03-06 22:18:04 +01:00
msvensson@neptunus.(none)
67f6576de8
Revert
2006-03-06 22:14:06 +01:00
msvensson@neptunus.(none)
0cc14310e8
Remove unused var
...
Reduce code
2006-03-06 22:08:34 +01:00
serg@serg.mylan
5a1672dd66
compilation fixes
2006-03-06 22:08:29 +01:00
msvensson@neptunus.(none)
a336f48552
Win fixes
...
- Use tmp sh file both in system and popen
2006-03-06 22:05:39 +01:00
msvensson@neptunus.(none)
dfe158fc15
Use grep instead of egrep
...
Use system inestad of exec
2006-03-06 21:45:13 +01:00
serg@serg.mylan
d190e08e4e
merged
2006-03-06 20:53:14 +01:00
serg@serg.mylan
e7504b3468
merged
2006-03-06 18:34:38 +01:00
serg@serg.mylan
0b2f4ac3be
kill (subquery) - three years old bugfix that never worked
2006-03-06 18:26:39 +01:00
holyfoot@mysql.com
8707e3356d
Merge mysql.com:/home/hf/work/mysql-5.0.15745
...
into mysql.com:/home/hf/work/mysql-5.0.mrg
2006-03-06 19:57:20 +04:00
cmiller@zippy.(none)
b65fbcbc99
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zippy.(none):/home/cmiller/work/mysql/mysql-5.0.19-tbr
2006-03-06 10:49:33 -05:00
cmiller@zippy.(none)
a2a5925d60
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zippy.(none):/home/cmiller/work/mysql/mysql-5.0.19-tbr
2006-03-06 10:44:01 -05:00
msvensson@neptunus.(none)
30071e9783
Merge bk-internal:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-03-06 14:01:15 +01:00
msvensson@neptunus.(none)
108fc10143
Merge bk-internal:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-03-06 13:45:53 +01:00
bar@mysql.com
6823225a81
Merge mysql.com:/usr/home/bar/mysql-4.1.b15949
...
into mysql.com:/usr/home/bar/mysql-5.0
2006-03-06 16:20:15 +04:00
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
gluh@eagle.intranet.mysql.r18.ru
f3ce98d2c9
post-merge fix
2006-03-06 15:14:15 +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
msvensson@neptunus.(none)
3f935b2777
Merge bk-internal:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-03-06 12:00:51 +01:00
bar@mysql.com
e019d60536
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b15949
2006-03-06 14:50:34 +04: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
holyfoot@deer.(none)
a920d0df86
bug #15745 (COUNT(DISTINCT CONCAT(x,y)) returns wrong result
2006-03-05 20:48:31 +04:00
konstantin@mysql.com
519ea6a278
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/opt/local/work/mysql-5.0-root
2006-03-05 12:04:03 +03:00
konstantin@mysql.com
1a4523e235
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/opt/local/work/mysql-5.0-root
2006-03-05 01:11:24 +03:00
konstantin@mysql.com
7a86eebb03
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/opt/local/work/mysql-5.0-root
2006-03-05 00:59:43 +03:00
konstantin@mysql.com
2ea0b9b72c
Revert the changeset for Bug#16144 "mysql_stmt_attr_get type error":
...
it breaks binary compatibility. The patch will be left intact
in 5.1.
2006-03-05 00:38:54 +03: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
951943c22a
Undo the patch for Bug#16144 "mysql_stmt_attr_get type error",
...
it breaks binary compatibility. The patch will be left intact
in 5.1. Warning: this changeset should be null-merged into 5.1.
A separate commit in order to push into the release clone of
5.0.19.
2006-03-04 23:04: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
ingo@mysql.com
c5a638cee0
Merge mysql.com:/home/mydev/mysql-4.1
...
into mysql.com:/home/mydev/mysql-4.1-bug11527
2006-03-04 14:06:52 +01:00
ingo@mysql.com
ec45217cc4
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-bug11527
2006-03-04 11:40:54 +01: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
