Commit graph

49093 commits

Author SHA1 Message Date
ramil/ram@ramil.myoffice.izhnet.ru
54ddf93240 Merge mysql.com:/home/ram/work/b30200/b30200.5.0
into  mysql.com:/home/ram/work/b30200/b30200.5.1
2007-08-02 15:26:52 +05:00
kostja@bodhi.(none)
ea3388f2b2 Add a test case for Bug#5719 "impossible to lock VIEW".
It has been possible to lock a view in 5.1 for some time.
2007-08-02 13:59:02 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
dc84a5fd52 Fix for bug #30200: mysqlbinlog.test: connection_id() not restored under ps-protocol
Problem: thd->thread_specific_used flag is not set executing a statement
containig connection_id() function using PS protocol, that leads to 
improper binlog event creation.

Fix: set the flag in the Item_func_connection_id::fix_fields().
2007-08-02 14:51:03 +05:00
joerg@trift2.
9e756ab225 Merge trift2.:/MySQL/M50/push-5.0
into  trift2.:/MySQL/M51/push-5.1
2007-08-02 11:28:11 +02:00
joerg@trift2.
9e924569d2 Merge trift2.:/MySQL/M51/mysql-5.1
into  trift2.:/MySQL/M51/push-5.1
2007-08-02 11:22:50 +02:00
joerg@trift2.
69b789aafd Merge trift2.:/MySQL/M50/mysql-5.0
into  trift2.:/MySQL/M50/push-5.0
2007-08-02 11:18:29 +02:00
tsmith@ramayana.hindu.god
0f6f44424f Post-merge fix. Update some test results, and add an InnoDB-only
compatibility hook, thd_mark_transaction_to_rollback().
2007-08-02 02:22:31 -06:00
monty@mysql.com/nosik.monty.fi
0174fa66d5 Don't save & restore time fields from thd when it's not needed.
Added back setting of 'some_tables_deleted' to not cause deadlocks in mysql_lock_table()
2007-08-02 10:50:00 +03:00
monty@nosik.monty.fi
93f0771fca Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/home/my/mysql-5.1
2007-08-02 07:55:33 +03:00
monty@mysql.com/nosik.monty.fi
4f33d95fa3 Set --debug-check if one uses DBUG_PUSH in all clients
Fixed bug in query cache that made it impossible to run mysqld with --debug
Fixed memory leaks in mysqldump and mysqltest
Memory leaks associated with wrong usage of mysqltest is not fixed. To find these, run
mysql-test-run --debug mysqltest
2007-08-02 07:49:29 +03:00
tsmith@ramayana.hindu.god
b13de9343f Merge 50 -> 51 (-opt changesets) 2007-08-01 18:59:41 -06:00
tsmith@ramayana.hindu.god
d66b4bd4be Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/41
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
2007-08-01 18:41:02 -06:00
tsmith@ramayana.hindu.god
a52a078f75 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2007-08-01 18:40:02 -06:00
tsmith@ramayana.hindu.god
534c3f325d Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
2007-08-01 18:39:13 -06:00
tsmith@ramayana.hindu.god
9d09389ccb Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1-opt
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/41
2007-08-01 18:38:43 -06:00
tsmith@ramayana.hindu.god
76366d7931 Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2007-08-01 18:33:07 -06:00
tsmith@ramayana.hindu.god
181da56554 Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/41
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
2007-08-01 18:32:39 -06:00
tsmith@ramayana.hindu.god
7509e1ed24 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2007-08-01 18:32:01 -06:00
tsmith@ramayana.hindu.god
33c4cdaa66 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
2007-08-01 18:30:55 -06:00
tsmith@ramayana.hindu.god
c2399f04d0 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1-build
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/41
2007-08-01 18:30:28 -06:00
tsmith@ramayana.hindu.god
c215bd28c1 Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2007-08-01 18:19:28 -06:00
tsmith@ramayana.hindu.god
4e20ec041c Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/41
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
2007-08-01 18:16:23 -06:00
tsmith@ramayana.hindu.god
9ce717b0fe Merge ramayana.hindu.god:/home/tsmith/m/bk/51
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2007-08-01 18:15:24 -06:00
tsmith@ramayana.hindu.god
8575227571 Merge ramayana.hindu.god:/home/tsmith/m/bk/50
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
2007-08-01 18:14:50 -06:00
tsmith@ramayana.hindu.god
ffc2f3ab99 Merge ramayana.hindu.god:/home/tsmith/m/bk/41
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/41
2007-08-01 18:12:44 -06:00
tsmith@ramayana.hindu.god
54254530ad Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/51
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/jul31/51
2007-08-01 17:34:20 -06:00
kostja@bodhi.(none)
d63d8cb1a3 Add a test case for Bug#18287 create federated table always times out,
error 1159 ' ' (fixed by the patch for Bug 25679)
2007-08-02 03:32:54 +04:00
tsmith@ramayana.hindu.god
8143040683 Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2007-08-01 17:32:37 -06:00
tsmith@ramayana.hindu.god
ed880ad21c Remove some redundant or unused code from InnoDB (feedback from
Marko after applying latest snapshot).
2007-08-01 16:45:55 -06:00
monty@mysql.com/nosik.monty.fi
96f90711a7 Fixes Bug#30127: --debug-info no longer prints memory usage in mysql
Fixed compiler warnings, errors and link errors
Fixed new bug on Solaris with gethrtime()
Added --debug-check option to all mysql clients to print errors and memory leaks
Added --debug-info to all clients. This now works as --debug-check but also prints memory and cpu usage
2007-08-01 22:59:05 +03:00
kostja@bodhi.(none)
2459558060 Fix a valgrind warning. For some reason it never popped up before. 2007-08-01 22:40:04 +04:00
joerg@trift2.
e885a589b0 Merge trift2.:/MySQL/M51/funcs2-5.1
into  trift2.:/MySQL/M51/push-5.1
2007-08-01 16:28:03 +02:00
ramil/ram@ramil.myoffice.izhnet.ru
f376ea1ba1 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/home/ram/work/b29928.new/b29928.new.5.0
2007-08-01 19:23:39 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
fa9c26f433 After-merge fixup.
- THD::tmp_table_used removed, THD::thread_specific_used used instead.
2007-08-01 19:20:25 +05:00
joerg@trift2.
b1d498e28d Fix a bad BitKeeper dependency structure for the "funcs_2" suite:
The files below "mysql-test/suite/funcs_2" in version 5.1
did not depend on the equivalent ones in 5.0,
probably because they had been checked in independent of each other
in both versions.

