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
holyfoot@mysql.com
e9f256e2bd
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 14:54:13 +04: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
kent@mysql.com
48040f775d
Merge
2005-11-03 11:50:38 +01:00
kent@mysql.com
3db6108cde
base64.c:
...
Pack ported compatibility changes from 5.1
2005-11-03 11:42:26 +01:00
msvensson@neptunus.(none)
10163332a7
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/bug13957/my50-bug13957
2005-11-03 11:01:13 +01:00
holyfoot@deer.(none)
c5313e8d4f
Fix for bug #14268 (Bad FLOAT->DECIMAL conversion)
2005-11-03 13:49:37 +04:00
jani@ua141d10.elisa.omakaista.fi
8243eee9db
Added test-force to Makefile.
2005-11-03 11:47:54 +02:00
sergefp@mysql.com
a88ecb9a3d
Post-merge fixes
2005-11-03 12:38:46 +03:00
msvensson@neptunus.(none)
b34fbd8629
Bug#13957 yassl: opensrv6c compile failure
...
- Added some ifdefs and turn off auto template instantiation, use explicit template instantiation
2005-11-03 10:37:49 +01: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
2476aa5a70
Added new build script for pentium64.
2005-11-03 11:19:06 +02: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
jimw@mysql.com
592a4c7cb3
Don't add optimization flags to CFLAGS if the user specified their
...
own CFLAGS (ditto for CXXFLAGS). (Bug #12640 )
2005-11-02 18:29:06 -08:00
jimw@mysql.com
90e4346396
Don't allow startup when default storage engine is specified to be a
...
storage engine that is disabled. This was fixed once in 4.1, but regressed
in 5.0 because of changes to storage engine initialization. (Bug #9815 )
2005-11-02 17:56:12 -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)
f0f7b941d1
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-11-02 20:20:56 +01:00
evgen@moonbone.local
005eaff6b8
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into moonbone.local:/work/14466-bug-5.0-mysql
2005-11-02 21:47:35 +03:00
monty@mysql.com
9946b15b3d
Merge monty@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/my/mysql-5.0
2005-11-02 19:44:10 +02:00
konstantin@mysql.com
c2f224be5e
Fix -ansi -pedantic compilation failure
2005-11-02 20:44:09 +03:00
monty@mysql.com
74b3e9ae76
Merge monty@192.168.0.9:/my/mysql-5.0
...
into mysql.com:/my/mysql-5.0
2005-11-02 19:28:50 +02:00
monty@mysql.com
f2f4bf5240
wait_for_update must unlock mutex.
...
(Fixed failure in rpl0000008.test)
2005-11-02 19:28:49 +02:00
monty@mysql.com
9cab1f08fd
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-11-02 19:09:29 +02:00
msvensson@neptunus.(none)
9c94aef407
BUG#14514
...
- Add tests
2005-11-02 17:34:40 +01:00
reggie@fedora.(none)
52eb44b042
make the IM compile on Windows
2005-11-02 09:30:01 -06: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
holyfoot@mysql.com
dc78f2ea4d
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 18:58:25 +04:00
msvensson@neptunus.(none)
8e7dfad543
BUG#14514 Creating table with packed key fails silently
2005-11-02 15:53:04 +01:00
holyfoot@deer.(none)
4eea84268b
Additional fix for #13573
2005-11-02 18:46:13 +04:00