Commit graph

36801 commits

Author SHA1 Message Date
ingo/mydev@chilla.local
1962eaaf62 Bug#20719 - Reading dynamic records with write buffer could fail
After merge fix
2006-07-30 06:19:30 +02:00
aivanov/alexi@mysql.com/mysqld.localdomain
8851926544 Make innodb_thread_concurrency 0 by default.
Fixing test result.
2006-07-30 05:16:08 +04:00
evgen@sunlight.local
ef4f149536 Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql
into  sunlight.local:/local_work/tmp_merge-5.1-opt-mysql
2006-07-30 00:33:24 +04:00
sergefp@newbox.mylan
ee3c1deed4 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into  mysql.com:/home/psergey/mysql-5.1-bug14940-r4
2006-07-30 00:02:42 +04:00
sergefp@mysql.com
cbd57af8ed BUG#14940: post-review fixes 2006-07-30 00:02:09 +04:00
evgen@sunlight.local
3ca575dc89 Merge sunlight.local:/local_work/tmp_merge-4.1-opt-mysql
into  sunlight.local:/local_work/tmp_merge-5.0-opt-mysql
2006-07-29 23:59:53 +04:00
ingo/mydev@chilla.local
9c006d44a0 Merge chilla.local:/home/mydev/mysql-4.1-bug20719
into  chilla.local:/home/mydev/mysql-5.0-bug20719
2006-07-29 21:59:36 +02:00
ingo/mydev@chilla.local
eddb73b365 Bug#20719 - Reading dynamic records with write buffer could fail
After merge fix
2006-07-29 21:58:50 +02:00
evgen@sunlight.local
8cd88a9179 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1
into  sunlight.local:/local_work/tmp_merge-5.1-opt-mysql
2006-07-29 23:54:55 +04:00
evgen@sunlight.local
285e392512 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into  sunlight.local:/home/evgen/bk-trees/mysql-5.1-opt
2006-07-29 23:44:40 +04:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
4a461fdae3 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
into  mysql.com:/Users/kent/mysql/bk/mysql-5.0
2006-07-29 17:40:10 +02:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
5d948f5ec4 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0
into  mysql.com:/Users/kent/mysql/bk/mysql-4.1
2006-07-29 17:26:06 +02:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
f2ec5d7128 configure.in:
Corrected typo
2006-07-29 17:24:48 +02:00
kroki/tomash@moonlight.intranet
cc98d26a23 Fix after manual merge. 2006-07-29 13:50:08 +04:00
kroki/tomash@moonlight.intranet
5c90b6f810 Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-merge
2006-07-29 13:43:34 +04:00
ingo/mydev@chilla.local
9a7fb080a2 Merge chilla.local:/home/mydev/mysql-5.0-bug20719
into  chilla.local:/home/mydev/mysql-5.1-bug20719
2006-07-29 09:26:03 +02:00
igreenhoe/greenman@anubis.greendragongames.com
61a3a8e95c Fix for bug #16226 (timestamp_diff truncation issue when requesting
difference between timestamp in values of months and quarters.)

Problem:  when requesting timestamp diff in months or quarters, it
would only examine the date (and not the time) for the comparison.

