msvensson@neptunus.(none)
d028e8e063
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-11-03 10:34:15 +01:00
jani@ua141d10.elisa.omakaista.fi
d03662cd37
Changed mysql-test-run to correspond to the one in 5.0 tree.
2005-11-03 11:05:52 +02:00
jani@ua141d10.elisa.omakaista.fi
42f36e6fc0
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
2005-11-03 11:01:30 +02:00
holyfoot@mysql.com
284f652980
Merge bk@192.168.21.1:mysql-4.1
...
into mysql.com:/home/hf/work/mysql-4.1.14183
2005-11-03 12:50:28 +04:00
sergefp@mysql.com
7357e470a4
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug14026-r2
2005-11-03 11:20:01 +03:00
msvensson@neptunus.(none)
25f5062886
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-11-03 08:42:02 +01:00
sergefp@mysql.com
8fefb36800
Merged
2005-11-03 10:28:12 +03:00
holyfoot@mysql.com
c2640d292a
Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
...
into mysql.com:/home/hf/work/mysql-5.0.13573
2005-11-03 11:05:34 +04:00
igor@rurik.mysql.com
f878cc589d
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-11-02 22:24:36 -08:00
igor@rurik.mysql.com
44dd303c47
Post review fixes.
2005-11-02 22:13:10 -08:00
evgen@moonbone.local
69d985cc9d
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into moonbone.local:/work/14466-bug-5.0-mysql
2005-11-03 01:51:47 +03:00
evgen@moonbone.local
93cc0de7cf
func_gconcat.result:
...
Fixed wrong test case
table.cc:
Fixed wrong DBUG_ENTER placement
2005-11-03 01:50:36 +03:00
igor@rurik.mysql.com
cb439945c0
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-11-02 14:01:08 -08:00
igor@rurik.mysql.com
fddc99bcd8
#view.test#:
...
new file
sql_table.cc, handler.h:
Fixed bug #14540 .
Added error mnemonic code HA_ADMIN_NOT_BASE_TABLE
to report that an operation cannot be applied for views.
view.test, view.result:
Added a test case for bug #14540 .
errmsg.txt:
Fixed bug #14540 .
Added error ER_CHECK_NOT_BASE_TABLE.
2005-11-02 13:44:58 -08:00
msvensson@neptunus.(none)
ce50208814
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-11-02 22:06:00 +01:00
msvensson@neptunus.(none)
9c94aef407
BUG#14514
...
- Add tests
2005-11-02 17:34:40 +01:00
evgen@moonbone.local
c347c60998
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into moonbone.local:/work/14466-bug-5.0-mysql
2005-11-02 18:00:13 +03:00
monty@mysql.com
54d9d2e116
Portability fix
...
(BDB test failed in Intel64)
2005-11-02 16:28:58 +02:00
holyfoot@mysql.com
6b5c422fe1
Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
...
into mysql.com:/home/hf/work/mysql-5.0.13573
2005-11-02 13:01:21 +04:00
sergefp@mysql.com
96ff1e808a
BUG#14026: When doing the end-of-prepare fix up for TABLE_LISTs used in the PS, do the fixup
...
for underlying tables of a merge VIEWs, too.
2005-11-02 07:05:19 +03:00
patg@krsna.patg.net
50817d304b
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test2
2005-11-01 17:07:13 -08:00
evgen@moonbone.local
db3b5c50bc
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into moonbone.local:/work/14186-bug-5.0-mysql
2005-11-01 21:55:39 +03:00
andrey@lmy004.
d4d777fdf0
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into lmy004.:/work/mysql-5.0-bug14381
2005-11-01 19:41:24 +01:00
andrey@lmy004.
3a08c5257a
fix for bug #14381
...
(BDB keylength limitted to 255)
2005-11-01 19:37:59 +01:00
patg@krsna.patg.net
add878e818
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test2
2005-11-01 09:08:50 -08:00
evgen@moonbone.local
bbe58c7e26
Manually merged
2005-11-01 19:47:53 +03:00
hf@deer.(none)
0ec768c407
Conflicts resolving
2005-11-01 20:37:27 +04:00
evgen@moonbone.local
47059b89f5
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into moonbone.local:/work/14186-bug-4.1-mysql
2005-11-01 17:34:19 +03:00
jani@ua141d10.elisa.omakaista.fi
46c4e7b6ea
Changed MTR_BUILD_THREAD port reserving policy.
2005-11-01 16:30:55 +02:00
evgen@moonbone.local
2343ff86ca
Fix bug #14466 lost sort order in GROUP_CONCAT() in a view
...
Item_func_group_concat::print() wasn't printing sort order thus creating wrong
view. This results in reported error.
2005-11-01 17:27:10 +03:00
pem@mysql.com
c4c2dc079b
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/usr/home/pem/bug14376/mysql-5.0
2005-11-01 15:03:41 +01:00
pem@mysql.com
4e9e038ff9
Fixed BUG#14376: MySQL crash on scoped variable (re)initialization
...
Added finer scope control for default clauses of local variable
declarations.
2005-11-01 14:58:52 +01:00
monty@mysql.com
e5f48e13bf
Reverting patch for BUG #14009 (use of abs() on null value causes problems with filesort
...
Fix for bug #14536 : SELECT @a,@a:=... fails with prepared statements
2005-11-01 15:54:30 +02:00
hf@deer.(none)
f3502cd983
Additional fix for bug #14445 (analyse.test fails)
2005-11-01 16:14:26 +04:00
monty@mysql.com
19502e8eb5
Review of new pushed code
...
Removed wrong fix for bug #14009 (use of abs() on null value causes problems with filesort)
Mark that add_time(), time_diff() and str_to_date() can return null values
2005-11-01 13:00:02 +02:00
hf@deer.(none)
bb17195a1c
Fix for bug #14183 (ctype_cp983.test fails with the embedded server)
2005-11-01 13:18:46 +04:00
hf@deer.(none)
b98c93e0a8
Fix for bug #14445 (analyse.test fails)
2005-11-01 13:08:14 +04:00
hf@deer.(none)
69cd4c1ebf
gis.test fixed
2005-11-01 11:43:34 +04:00
patg@krsna.patg.net
35a0ac6aea
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test2
2005-10-31 17:28:11 -08:00
patg@krsna.patg.net
d5b252e630
BUG# 14532
...
Post-review fixes
2005-10-31 17:26:45 -08:00
kent@mysql.com
2c6902a093
mysql-test-run.pl:
...
Make IM ports change with MTR_BUILD_THREAD
2005-11-01 02:19:06 +01:00
patg@krsna.patg.net
7b611b33f2
BUG #14532
...
Added FIELD_TYPE_BIT to field method 'needs_quotes' to make BIT columns
work.
2005-10-31 17:17:16 -08:00
msvensson@neptunus.(none)
de07ac0c5a
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930
2005-10-31 13:36:03 +01:00
msvensson@neptunus.(none)
e5eb7cbf29
WL#2930 Adding view and cursor 'protocols' to mysqltest
...
- Cleanup of mysqltest.c before extending it
2005-10-31 12:25:08 +01:00
jani@ua141d10.elisa.omakaista.fi
da64397b69
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
2005-10-31 12:20:54 +02:00
jani@ua141d10.elisa.omakaista.fi
44aea416f9
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
2005-10-31 11:54:36 +02:00
hf@deer.(none)
5150bd8f9f
Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.12839
2005-10-31 12:24:43 +04:00
msvensson@neptunus.(none)
531b847f23
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-10-31 09:14:58 +01:00
sergefp@mysql.com
4ad3313cd7
BUG#14139 - Merge to 5.0
2005-10-31 09:22:33 +03:00
igor@rurik.mysql.com
6a1c8d48f6
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-2
2005-10-29 09:41:18 -07:00