Foreach file F in the suite that has a "deleted" counterpart D, use
    bk rm $F
    bk mv $D $F
    bk edit $F
to get those files into the 5.1 suite that (for BK) depend on 5.0.

There is only one file whose contents differs between 5.0 and 5.1,
restore its current 5.1 contents:
   mysql-test/suite/funcs_2/r/ndb_charset.result
2007-08-01 15:20:11 +02:00
kostja@bodhi.(none)
1c1abb4252 Fix an unstable test. 2007-08-01 16:48:14 +04:00
istruewing@chilla.local
5008318eba Merge chilla.local:/home/mydev/mysql-5.0-bug29838
into  chilla.local:/home/mydev/mysql-5.1-bug29838
2007-08-01 14:44:04 +02:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
c5209fcbd0 Merge mysql.com:/home/ram/work/b29928.new/b29928.new.5.0
into  mysql.com:/home/ram/work/b29928.new/b29928.new.5.1
2007-08-01 15:31:20 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
7fb417d0ba Fix for bug #29928: INSERT ... VALUES(connection_id(), ...) incorrect
restores from mysqlbinlog out

Problem: using "mysqlbinlog | mysql" for recoveries the connection_id() 
result may differ from what was used when issuing the statement.

Fix: if there is a connection_id() in a statement, write to binlog
SET pseudo_thread_id= XXX; before it and use the value later on.
2007-08-01 15:27:03 +05:00
jperkin@production.mysql.com
ba3729a63b Merge jperkin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  production.mysql.com:/usersnfs/jperkin/bk/mysql-5.0-maint
2007-08-01 12:09:19 +02:00
jperkin@production.mysql.com
bd77d3e17c Merge production.mysql.com:/usersnfs/jperkin/bk/mysql-5.0-maint
into  production.mysql.com:/usersnfs/jperkin/bk/mysql-5.1-maint
2007-08-01 12:04:55 +02:00
jperkin@production.mysql.com
a311c37891 Merge production.mysql.com:/usersnfs/jperkin/bk/mysql-4.1-maint
into  production.mysql.com:/usersnfs/jperkin/bk/mysql-5.0-maint
2007-08-01 12:02:35 +02:00
istruewing@chilla.local
209ea105d1 Merge chilla.local:/home/mydev/mysql-4.1-bug29838
into  chilla.local:/home/mydev/mysql-5.0-bug29838
2007-08-01 12:02:18 +02:00
jperkin@production.mysql.com
612fb66de4 Merge jperkin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into  production.mysql.com:/usersnfs/jperkin/bk/mysql-4.1-maint
2007-08-01 11:59:52 +02:00
jperkin@production.mysql.com
f5c8c9a81d Option 6 tries to grant global privileges at the database level
which does not work.  Removing these attempted privileges makes
this identical to option 5 so remove it completely.  The spirit
of the program appears to be aimed at database privileges, so do
not add another option for granting global privileges as it may
be unexpected.  Fixes bug#14618 (same as previous patch, this
time applied to -maint tree).
2007-08-01 11:58:25 +02:00
istruewing@chilla.local
e117a36c33 Bug#29838 - myisam corruption using concurrent select ... and update
When using concurrent insert with parallel index reads, it could
happen that reading sessions found keys that pointed to records
yet to be written to the data file. The result was a report of
a corrupted table. But it was false alert.

When inserting a record in a table with indexes, the keys are
inserted into the indexes before the record is written to the data
file. When the insert happens concurrently to selects, an
index read can find a key that references the record that is not
yet written to the data file. To avoid any access to such record,
the select saves the current end of file position when it starts.
Since concurrent inserts are always appended at end of the data
file, the select can easily ignore any concurrently inserted record.

The problem was that the ignore was only done for non-exact key
searches (partial key or using >, >=, < or <=).

The fix is to ignore concurrently inserted records also for
exact key searches.

No test case. Concurrent inserts cannot be tested with the test
suite. Test cases are attached to the bug report.
2007-08-01 11:54:24 +02:00
kostja@bodhi.(none)
b89ff2fd6f Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-08-01 12:32:40 +04:00
kostja@bodhi.(none)
d0dc51b4f7 Fix an unstable test. It was reliant on the current time. 2007-08-01 12:28:08 +04:00
joerg@trift2.
c6bdcd19f2 Merge trift2.:/MySQL/M51/mysql-5.1
into  trift2.:/MySQL/M51/push-5.1
2007-08-01 09:59:48 +02:00
tnurnberg@sin.intern.azundris.com
a546536a0b Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  sin.intern.azundris.com:/home/tnurnberg/10776/51-10776
2007-08-01 09:35:16 +02:00