serg@serg.mylan
c56d1c248e
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2006-02-15 16:05:35 +01:00
brian@zim.tangent.org
3195aef714
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.tangent.org:/home/brian/mysql/archive-5.1
2006-02-15 06:16:10 -08:00
msvensson@devsrv-b.mysql.com
4b18b5e786
Bug#17360 sp-code test case broken
...
- Change 94 to 95 according to Pem's instructions in bug report.
2006-02-15 14:12:36 +01:00
serg@serg.mylan
d5294e86bf
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2006-02-15 14:04:56 +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
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
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
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
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.
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.
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
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
andrey@lmy004.
d5d11a9c23
manual merge
2006-02-14 17:05:36 +01:00
tomas@poseidon.ndb.mysql.com
0262bb9a11
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-02-14 17:05:35 +01:00
tomas@poseidon.ndb.mysql.com
a185ce2f39
Bug #16445 ndb, schema version error 241 after mysqld restart
...
- table dictionary status was checked only for Invalid
2006-02-14 17:03:35 +01:00
mskold@mysql.com
dafc2c7aad
Post-review fix (WL#2987)
2006-02-14 16:50:51 +01:00
andrey@lmy004.
815927e590
- final fixes for bug#16431 (Events: An event which alters itself disappears)
...
- fix for bug#16423 (Events: SHOW CREATE EVENT doesn't work)
- this Changeset commits makes CREATE/UPDATE/DELETE EVENT real DDL statements
by committing the currently open transaction before they are executed.
- this Changeset also fixes a trailing space problem since the very early days
of the internal cron
- adds sophisticated checking of whether mysql.event was tampered accidentally
or with purpose by an user.
- adds a lot of inline function documentation - documents everything left
uncodumented
- INTERVAL_XXXX to XXX in I_S.EVENTS.INTERVAL_FIELD
WL#1034 (Internal CRON)
2006-02-14 16:20:48 +01:00
serg@serg.mylan
8a242d96e5
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.1-nl
2006-02-14 15:09:28 +01:00
mskold@mysql.com
36715c70f7
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-14 15:01:41 +01:00
aelkin@mysql.com
bce89a9f5b
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 15:26:01 +02:00
evgen@moonbone.local
8f904e9cab
Fixed bug#16272: IF function with decimal args can produce wrong result
...
The Item_func_if::fix_length_and_dec() function when calculating length of
result doesn't take into account unsigned_flag. But it is taken when
calculating length of temporary field. This result in creating field that
shorter than needed. Due to this, in the reported query 40.0 converted to 9.99.
The function Item_func_if::fix_length_and_dec() now adds 1 to the max_length if
the unsigned_flag isn't set.
2006-02-14 16:22:37 +03:00
serg@serg.mylan
9db19fdf9e
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.1-nl
2006-02-14 13:26:47 +01:00
serg@serg.mylan
b283fb79d0
MATCH(a,b) AGAINST (... IN NATURAL LANGUAGE MODE)
...
remove explicit $<ulong_num>$ from sql_yacc.yy
2006-02-14 13:19:54 +01:00
mskold@mysql.com
5230866f59
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-14 11:51:44 +01:00
aelkin@mysql.com
5bd5967bdb
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 12:44:26 +02:00
aelkin@mysql.com
4f85993945
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 12:42:27 +02:00
svoj@april.(none)
7e8b145b94
BUG#17117: header fille "plugin.h" does not have a namespace prefix
...
plugin.h has been moved into include/mysql/plugin.h
2006-02-14 13:51:25 +04:00
gluh@mysql.com
49606011f0
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-new
2006-02-14 12:53:49 +04:00
gluh@eagle.intranet.mysql.r18.ru
c42a608d6f
Bug#16591 Partitions: crash using information_schema.partitions
...
Bug#16695 Reading I_S.PARTITIONS with pre-5.1.6 partitioned tables crashes server
issue a warning in case of error during table opening
2006-02-14 12:52:38 +04:00