stewart@willster.(none)
49eb41e09d
BUG#20073 information_schema.FILES for UNDO LOG give incorrect EXTENT_SIZE, FREE_EXTENTS,
...
Change things around so that we add a row for each log file group that lists
the free space for that log file group.
2006-09-19 01:44:32 +10:00
pekka@orca.ndb.mysql.com
a2928a35d8
Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb
...
into orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-bug20612
2006-09-11 08:45:22 +02:00
pekka@orca.ndb.mysql.com
8e88d8d54f
ndb - bug#20612 ins-del fix in tup
2006-09-10 21:58:51 +02:00
jmiller/ndbdev@mysql.com/ndb08.mysql.com
03f2add932
Updated test case due to pb test failure on sol10-sparc-a' -max
2006-09-06 19:42:01 +02:00
jmiller/ndbdev@ndb08.mysql.com
8f0a7e4ebf
Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
...
into mysql.com:/data2/mysql-5.1-new-ndb
2006-09-06 14:58:28 +02:00
jonas@perch.ndb.mysql.com
e51935b363
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-09-06 02:16:36 +02:00
jonas@perch.ndb.mysql.com
81f9676de6
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-09-03 17:55:01 +02:00
jmiller/ndbdev@ndb08.mysql.com
2bed1a07ee
Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
...
into mysql.com:/data2/mysql-5.1-new-ndb
2006-09-01 22:47:10 +02:00
anozdrin/alik@alik.
faad252336
Merge alik.:/mnt/raid/alik/MySQL/devel/5.1-tree
...
into alik.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
2006-09-01 22:24:51 +04:00
mskold/marty@linux.site
712f1f3da4
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2006-09-01 16:16:49 +02:00
mskold/marty@mysql.com/linux.site
166580275c
Removed absolute path
2006-09-01 16:14:59 +02:00
mskold/marty@linux.site
04a62eb684
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2006-09-01 15:26:03 +02:00
mskold/marty@mysql.com/linux.site
8fdc781d39
Fixed ndbapi-examples, and added tests for mysql-test-run.pl
2006-09-01 15:14:50 +02:00
evgen@moonbone.local
e1c245bff3
Merge moonbone.local:/home/evgen/bk-trees/mysql-5.1-opt
...
into moonbone.local:/work/tmp_merge-5.1-mysql
2006-09-01 14:08:38 +04:00
mikael/pappa@dator5.(none)
636d902305
Removed Windows from tests since bug#19107 is known to hang test
2006-09-01 02:12:30 -04:00
mikael/pappa@dator5.(none)
35304be521
Merge dator5.(none):/home/pappa/clean-mysql-5.1-new-ndb
...
into dator5.(none):/home/pappa/push_clone
2006-08-31 16:45:46 -04:00
anozdrin/alik@alik.
5d8598a405
Fix im_instance_conf.imtest failure on AIX and HPUX.
...
The problem was in dummy grep on AIX and HPUX.
The fix is to use more portable patterns.
The patch is only for test suite
(i.e. does not touch server codebase).
2006-08-31 18:48:50 +04:00
jonas@perch.ndb.mysql.com
7fc7ef51e1
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1
2006-08-31 11:02:12 +02:00
mikael/pappa@dator5.(none)
5109531b61
Merge dator5.(none):/home/pappa/clean-mysql-5.1-kt
...
into dator5.(none):/home/pappa/push_clone
2006-08-31 04:56:09 -04:00
mikael/pappa@dator5.(none)
ba792224c4
Merge dator5.(none):/home/pappa/clean-mysql-5.1
...
into dator5.(none):/home/pappa/push_clone
2006-08-31 04:49:34 -04:00
gluh@mysql.com/gluh.(none)
acaef19c61
Bug#21862 Misleading error message 1490: "A PRIMARY KEY need to include all fields..."
...
fixed error message
2006-08-31 13:43:26 +05:00
mikael/pappa@dator5.(none)
67ca3ba522
Merge dator5.(none):/home/pappa/clean-mysql-5.1-kt
...
into dator5.(none):/home/pappa/bug21388
2006-08-31 04:26:14 -04:00
mikael/pappa@dator5.(none)
8c5db16fc5
Merge dator5.(none):/home/pappa/clean-mysql-5.1
...
into dator5.(none):/home/pappa/bug21388
2006-08-31 04:21:14 -04:00
evgen@moonbone.local
94028c618f
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into moonbone.local:/work/tmp_merge-5.1-opt-mysql
2006-08-31 12:14:27 +04:00
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
jmiller/ndbdev@mysql.com/ndb08.mysql.com
7894ff2c64
Had issues with older clone where I could not pull latest patches. So I pulled a fresh clone. Moved updated test cases over and restested. Therefore I have to do a new commit for these files.
2006-08-30 15:28:51 +02: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
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
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
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
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
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
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
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
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
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
jonas@perch.ndb.mysql.com
c6e8be9808
ndb - bug#21806
...
disable ndb_autodiscover3 (cluster restart (--initial))
2006-08-25 08:57:38 +02:00
jonas@perch.ndb.mysql.com
a7513025c4
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-24 20:31:54 +02:00
jonas@perch.ndb.mysql.com
392b7ea14b
ndb -
...
disable ndb_binlog_discover as it's broken
remove debug printout
2006-08-24 20:31:12 +02:00