igor@rurik.mysql.com
510ab81362
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into rurik.mysql.com:/home/igor/mysql-4.1
2006-04-21 08:22:03 -07:00
igor@rurik.mysql.com
639e875032
Post merge fixes
2006-04-21 08:19:38 -07:00
kroki@mysql.com
4bd62e5848
Merge mysql.com:/home/tomash/src/mysql_ab/mysql-5.0
...
into mysql.com:/home/tomash/src/mysql_ab/mysql-5.0-bug6951
2006-04-21 19:02:05 +04:00
kroki@mysql.com
b0c1e49a11
Bug#15728: LAST_INSERT_ID function inside a stored function returns 0
...
Do not reset value of LAST_INSERT_ID() in sub-statement.
2006-04-21 18:55:04 +04:00
tomas@poseidon.ndb.mysql.com
e38f6bc590
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-04-21 16:42:31 +02:00
msvensson@neptunus.(none)
752dd29157
Disable udf test
2006-04-21 15:57:03 +02:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
c949342101
Merge mronstrom@bk-internal.mysql.com:/home/bk/bugs/bug16002
...
into c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug16002
2006-04-21 09:52:51 -04:00
tomas@poseidon.ndb.mysql.com
0bdfbfe8da
Bug #19255 ndb: restore of ndb backup from different endian does not work
...
+ removed not needed --
2006-04-21 15:36:10 +02:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
fa3c74b420
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826
2006-04-21 09:30:05 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
9181f4e229
Merge mronstrom@bk-internal.mysql.com:/home/bk/bugs/bug19067
...
into c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19067
2006-04-21 09:22:13 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
4d0a4e1199
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826
2006-04-21 08:57:53 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
dc8a0bd64d
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18962
2006-04-21 08:55:01 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
82dfff9d08
BUG#19067: Crash when ALTER TABLE for default subpartitioned table
2006-04-21 08:43:07 -04:00
msvensson@neptunus.(none)
9c0b7459ab
Merge bk-internal:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-04-21 14:28:35 +02:00
tomas@poseidon.ndb.mysql.com
77e3fc3a09
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2006-04-21 14:02:21 +02:00
tomas@poseidon.ndb.mysql.com
fe67d648fc
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-04-21 14:00:44 +02:00
ramil@production.mysql.com
aed861fd86
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into production.mysql.com:/usersnfs/rkalimullin/4.1.b18643
2006-04-21 13:56:40 +02:00
tomas@poseidon.ndb.mysql.com
f071779791
Bug #17230 Can't change character-sets-dir for ndbd
2006-04-21 13:53:48 +02:00
tomas@poseidon.ndb.mysql.com
7dbc18bd07
ndb: corrected install dir
...
ndb: corrected initialization of records
2006-04-21 13:51:58 +02:00
msvensson@neptunus.(none)
d1640175db
Don't run mysqld when started in ddd
...
Maybe we should do the same for gdb?
2006-04-21 12:30:33 +02:00
tomas@poseidon.ndb.mysql.com
fa21279e8e
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-04-21 11:32:25 +02:00
pem@mysql.com
8c5ae25ff5
Merge mysql.com:/extern/mysql/bk/mysql-5.0-runtime
...
into mysql.com:/extern/mysql/5.0/bug18344/mysql-5.0-runtime
2006-04-21 10:22:06 +02:00
msvensson@neptunus.(none)
e984716c01
Merge bk-internal:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/my50-bug19190
2006-04-21 10:17:16 +02:00
tomas@poseidon.ndb.mysql.com
9a2938b571
added one more missing install path for new files
2006-04-21 09:43:21 +02:00
igor@rurik.mysql.com
37ac782206
Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-04-21 00:36:20 -07:00
tomas@poseidon.ndb.mysql.com
b9b202327d
added missing install paths for new files
2006-04-21 08:53:25 +02:00
igor@rurik.mysql.com
fd3e924164
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2006-04-20 22:34:37 -07:00
igor@rurik.mysql.com
fc7514151f
Fixed bug #18767 .
...
The bug caused wrong result sets for union constructs of the form
(SELECT ... ORDER BY order_list1 [LIMIT n]) ORDER BY order_list2.
For such queries order lists were concatenated and limit clause was
completely neglected.
2006-04-20 22:15:38 -07:00
jimw@mysql.com
ec00b92f48
Bug #12792 : @@system_time_zone is not SELECTable
...
Bug #15684 : @@version_* are not all SELECTable
Added the appropriate information as read-only system variables, and
also removed some special-case handling of @@version along the way.
@@version_bdb was added, but isn't included in the test because it
depends on the presence of BDB.
2006-04-20 21:56:53 -07:00
jimw@mysql.com
4d392fb9f4
Bug #16195 : SHOW VARIABLES doesn't report correctly sql_warnings and sql_notes values
...
SQL_WARNINGS and SQL_NOTES were being displayed with SHOW_BOOL, but they
are system variables that need SHOW_SYS to be used.
2006-04-20 20:41:12 -07:00
jimw@mysql.com
57980ef4d5
Bug #18617 : mysql-test-run.pl, partially wrong handling of option "start-dirty"
...
This was a case of too much code. The --start-dirty option should act
just like --start-and-exit, except it skips the database initialization
step. Now it does, which means it picks up the options from the specified
test case.
2006-04-20 19:17:14 -07:00
tomas@poseidon.ndb.mysql.com
1fbac122de
added missing files
2006-04-21 02:05:27 +02:00
tomas@poseidon.ndb.mysql.com
424a2a7f8d
added missing files
2006-04-21 02:01:13 +02:00
igor@rurik.mysql.com
1afc70d03e
Merge rurik.mysql.com:/home/igor/tmp_merge
...
into rurik.mysql.com:/home/igor/dev/mysql-5.1-2
2006-04-20 17:00:29 -07:00
tomas@poseidon.ndb.mysql.com
c247d853ab
diabled failing tests again
2006-04-21 01:59:22 +02:00
tomas@poseidon.ndb.mysql.com
8f957a8058
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-04-21 01:56:15 +02:00
tomas@poseidon.ndb.mysql.com
8f9cc67841
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-04-21 01:53:44 +02:00
tomas@poseidon.ndb.mysql.com
cc138b5a3b
Bug#18594 ndb_restore log boken in 5.1
...
- added compatability with 5.0
- added test case for compatability with 5.0 and 5.1
2006-04-21 01:51:58 +02:00
igor@rurik.mysql.com
0a65106cfb
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into rurik.mysql.com:/home/igor/mysql-5.1
2006-04-20 16:14:17 -07:00
evgen@moonbone.local
663fee9c05
Fixed bug#18739: non-standard HAVING extension was allowed in strict ANSI sql mode.
...
The SQL standard doesn't allow to use in HAVING clause fields that are not
present in GROUP BY clause and not under any aggregate function in the HAVING
clause. However, mysql allows using such fields. This extension assume that
the non-grouping fields will have the same group-wise values. Otherwise, the
result will be unpredictable. This extension allowed in strict
MODE_ONLY_FULL_GROUP_BY sql mode results in misunderstanding of HAVING
capabilities.
The new error message ER_NON_GROUPING_FIELD_USED message is added. It says
"non-grouping field '%-.64s' is used in %-.64s clause". This message is
supposed to be used for reporting errors when some field is not found in the
GROUP BY clause but have to be present there. Use cases for this message are
this bug and when a field is present in a SELECT item list not under any
aggregate function and there is GROUP BY clause present which doesn't mention
that field. It renders the ER_WRONG_FIELD_WITH_GROUP error message obsolete as
being more descriptive.
The resolve_ref_in_select_and_group() function now reports the
ER_NON_GROUPING_FIELD_FOUND error if the strict mode is set and the field for
HAVING clause is found in the SELECT item list only.
2006-04-21 01:52:59 +04:00
aivanov@mysql.com
364621abc0
Restoring changes erroneously removed by applying
...
the innodb-5.0-ss476 snapshot.
2006-04-21 01:37:31 +04:00
aivanov@mysql.com
25d9a75d12
Applied innodb-5.0-ss476 snapshot.
...
Fix BUG#18934: "InnoDB crashes when table uses column like DB_ROW_ID".
Also, fix memory leaks in row_create_table_for_mysql() in rare
corner cases.
2006-04-21 01:07:37 +04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
006176ba1f
Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18962
...
into c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19067
2006-04-20 14:21:05 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
a3f152cc6e
Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new
...
into c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18962
2006-04-20 14:16:27 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
14d8f0c3cd
Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new
...
into c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19067
2006-04-20 14:13:49 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
570c74e456
BUG#19067: Alter table add partition for subpartitioned table crashes
...
Changed variable name for improved clarity and debugging possibilities
Fixed bug in not assigning subpart_type
2006-04-20 14:11:54 -04:00
mleich@mysql.com
4cbad914ca
Post merge correction for the Changesset
...
Fixes for Bug#12429: Replication tests fail: "Slave_IO_Running" (?) differs related to MySQL 4.1
and Bug#16920 rpl_deadlock_innodb fails in show slave status (reported for MySQL 5.1)
2006-04-20 19:43:02 +02:00
pekka@mysql.com
a272f257c2
ndb/repl - bug#19004 rpl_ndb_2myisam ok, rpl_ndb_2innodb new bug(number)19227
2006-04-20 18:53:23 +02:00
konstantin@mysql.com
f14040e4d8
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/opt/local/work/mysql-5.1-merge
2006-04-20 20:49:41 +04:00
igor@rurik.mysql.com
18149be57c
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into rurik.mysql.com:/home/igor/mysql-5.1
2006-04-20 07:24:34 -07:00