bell@sanja.is.com.ua
9b1bf2da5a
merge
2005-02-10 18:01:06 +02:00
pem@mysql.comhem.se
51296b5399
Added missing #ifdef HAVE_INNOBASE_DB:s in sql_parse.cc.
2005-02-10 11:40:54 +01:00
konstantin@mysql.com
c55a2de573
Fix bad 4.1->5.0 merge of Bug#6273 (mysql_config --libs when using bundled
...
zlib)
2005-02-09 21:59:30 +03:00
lenz@mysql.com
420d29159f
Merge mysql.com:/space/my/mysql-4.1-merge
...
into mysql.com:/space/my/mysql-5.0
2005-02-09 17:52:31 +01:00
lenz@mysql.com
a0089319d2
- make sure to include the embedded test results in the source distribution
2005-02-09 17:49:43 +01:00
lenz@mysql.com
8999d5ab11
- added copyright header on top of the fill_help_tables.sql file (BUG#5772)
...
- updated mysql-copyright-2 to properly convert this new header from GPL to commercial for the
commercial distribution
2005-02-09 17:40:10 +01:00
kent@mysql.com
9a564f832a
Merge
2005-02-09 16:56:58 +01:00
msvensson@neptunus.homeip.net
b8490b5524
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0
2005-02-09 16:26:06 +01:00
msvensson@neptunus.homeip.net
0ed971878d
Fix so that master and master1 does not write to same .trace file
2005-02-09 16:23:22 +01:00
wax@mysql.com
00cc3cbfed
Merge vkishkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/wax/mysql/mysql-5.0
2005-02-09 19:20:53 +05:00
serg@serg.mylan
3e708a27b1
Merge
2005-02-09 15:16:47 +01:00
serg@serg.mylan
184410c475
gone:
...
merged
auto-union
2005-02-09 15:16:14 +01:00
wax@mysql.com
bc9e89a85d
Merge mysql.com:/home/wax/mysql/mysql-5.0
...
into mysql.com:/home/wax/mysql/mysql-5.0test
2005-02-09 19:16:00 +05:00
wax@kishkin.ru
a0507f98b9
merge
2005-02-09 19:13:20 +05:00
msvensson@neptunus.homeip.net
e64145818b
Fix core dump in ha_ndbcluster::print_results
2005-02-09 15:09:13 +01:00
mskold@bk-internal.mysql.com
14e3d36ad4
Removed old files
2005-02-09 14:35:50 +01:00
serg@serg.mylan
78cf24fb8c
clean up gone
2005-02-09 14:05:01 +01:00
serg@serg.mylan
902e78ffb0
Merge serg.mylan:/usr/home/serg/Abk/m50-broken
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-02-09 13:48:31 +01:00
hf@deer.(none)
dca227bac6
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into deer.(none):/home/hf/work/mysql-5.0.clean
2005-02-09 16:34:03 +04:00
hf@deer.(none)
2f7f2dfe5d
Fix for NCHAR bug appeared during the merging
2005-02-09 16:32:43 +04:00
msvensson@neptunus.homeip.net
a995633ab7
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0
2005-02-09 11:16:50 +01:00
msvensson@neptunus.homeip.net
facc7b4da1
Updated style after review
2005-02-09 11:14:02 +01:00
bell@sanja.is.com.ua
7df94d5e9b
fixed C++ syntax in C code
...
fixed end of string detection in string->decimal conversion to avoid false alarm about some string part left unconverted (string can be not null terminated)
ignore my_decimal.cc in libmysqld directory
2005-02-09 11:35:22 +02:00
hf@deer.(none)
96558f6ad3
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into deer.(none):/home/hf/work/mysql-5.0.clean
2005-02-09 02:54:08 +04:00
hf@deer.(none)
b94a482ee9
Precision Math implementation
2005-02-09 02:50:45 +04:00
pem@mysql.comhem.se
2c26ebe359
WL#2130: Table locking for stored FUNCTIONs
...
Collect all tables and SPs refered by a statement, and open all tables
with an implicit LOCK TABLES. Do find things refered by triggers and views,
we open them first (and then repeat this until nothing new is found), before
doing the actual lock tables.
2005-02-08 20:52:50 +01:00
jan@hundin.mysql.fi
6e6daf8189
Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into hundin.mysql.fi:/home/jan/mysql-5.0
2005-02-08 14:48:25 +02:00
pekka@mysql.com
22c1836728
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/orca/space/pekka/ndb/version/my50
2005-02-08 11:12:55 +01:00
tomas@poseidon.ndb.mysql.com
6c9cf886dd
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-02-08 11:12:54 +01:00
pekka@mysql.com
f6dff046e4
ndb - workaround to strnxfrm 5.0 problem
2005-02-08 10:33:58 +01:00
monty@mysql.com
286cadade9
Merge mysql.com:/home/my/mysql-4.1 into mysql.com:/home/my/mysql-5.0
2005-02-08 11:18:40 +02:00
monty@mysql.com
e795134875
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-02-08 10:55:06 +02:00
tomas@poseidon.ndb.mysql.com
6c25300796
ndbcluster now runs clean in 4.1, 5.0 may still need some work
2005-02-08 06:11:05 +01:00
jimw@mysql.com
1f21b05c53
Merge mysql.com:/home/jimw/my/mysql-5.0-7931
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-02-07 12:20:37 -08:00
jimw@mysql.com
bd72e16540
Merge mysql.com:/home/jimw/my/mysql-5.0-6368
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-02-07 12:20:08 -08:00
jimw@mysql.com
5f28ad75c3
Merge mysql.com:/home/jimw/my/mysql-5.0-7856
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-02-07 12:19:32 -08:00
monty@mysql.com
09cb17374b
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-02-07 21:10:15 +02:00
tomas@poseidon.ndb.mysql.com
9a1e257087
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-02-07 19:31:02 +01:00
monty@mysql.com
dcb7865548
Merge with 4.1 to get bug fix
2005-02-07 19:42:03 +02:00
tomas@poseidon.ndb.mysql.com
9220ef26d0
Merge
2005-02-07 18:05:11 +01:00
tomas@poseidon.ndb.mysql.com
ee985f9a7e
mysql-test-run.sh:
...
fixed start-and-exit flag
2005-02-07 17:59:46 +01:00
tomas@poseidon.ndb.mysql.com
3249388a5d
have test suite continue even if ndbcluster fails to start if --force flag is set
2005-02-07 17:46:52 +01:00
monty@mysql.com
c926d8a0be
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-02-07 18:26:14 +02:00
monty@mysql.com
80acd88168
Added comment
2005-02-07 18:24:21 +02:00
monty@mysql.com
3fe60486e4
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-02-07 18:14:31 +02:00
monty@mysql.com
32f91f48e8
Fixed bug in HAVING when refering to RAND() through alias
...
(BUG 8216)
2005-02-07 18:13:57 +02:00
acurtis@pcgem.rdg.cyberkinetica.com
95aaf76682
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/wl1967.extra1
2005-02-07 15:27:17 +00:00
tomas@poseidon.ndb.mysql.com
e0f82ff5fa
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-02-07 16:27:16 +01:00
tomas@poseidon.ndb.mysql.com
3a0d0e996a
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-02-07 16:25:51 +01:00
tomas@poseidon.ndb.mysql.com
f963a53fa5
mysql.spec.sh:
...
removed typo
moved pre to post for directory creation
add changelog comments
2005-02-07 16:25:07 +01:00