Solution:  increased precision of comparison.
2006-07-28 20:51:17 -07:00
aivanov/alexi@mysql.com/mysqld.localdomain
0bd3c297a4 Make innodb_flush_log_at_trx_commit a settable global variable. 2006-07-29 07:17:33 +04:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
bd47f4f3be udf_example.c, udf.test, Makefile.am:
Converted "udf_example.cc" to C, avoids C++ runtime lib dependency (bug#21336)
2006-07-29 04:41:50 +02:00
jimw@rama.(none)
69f9fe7531 Fix tests after merge and disable rpl_ndb_dd_advance due to bug 18679. 2006-07-28 19:39:34 -07:00
aivanov/alexi@mysql.com/mysqld.localdomain
7d3a584c03 Make innodb_thread_concurrency 0 by default, and extend
the usable range to 0..1000 (0 disables the thread throttling).
2006-07-29 03:56:23 +04:00
jimw@rama.(none)
f7e19b40f3 Merge rama.(none):/home/jimw/my/tmp_merge
into  rama.(none):/home/jimw/my/mysql-5.1-clean
2006-07-28 15:51:48 -07:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
01f5bc3a83 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0
into  mysql.com:/Users/kent/mysql/bk/mysql-4.1
2006-07-28 23:40:05 +02:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
2faea98324 Makefile.am, configure.in:
Man page for mysqld command move to section 8 (bug#21220)
2006-07-28 23:12:40 +02:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
c188a3bf0a make_binary_distribution.sh:
Man page for "mysqld" command move to section 8 (bug#21220)
2006-07-28 23:06:49 +02:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
ef0c9d7588 mysql.spec.sh:
Man page for "mysqld" command move to section 8 (bug#21220)
2006-07-28 22:57:57 +02:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
8daec68246 Merge mysql.com:/Users/kent/mysql/bk/tmp_merge
into  mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
2006-07-28 21:35:43 +02:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
50b09967f2 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
2006-07-28 21:29:05 +02:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
345945165a sql_select.cc:
Renamed variable, to avoid name clash with macro "rem_size"
  on AIX 5.3 and "/usr/include/sys/xmem.h" (bug#17648)
asn.cpp, asn.hpp:
  Avoid name clash with NAME_MAX
2006-07-28 21:26:46 +02:00
jimw@rama.(none)
ad78212d9f Merge bk-internal:/home/bk/mysql-5.0-maint
into  rama.(none):/home/jimw/my/mysql-5.0-16881
2006-07-28 12:19:13 -07:00
sergefp@mysql.com
699291a8e6 BUG#14940 "MySQL choose wrong index", v.2
- Make the range-et-al optimizer produce E(#table records after table 
                                           condition is applied),
- Make the join optimizer use this value,
- Add "filtered" column to EXPLAIN EXTENDED to show 
  fraction of records left after table condition is applied
- Adjust test results, add comments
2006-07-28 21:27:01 +04:00
tsmith@maint1.mysql.com
28df542a7a Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0
into  maint1.mysql.com:/data/localhome/tsmith/bk/global-50
2006-07-28 17:40:33 +02:00
kroki/tomash@moonlight.intranet
c867301b0d Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug16581
2006-07-28 18:07:47 +04:00
kostja@bodhi.local
4bd7acec3f Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
2006-07-28 18:02:38 +04:00
kostja@bodhi.local
131e3b0607 Add sql_locale.cc to cmake scripts. 2006-07-28 16:37:16 +04:00
kroki/tomash@moonlight.intranet
d06001b1a2 Bug#16581: deadlock: server and client both read from connection in
'conc_sys' test

Concurrent execution of SELECT involing at least two INFORMATION_SCHEMA
tables, DROP DATABASE statement and DROP TABLE statement could have
resulted in stalled connection for this SELECT statement.

The problem was that for the first query of a join there was a race
between select from I_S.TABLES and DROP DATABASE, and the error (no
such database) was prepared to be send to the client, but the join
processing was continued.  On second query to I_S.COLUMNS there was a
race with DROP TABLE, but this error (no such table) was downgraded to
warning, and thd->net.report_error was reset.  And so neither result
nor error was sent to the client.

The solution is to stop join processing once it is clear we are going
to report a error, and also to downgrade to warnings file system errors
like 'no such database' (unless we are in the 'SHOW' command), because
I_S is designed not to use locks and the query to I_S should not abort
if something is dropped in the middle.

No test case is provided since this bug is a result of a race, and is
timing dependant.  But we test that plain SHOW TABLES and SHOW COLUMNS
give a error if there is no such database or a table respectively.
2006-07-28 15:06:23 +04:00
aivanov/alexi@mysql.com/mysqld.localdomain
30c9ab1639 Removing temporary changes. 2006-07-28 09:05:08 +04:00
aivanov/alexi@mysql.com/mysqld.localdomain
221004a892 Removing temporary changes. 2006-07-28 05:34:59 +04:00
aivanov/alexi@mysql.com/mysqld.localdomain
17d1dba9ba Temporary changes just to check one point (will be restored) 2006-07-28 05:26:26 +04:00
aivanov/alexi@mysql.com/mysqld.localdomain
ef5acd5748 Temporary changes just to check some points (will be restored). 2006-07-28 03:32:39 +04:00
anozdrin/alik@booka.
2d082d86c9 Fix for BUG#20438: CREATE statements for views, stored routines and triggers
can be not replicable.

Now CREATE statements for writing in the binlog are created as follows:
  - the beginning of the statement is re-created;
  - the rest of the statement is copied from the original query.

The problem appears when there is a version-specific comment (produced by
mysqldump), started in the re-created part of the statement and closed in the
copied part -- there is closing comment-parenthesis, but there is no opening
one.

The proper fix could be to re-create original statement, but we can not
implement it in 5.0. So, for 5.0 the fix is just to cut closing
comment-parenthesis. This technique is also used for SHOW CREATE PROCEDURE
statement (so we are able to reuse existing code).
2006-07-28 02:49:18 +04:00
jimw@rama.(none)
e4d32625ca Merge bk-internal:/home/bk/mysql-5.0-maint
into  rama.(none):/home/jimw/my/mysql-5.0-19498
2006-07-27 11:42:34 -07:00
pgalbraith/patg@buffy.netfrastructure.com
e1723f7384 BUG #21118 "Federated Transaction test needs to have BDB switched to InnoDB"
recommented the uncommented have_innodb.inc line

federated_transactions.test:
   BUG #21118 "Federated Transaction test needs to have BDB switched to InnoDB"
  slight ommission fixed
2006-07-27 14:20:25 -04:00
pgalbraith/patg@buffy.netfrastructure.com
b4a7c01771 BUG #21118 "Federated Transaction test needs to have BDB switched to InnoDB"
Changed federated_transactions.test to use InnoDB instead of BDB

federated_transactions-slave.opt:
  BitKeeper file /home/patg/mysql-build/mysql-5.1-engines-bug21118/mysql-test/t/federated_transactions-slave.opt
federated_transactions.result:
  BUG #21118 "Federated Transaction test needs to have BDB switched to InnoDB"
  New test results for InnoDB being remote transactional table
federated_transactions.test:
  BUG #21118 "Federated Transaction test needs to have BDB switched to InnoDB"
  Changed remote transactional table from BDB to InnoDB
2006-07-27 14:02:58 -04:00
anozdrin/alik@booka.
b7f403b546 Fix for BUG#16211: Stored function return type for strings is ignored.
Fix for BUG#16676: Database CHARSET not used for stored procedures

The problem in BUG#16211 is that CHARSET-clause of the return type for
stored functions is just ignored.

The problem in BUG#16676 is that if character set is not explicitly
specified for sp-variable, the server character set is used instead
of the database one.

The fix has two parts:

  - always store CHARSET-clause of the return type along with the
    type definition in mysql.proc.returns column. "Always" means that
    CHARSET-clause is appended even if it has not been explicitly
    specified in CREATE FUNCTION statement (this affects BUG#16211 only).

    Storing CHARSET-clause if it is not specified is essential to avoid
    changing character set if the database character set is altered in
    the future.

    NOTE: this change is not backward compatible with the previous releases.

  - use database default character set if CHARSET-clause is not explicitly
    specified (this affects both BUG#16211 and BUG#16676).

    NOTE: this also breaks backward compatibility.
2006-07-27 17:57:43 +04:00
anozdrin/alik@booka.
7b34bbc43c Don't complain in the error log about IM shutdown unless
BUG#20761 is fixed.
2006-07-27 15:19:13 +04:00
kroki/tomash@moonlight.intranet
13f2b26453 Revert the change after null-merge. 2006-07-27 14:43:28 +04:00
kroki/tomash@moonlight.intranet
0f1e1f826f Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-release
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-main
2006-07-27 14:38:32 +04:00
msvensson@neptunus.(none)
155bf26d61 Merge neptunus.(none):/home/msvensson/mysql/my50-m-bug21042
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-07-27 12:31:50 +02:00
msvensson@neptunus.(none)
b3bbb3789e Bug#21042 mysql client segfaults on importing a mysqldump export
- Use strxnmov to protect the "buff" variable from overrun
2006-07-27 12:28:49 +02:00