Commit graph

8793 commits

Author SHA1 Message Date
igor@rurik.mysql.com
60a4b4fb16 Merge rurik.mysql.com:/home/igor/mysql-5.0
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-11-05 22:45:54 -08:00
igor@rurik.mysql.com
0960f5fedc Post review fixes. 2005-11-05 22:41:36 -08:00
sergefp@mysql.com
33026e5237 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-oct03-push
2005-11-05 05:46:41 +03:00
igor@rurik.mysql.com
84ad20364d Merge rurik.mysql.com:/home/igor/mysql-5.0
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-11-04 15:03:29 -08:00
monty@mysql.com
2d39028ef2 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/my/mysql-5.0
2005-11-04 10:03:31 +02:00
monty@mysql.com
89fdc4f49e DROP created procedures
(Caused sp-security to fail)
2005-11-04 10:02:43 +02:00
sergefp@mysql.com
7dfca7b9ff Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-oct03-push
2005-11-03 22:35:18 +03:00
jani@ua141d10.elisa.omakaista.fi
fcea95c2e5 Disabled ps_protocol for two statements. 2005-11-03 20:29:21 +02:00
holyfoot@deer.(none)
a6ada95d1e test enabled 2005-11-03 21:01:27 +04:00
holyfoot@mysql.com
1d8243c8ed Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
into mysql.com:/home/hf/work/mysql-5.0.9551
2005-11-03 20:58:43 +04:00
holyfoot@mysql.com
a8b38c1d5a Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
into mysql.com:/home/hf/work/mysql-5.0.9551
2005-11-03 19:47:08 +04:00
jani@ua141d10.elisa.omakaista.fi
2940a338c5 Disabled a test temporarily. 2005-11-03 17:39:40 +02:00
jani@ua141d10.elisa.omakaista.fi
cbf8a00c0b 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 15:39:55 +02:00
sergefp@mysql.com
0cdaa61a8f Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-oct03-push
2005-11-03 16:23:47 +03:00
sergefp@mysql.com
749d78fcd4 Merge mysql.com:/home/psergey/mysql-5.0-bug14026-r2
into mysql.com:/home/psergey/mysql-5.0-oct03-push
2005-11-03 16:21:21 +03:00
jani@ua141d10.elisa.omakaista.fi
3d7d8af3aa Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
2005-11-03 15:01:04 +02:00
jani@ua141d10.elisa.omakaista.fi
c66f53e277 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 14:48:09 +02:00
konstantin@mysql.com
d702915356 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/opt/local/work/mysql-5.0-14210
2005-11-03 15:24:55 +03:00
holyfoot@mysql.com
bac54a7774 Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
into mysql.com:/home/hf/work/mysql-5.0.9551
2005-11-03 16:19:46 +04:00
holyfoot@deer.(none)
e529fdc5ee Merging 2005-11-03 16:17:11 +04:00
konstantin@mysql.com
7e3f757f2d A fix and a test case for Bug#14210 "Simple query with > operator on
large table gives server crash": make sure that when a MyISAM temporary
table is created for a cursor, it's created in its memory root,
not the memory root of the current query.
2005-11-03 14:20:13 +03:00
jani@ua141d10.elisa.omakaista.fi
b8248334d9 Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.0
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
2005-11-03 13:02:05 +02:00
holyfoot@mysql.com
401d19f036 Merge mysql.com:/home/hf/work/mysql-4.1.14183
into mysql.com:/home/hf/work/mysql-5.0.9551
2005-11-03 14:58:36 +04:00
evgen@moonbone.local
55790f74bb Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into moonbone.local:/work/14093-bug-5.0-mysql
2005-11-03 13:55:08 +03:00
evgen@moonbone.local
30fdafea76 Fix bug #14093 Query takes a lot of time when date format is not valid
Invalid date like 2000-02-32 wasn't converted to int, which lead to not
using index and comparison with field as astring, which results in slow
query execution.

convert_constatn_item() and get_mm_leaf() now forces MODE_INVALID_DATES to
allow such conversion.
2005-11-03 13:53:49 +03:00
sergefp@mysql.com
a88ecb9a3d Post-merge fixes 2005-11-03 12:38:46 +03:00
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