kostja@bodhi.local
7290fa2fb7
Post-merge fixes.
2006-08-30 23:09:47 +04:00
evgen@moonbone.local
fe18e36e73
sql_base.cc, ndb_condition_pushdown.result, opt_range.cc:
...
After merge changes
2006-08-30 22:11:23 +04:00
Reggie@blackhole.
3d5fe499f0
disabled some tests to get passing tests
2006-08-30 11:16:53 -05:00
gluh@mysql.com/gluh.(none)
af9895d4c2
Bug#20393 User name truncation in mysql client
...
Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte
2006-08-30 15:56:17 +05:00
kostja@bodhi.local
cb26d47570
Post-merge fixes.
2006-08-30 03:22:59 +04:00
kostja@bodhi.local
ebb7070430
Merge bodhi.local:/opt/local/work/mysql-5.0-runtime-safemerge
...
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
2006-08-30 03:00:19 +04:00
kostja@bodhi.local
8566db3fc7
Remove the fix for Bug#10668 "CREATE USER does not enforce username
...
length limit", it's superseded by the fix for Bug#16899 "Possible buffer
overflow in handling of DEFINER-clause". Update test results.
2006-08-30 01:48:15 +04:00
jonas@perch.ndb.mysql.com
365b69dc7f
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-08-29 22:56:23 +02:00
kostja@bodhi.local
f8d34e1030
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into bodhi.local:/opt/local/work/mysql-5.0-14897
2006-08-30 00:45:33 +04:00
kostja@bodhi.local
3bf609b7f2
A fix for Bug#14897 "ResultSet.getString("table.column") sometimes
...
doesn't find the column"
When a user was using 4.1 tables with VARCHAR column and 5.0 server
and a query that used a temporary table to resolve itself, the
table metadata for the varchar column sent to client was incorrect:
MYSQL_FIELD::table member was empty.
The bug was caused by implicit "upgrade" from old VARCHAR to new
VARCHAR hard-coded in Field::new_field, which did not preserve
the information about the original table. Thus, the field metadata
of the "upgraded" field pointed to an auxiliary temporary table
created for query execution.
The fix is to copy the pointer to the original table to the new field.
2006-08-30 00:38:58 +04:00
rburnett@bk-internal.mysql.com
001aaedddc
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
...
into bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
2006-08-29 21:15:49 +02:00
istruewing@chilla.local
7439a52434
Merge chilla.local:/home/mydev/mysql-4.0-bug14400
...
into chilla.local:/home/mydev/mysql-4.1-bug14400
2006-08-29 21:08:40 +02:00
istruewing@chilla.local
0b2a9d01ed
Bug#14400 - Query joins wrong rows from table which is
...
subject of "concurrent insert"
Better fix by Monty: "The previous bug fix didn't work
when using partial keys."
2006-08-29 20:45:04 +02:00
guilhem@gbichot3.local
5890c2cfe2
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into gbichot3.local:/home/mysql_src/mysql-5.1-maint
2006-08-29 17:38:15 +02:00
guilhem@gbichot3.local
73625c3a11
Fix for BUG#20866 "show table status on innodb raises assertion"
...
and its duplicate BUG#19057 "Test 'rpl_row_func003' fails on SuSE SLES9 x86".
It was an assertion failure, only in debug builds, not present
in released versions (nothing to document).
It happened when doing SHOW TABLE STATUS on an InnoDB table
having an auto_increment column, right after creating the table.
The test which would have caught this problem was disabled in
mid-April for another reason (how much I like tests disabled for
months...).
2006-08-29 17:37:48 +02:00
evgen@moonbone.local
8cf9781717
Merge moonbone.local:/work/tmp_merge-5.0-mysql
...
into moonbone.local:/work/tmp_merge-5.1-opt-mysql
2006-08-29 18:58:50 +04:00
timour/timka@lamia.home
0368914b9a
Merge lamia.home:/home/timka/mysql/src/5.0-bug-21456
...
into lamia.home:/home/timka/mysql/src/5.1-bug-21456
2006-08-29 16:39:09 +03:00
cmiller@zippy.cornsilk.net
6233d8c696
Correcting bad merge.
2006-08-29 09:30:58 -04:00
kroki/tomash@moonlight.intranet
cb4ea78cbd
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0
...
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug17591
2006-08-29 16:24:00 +04:00
anozdrin/alik@alik.
1a7cb4153c
Preliminary patch for the following bugs:
...
- BUG#15934: Instance manager fails to work;
- BUG#18020: IM connect problem;
- BUG#18027: IM: Server_ID differs;
- BUG#18033: IM: Server_ID not reported;
- BUG#21331: Instance Manager: Connect problems in tests;
The only test suite has been changed
(server codebase has not been modified).
2006-08-29 15:46:40 +04:00
kroki/tomash@moonlight.intranet
b9fef61616
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0
...
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug17591
2006-08-29 14:37:52 +04:00
kroki/tomash@moonlight.intranet
f8f1dd3e87
BUG#17591: Updatable view not possible with trigger or stored function
...
When a view was used inside a trigger or a function, lock type for
tables used in a view was always set to READ (thus making the view
non-updatable), even if we were trying to update the view.
The solution is to set lock type properly.
2006-08-29 14:32:59 +04:00
jonas@perch.ndb.mysql.com
7357e431a3
Merge perch.ndb.mysql.com:/home/jonas/src/51-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-08-29 10:49:05 +02:00
jonas@perch.ndb.mysql.com
3cb9b16e0d
ndb -
...
Add order by in rpl_(ndb)_multi_update3 to make result deterministic
2006-08-29 10:47:28 +02:00
iggy@rolltop.ignatz42.dyndns.org
5de6240a93
Post merge changes.
2006-08-28 21:13:55 -04:00
iggy@rolltop.ignatz42.dyndns.org
76bf7c81ae
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint_21527
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-new-maint_21527
2006-08-28 20:41:22 -04:00
iggy@rolltop.ignatz42.dyndns.org
bfe86ca448
Bug #21527 mysqldump incorrectly tries to LOCK TABLES on the information_schema database.
...
init_dumping now accepts a function pointer to the table or view specific init_dumping function. This allows both tables and views to use the init_dumping function.
2006-08-28 17:48:06 -04:00
rburnett@bk-internal.mysql.com
f80ba7a147
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
...
into bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
2006-08-28 17:56:44 +02:00
timour/tkatchaounov@dl145s.mysql.com
4761ea5c82
Merge tkatchaounov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145s.mysql.com:/data/tkatchaounov/autopush/5.0-bug-21456
2006-08-28 16:08:48 +02:00
evgen@moonbone.local
109d58af66
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into moonbone.local:/work/tmp_merge-4.1-opt-mysql
2006-08-27 23:43:11 +04:00
evgen@moonbone.local
002af6b5ea
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into moonbone.local:/work/tmp_merge-5.1-opt-mysql
2006-08-27 00:49:25 +04:00
evgen@moonbone.local
13f50fdb69
Merge moonbone.local:/work/tmp_merge-4.1-mysql
...
into moonbone.local:/work/tmp_merge-4.1-opt-mysql
2006-08-26 23:11:34 +04:00
evgen@moonbone.local
bafd6d5065
Merge moonbone.local:/work/tmp_merge-5.0-opt-mysql
...
into moonbone.local:/work/tmp_merge-5.0-mysql
2006-08-26 22:17:34 +04:00
msvensson@neptunus.(none)
4703f302fe
Dont' ever use cluster for slave in 4.1
2006-08-26 18:38:42 +02:00
mikael/pappa@dator5.(none)
cb77c9b721
Enabled partition test again
2006-08-26 10:40:58 -04:00
mikael/pappa@dator5.(none)
b28a550eb4
Merge dator5.(none):/home/pappa/clean-mysql-5.1-kt
...
into dator5.(none):/home/pappa/bug21388
2006-08-26 06:14:05 -04:00
cmiller@zippy.cornsilk.net
5db9cce5fd
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
2006-08-25 14:34:17 -04:00
msvensson@neptunus.(none)
5abbe9eb00
Ignore --skip-im if specified on command line
...
Null merge to 5.0
2006-08-25 17:01:04 +02:00
andrey@example.com
f115ecf89f
Fix for bug#21795: SP: sp_head::is_not_allowed_in_function() contains
...
erroneous check
Problem: Actually there were two problems in the server code. The check
for SQLCOM_FLUSH in SF/Triggers were not according to the existing
architecture which uses sp_get_flags_for_command() from sp_head.cc .
This function was also missing a check for SQLCOM_FLUSH which has a
problem combined with prelocking. This changeset fixes both of these
deficiencies as well as the erroneous check in
sp_head::is_not_allowed_in_function() which was a copy&paste error.
2006-08-25 15:51:29 +02:00
msvensson@neptunus.(none)
7e8f06c46f
Add mysqld-max-nt to list of mysqld executales to look for on windows
2006-08-25 15:23:42 +02:00
msvensson@neptunus.(none)
f0c4aba723
Backport from 5.0 a fix that will start ndb only for tests that needs it
2006-08-25 15:17:03 +02:00
sergefp@mysql.com
46480b22d2
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/home/psergey/mysql-5.0-bug16255-merge
2006-08-25 14:44:28 +04:00
jonas@perch.ndb.mysql.com
e4c3a58134
Merge perch.ndb.mysql.com:/home/jonas/src/51-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-08-25 11:59:28 +02:00
igor@rurik.mysql.com
218a96d2c6
Fixed bug #21390 : wrong estimate of rows after elimination of
...
const tables. This resulted in choosing extremely inefficient
execution plans in same cases when distribution of data in
joined were skewed (see the customer test case for the bug).
2006-08-25 02:17:41 -07:00
msvensson@neptunus.(none)
31aa966718
Fix running tests suite with non standard tmp dir.
...
Default is "var/tmp"
2006-08-25 10:46:14 +02:00
msvensson@neptunus.(none)
655bdac0bc
Merge bk-internal:/home/bk/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-08-25 10:11:55 +02:00
msvensson@neptunus.(none)
37be9fa3a7
Backport fix for finding executables from 5.0
2006-08-25 10:11:15 +02:00
jonas@perch.ndb.mysql.com
c6e8be9808
ndb - bug#21806
...
disable ndb_autodiscover3 (cluster restart (--initial))
2006-08-25 08:57:38 +02:00
cmiller@zippy.cornsilk.net
b9aaf4b24d
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1-new-maint
2006-08-24 16:47:59 -04:00
tnurnberg@salvation.intern.azundris.com
a417492688
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1-maint
2006-08-24 21:12:17 +02:00