ndbdev@ndbmaster.mysql.com
c71c156c19
ndb dd - Fix includes
2006-02-15 13:20:17 +01:00
jonas@perch.ndb.mysql.com
e9d9261d63
ndb dd -
...
Fix bug in tsman undo
2006-02-15 13:20:15 +01:00
ingo@mysql.com
aa10c18a6e
Merge mysql.com:/home/mydev/mysql-5.1
...
into mysql.com:/home/mydev/mysql-5.1-bug8841
2006-02-15 13:02:24 +01:00
mskold@mysql.com
5e4df23c96
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-work
2006-02-15 12:52:30 +01:00
andrey@lmy004.
a01ed15419
cosmetic changes of the fix for bug#17289 (no privileges checks in EVENTS), before push
2006-02-15 12:14:23 +01:00
msvensson@neptunus.(none)
6a43d635c8
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-15 12:03:36 +01:00
msvensson@neptunus.(none)
56ef2e28e4
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-15 12:02:20 +01:00
gluh@eagle.intranet.mysql.r18.ru
544a1a98a5
Fix for bug#16907 Partitions: crash, SELECT goes into last partition, UNIQUE INDEX
...
In presense of subpartitioning use get_part_partition_id() to calculate part_id
2006-02-15 14:34:51 +04:00
mskold@mysql.com
64aa3861a4
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-work
2006-02-15 11:19:45 +01:00
ingo@mysql.com
aa12184eda
Merge mysql.com:/home/mydev/mysql-5.1
...
into mysql.com:/home/mydev/mysql-5.1-bug8841
2006-02-15 10:56:13 +01:00
msvensson@neptunus.(none)
aacf783e86
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-15 10:53:25 +01:00
gluh@eagle.intranet.mysql.r18.ru
00fc4cabe5
Fix for bug#16901 Partitions: crash, SELECT, column of part. function=first column of primary key
...
use part_info->no_subparts to calculate partition range in case of subpartitions
2006-02-15 13:42:43 +04:00
brian@zim.tangent.org
d56430423a
This patch adds a new field to the meta file for tracking flushes (this is being kept to later do stats and determine how often the compression buffer is being foiled). This should keep things all nice an compatible between versions.
...
Also added a flush table test as well. Found one possible bug in OPTIMIZE TABLE which has never been reported, but I think it would be possible on a file system that ran out of disk.
2006-02-15 00:59:24 -08:00
ingo@mysql.com
4c1735186b
Merge mysql.com:/home/mydev/mysql-5.1
...
into mysql.com:/home/mydev/mysql-5.1-bug8841
2006-02-15 07:43:43 +01:00
stewart@mysql.com
e50298980c
BUG#17411 cannot have path longer than 128 characters
...
Use the POSIX limits.h define of PATH_MAX for maximum path length.
This has been being hit in pushbuild
2006-02-15 16:37:09 +11:00
jimw@mysql.com
a58c542e61
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2006-02-14 18:14:04 -08:00
jimw@mysql.com
d70c47b2a9
Merge mysql.com:/home/jimw/my/mysql-4.1-16389
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2006-02-14 18:12:30 -08:00
aelkin@mysql.com
e7c73bb754
Merge mysql.com:/home/elkin/MySQL/BARE/5.1-new
...
into mysql.com:/home/elkin/MySQL/MERGE/5.1-new
2006-02-15 03:24:07 +02:00
brian@zim.tangent.org
1d3775a371
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.tangent.org:/home/brian/mysql/cleanup-5.1
2006-02-14 16:20:06 -08:00
aelkin@mysql.com
cb24989122
BUG#16217 merge
2006-02-15 02:19:42 +02:00
serg@serg.mylan
4e68f1ba3a
post-merge fixes for dbug
2006-02-15 00:14:37 +01:00
aelkin@mysql.com
3737486d56
Merge elkin@koti:MySQL/Merge/5.1-new/
...
into mysql.com:/home/elkin/MySQL/MERGE/5.1-new
2006-02-15 01:08:02 +02:00
serg@serg.mylan
48b8e842ca
Automerge
2006-02-15 00:01:46 +01:00
andrey@lmy004.
9db6d13cc4
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-bug17289
2006-02-14 23:35:13 +01:00
serg@serg.mylan
94d225aa6f
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2006-02-14 22:57:12 +01:00
serg@serg.mylan
a511d770ee
my_bool is internal type, so should be SHOW_MY_BOOL
2006-02-14 22:51:16 +01:00
serg@serg.mylan
63cfd11859
dbug changes:
...
1. dbug state is now local to a thread
2. new macros: DBUG_EXPLAIN, DBUG_EXPLAIN_INITIAL,
DBUG_SET, DBUG_SET_INITIAL, DBUG_EVALUATE, DBUG_EVALUATE_IF
3. macros are do{}while(0) wrapped
4. incremental modifications to the dbug state (e.g. "+d,info:-t")
5. dbug code cleanup, style fixes
6. _db_on_ and DEBUGGER_ON/OFF removed
7. rest of MySQL code fixed because of 3 (missing ;) and 6
8. dbug manual updated
9. server variable @@debug (global and local) to control dbug from SQL!
a. -#T to print timestamps in the log
2006-02-14 22:36:11 +01:00
andrey@lmy004.
dd999e9eee
make declarations of mysql_db_table_last_check and mysql_db_table_fields
...
visible event in libmysqld. fixes build problem.
2006-02-14 22:21:23 +01:00
aelkin@mysql.com
9b1e80b941
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1-new
2006-02-14 22:02:42 +02:00
andrey@lmy004.
3e6376589b
make it explicitly extern. this should fix build failure on FC4
2006-02-14 20:58:19 +01:00
andrey@lmy004.
6d54ee58a4
manual merge
2006-02-14 20:27:42 +01:00
ingo@mysql.com
db905454ab
Merge mysql.com:/home/mydev/mysql-5.1
...
into mysql.com:/home/mydev/mysql-5.1-bug8841
2006-02-14 20:17:25 +01:00
andrey@lmy004.
e9af8c1d83
post-merge fixes of bug 16548
2006-02-14 20:10:51 +01:00
aelkin@mysql.com
a70ac6eadf
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1-new
2006-02-14 20:51:08 +02:00
aelkin@mysql.com
7397bc8fb4
Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1-new
2006-02-14 20:48:34 +02:00
brian@zim.tangent.org
1d908def20
Added --silent option andd just test results via select. This will keep down the appearance of non deterministic responses.
...
This is for bug#17384
2006-02-14 10:46:46 -08:00
andrey@lmy004.
a47a706d1f
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-bug17289
2006-02-14 19:44:10 +01:00
andrey@lmy004.
07ab9e38c8
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-bug16548
2006-02-14 19:33:18 +01:00
aelkin@mysql.com
42cc473df3
Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-5.0
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0
2006-02-14 20:19:00 +02:00
paul@snake-hub.snake.net
8298c79b6b
Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1
2006-02-14 12:18:23 -06:00
brian@zim.tangent.org
60e0d94f7d
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.tangent.org:/home/brian/mysql/cleanup-5.1
2006-02-14 10:18:22 -08:00
aelkin@mysql.com
6423fe2d49
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-5.0
2006-02-14 20:15:17 +02:00
paul@snake-hub.snake.net
bf683f51bc
mysqlimport.c:
...
Revise option description for --help message.
2006-02-14 12:11:26 -06:00
ingo@mysql.com
b068e845a2
Merge mysql.com:/home/mydev/mysql-5.1
...
into mysql.com:/home/mydev/mysql-5.1-bug8841
2006-02-14 18:34:44 +01:00
andrey@lmy004.
bb3ac3e368
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-bug17289
2006-02-14 17:54:03 +01:00
andrey@lmy004.
446c791e56
post-merge fixes
2006-02-14 17:51:22 +01:00
evgen@moonbone.local
131217eb6f
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into moonbone.local:/work/16272-bug-5.0-mysql
2006-02-14 19:46:35 +03:00
tomas@poseidon.ndb.mysql.com
cea8c9af30
disabled a bunch of tests with reference to bugreporsts to cleanup push-build
2006-02-14 17:40:05 +01:00
msvensson@neptunus.(none)
9a06392b2f
Merge neptunus.(none):/home/msvensson/mysql/bug17233/my50-bug17233
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-14 17:25:44 +01:00
msvensson@neptunus.(none)
dc5bb00467
Enable ndb_load test case
2006-02-14 17:21:18 +01:00