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
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
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
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
msvensson@neptunus.(none)
52183ddd78
Change from std_data to std_data_ln
2006-02-14 17:15:24 +01:00
andrey@lmy004.
d5d11a9c23
manual merge
2006-02-14 17:05:36 +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
msvensson@neptunus.(none)
215726d1cd
Merge neptunus.(none):/home/msvensson/mysql/bug17280/my51-bug17280
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-14 15:35:17 +01:00
msvensson@neptunus.(none)
fed5a68ea8
Merge neptunus.(none):/home/msvensson/mysql/bug17280/my50-bug17280
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-14 15:34:30 +01:00
msvensson@neptunus.(none)
8e5c8ff62a
Merge neptunus.(none):/home/msvensson/mysql/bug17280/my50-bug17280
...
into neptunus.(none):/home/msvensson/mysql/bug17280/my51-bug17280
2006-02-14 15:33:10 +01:00
ingo@mysql.com
54c15f1377
Merge mysql.com:/home/mydev/mysql-5.1-wl1563-msg
...
into mysql.com:/home/mydev/mysql-5.1-bug8841
2006-02-14 15:30:29 +01:00
ingo@mysql.com
7c06b0a4c1
Merge mysql.com:/home/mydev/mysql-5.1
...
into mysql.com:/home/mydev/mysql-5.1-bug8841
2006-02-14 15:22:24 +01: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
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
ingo@mysql.com
b4b5dc18c4
Merge mysql.com:/home/mydev/mysql-5.0-bug8841
...
into mysql.com:/home/mydev/mysql-5.1-bug8841
2006-02-14 09:29:37 +01:00
msvensson@neptunus.(none)
0a531dcec9
Make sure slave cluster is stopped if there is cluster support
2006-02-14 09:15:51 +01:00
tomas@poseidon.ndb.mysql.com
dfe8bb9d4f
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 08:33:52 +01:00
tomas@poseidon.ndb.mysql.com
69280e63bc
disabled non deterministic test
2006-02-14 08:32:39 +01:00
bar@mysql.com
d967e6200c
Merge mysql.com:/usr/home/bar/mysql-5.0.cs_fs
...
into mysql.com:/usr/home/bar/mysql-5.1-new.fscs
2006-02-14 09:41:34 +04:00
bar@mysql.com
cc3623aecf
Many files:
...
Backporting character_set_filesystem from 5.0 to 5.1.
2006-02-14 08:24:01 +04:00
lars@mysql.com
e9a8a765ef
Removed version information from test
2006-02-14 02:18:41 +01:00
aivanov@mysql.com
e1a316bcc0
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/alexi/innodb/mysql-5.1-ss115x
2006-02-14 01:27:49 +03:00
aivanov@mysql.com
434c60bdf0
Deleted innodb_unsafe_binlog.test erroneously merged from
...
the innodb-5.0-ss115 snapshot.
2006-02-14 01:25:13 +03:00
tomas@poseidon.ndb.mysql.com
b04be2212f
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-13 20:52:42 +01:00
tomas@poseidon.ndb.mysql.com
b1967abdce
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-13 20:35:35 +01:00
tomas@poseidon.ndb.mysql.com
87a6266fa4
Bug #17179 schema creation fails
...
-flag was set on field intable share instead of table
2006-02-13 20:34:36 +01:00
lars@mysql.com
5b66df060f
BUG#17339: Missed line in previous patch
2006-02-13 19:52:57 +01:00
lars@mysql.com
dc81a3c7b9
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new
...
into mysql.com:/users/lthalmann/bk/mysql-5.1-new-bug17339
2006-02-13 19:46:53 +01:00
lars@mysql.com
0c6d1690d9
Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/users/lthalmann/bkroot/mysql-5.1-new
2006-02-13 19:42:34 +01:00
brian@zim.tangent.org
778ca614a1
Fix for bad merge.
2006-02-13 10:21:33 -08:00
jimw@mysql.com
7cdfacde68
Bug #16775 : DROP TABLE of subpartitioned table can fail if default engine
...
used. The problem is that the actual engine was not stored in the .par
file, causing confusion when the default engine was changed. Now the
actual storage engine is stored for subpartitions, as was intended.
2006-02-13 10:15:42 -08:00
lars@mysql.com
11dde18f88
BUG#17339: Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
...
For this particular bug report it was rpl_loadfile.test that did not make proper cleanup, but the patch
includes fixes for other tests aswell.
2006-02-13 19:03:12 +01:00
aelkin@mysql.com
e7a0822a47
Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/5.0
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/5.0-bug16217
2006-02-13 19:17:02 +02:00
aelkin@mysql.com
312f68133c
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-13 19:13:33 +02:00
lars@mysql.com
004f399057
Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/users/lthalmann/bkroot/mysql-5.1-new
2006-02-13 15:02:51 +01:00
brian@zim.tangent.org
0b30190c22
Disabling a test, I will look at it tomorrow. Something is wrong with the merge from 5.0. Its probably a flush that is missing somewhere but I am too tired to figure it out at the moment.
2006-02-13 05:31:43 -08:00
brian@zim.tangent.org
618495e394
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.tangent.org:/home/brian/mysql/cleanup-5.1
2006-02-13 04:06:50 -08:00