Commit graph

37911 commits

Author SHA1 Message Date
unknown
e0bdce865a Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  sin.intern.azundris.com:/home/tnurnberg/30951/50-30951
2007-10-12 11:54:44 +02:00
unknown
91f6d169a6 Bug#30951: makedate returns different results depending on version of mysql
makedate() will fold years below 100 into the 1970-2069 range. CS removes code
that also wrongly folded years between 100 and 200 into that range, which should
be left unchanged. Backport from 5.1.


mysql-test/r/func_sapdb.result:
  Show that makedate() works correctly for 100 <= year < 200.
mysql-test/t/func_sapdb.test:
  Show that makedate() works correctly for 100 <= year < 200.
sql-common/my_time.c:
  Remove unnecessary date magic. Syncs behaviour with 5.1+
  and manual.
2007-10-12 11:46:48 +02:00
unknown
0d128c0746 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  sin.intern.azundris.com:/home/tnurnberg/30821/50-30821


sql/mysqld.cc:
  Auto merged
2007-10-12 11:30:53 +02:00
unknown
c83bff9915 Bug#30821: setting --tc_heuristic_recover tries to set myisam_stats_method
Options to mysqld were not processed correctly because switch statement
was missing some "break"s. CS adds them.

No test case; would require .opt file and server restart. Manually tested.


sql/mysqld.cc:
  Add missing "break"s to switch() in mysqld to fix option processing.
2007-10-12 11:23:45 +02:00
unknown
c236111f6c Removed debian dir. It was a mistake to embed it in the tree in the first place.
BitKeeper/deleted/.del-Makefile.am~2cb643bedd5f474:
  Delete: debian/Makefile.am
BitKeeper/deleted/.del-README.Maintainer:
  Delete: debian/README.Maintainer
BitKeeper/deleted/.del-changelog:
  Delete: debian/changelog
BitKeeper/deleted/.del-compat:
  Delete: debian/compat
BitKeeper/deleted/.del-control.in:
  Delete: debian/control.in
BitKeeper/deleted/.del-copyright.more:
  Delete: debian/copyright.more
BitKeeper/deleted/.del-copyright:
  Delete: debian/copyright
BitKeeper/deleted/.del-defs.mk.in:
  Delete: debian/defs.mk.in
BitKeeper/deleted/.del-libmysqlclientSLIB-dev.README.Maintainer.in:
  Delete: debian/libmysqlclientSLIB-dev.README.Maintainer.in
BitKeeper/deleted/.del-libmysqlclientSLIB-dev.dirs.in:
  Delete: debian/libmysqlclientSLIB-dev.dirs.in
BitKeeper/deleted/.del-libmysqlclientSLIB-dev.docs.in:
  Delete: debian/libmysqlclientSLIB-dev.docs.in
BitKeeper/deleted/.del-libmysqlclientSLIB-dev.examples.in:
  Delete: debian/libmysqlclientSLIB-dev.examples.in
BitKeeper/deleted/.del-libmysqlclientSLIB-dev.files.in:
  Delete: debian/libmysqlclientSLIB-dev.files.in
BitKeeper/deleted/.del-libmysqlclientSLIB-dev.links.in:
  Delete: debian/libmysqlclientSLIB-dev.links.in
BitKeeper/deleted/.del-libmysqlclientSLIBoff.README.Debian.in:
  Delete: debian/libmysqlclientSLIBoff.README.Debian.in
BitKeeper/deleted/.del-libmysqlclientSLIBoff.dirs.in:
  Delete: debian/libmysqlclientSLIBoff.dirs.in
BitKeeper/deleted/.del-libmysqlclientSLIBoff.docs.in:
  Delete: debian/libmysqlclientSLIBoff.docs.in
BitKeeper/deleted/.del-libmysqlclientSLIBoff.files.in:
  Delete: debian/libmysqlclientSLIBoff.files.in
BitKeeper/deleted/.del-libmysqlclientSLIBoff.postinst.in:
  Delete: debian/libmysqlclientSLIBoff.postinst.in
BitKeeper/deleted/.del-libndbclientNLIB-dev.dirs.in:
  Delete: debian/libndbclientNLIB-dev.dirs.in
BitKeeper/deleted/.del-libndbclientNLIB-dev.files.in:
  Delete: debian/libndbclientNLIB-dev.files.in
BitKeeper/deleted/.del-libndbclientNLIB-dev.links.in:
  Delete: debian/libndbclientNLIB-dev.links.in
BitKeeper/deleted/.del-libndbclientNLIB.README.Debian.in:
  Delete: debian/libndbclientNLIB.README.Debian.in
BitKeeper/deleted/.del-libndbclientNLIB.dirs.in:
  Delete: debian/libndbclientNLIB.dirs.in
BitKeeper/deleted/.del-libndbclientNLIB.files.in:
  Delete: debian/libndbclientNLIB.files.in
BitKeeper/deleted/.del-libndbclientNLIB.postinst.in:
  Delete: debian/libndbclientNLIB.postinst.in
BitKeeper/deleted/.del-mysql-client-BASE.NEWS.in:
  Delete: debian/mysql-client-BASE.NEWS.in
BitKeeper/deleted/.del-mysql-client-BASE.README.Debian.in:
  Delete: debian/mysql-client-BASE.README.Debian.in
BitKeeper/deleted/.del-mysql-client-BASE.dirs.in:
  Delete: debian/mysql-client-BASE.dirs.in
BitKeeper/deleted/.del-mysql-client-BASE.docs.in:
  Delete: debian/mysql-client-BASE.docs.in
BitKeeper/deleted/.del-mysql-client-BASE.files.in:
  Delete: debian/mysql-client-BASE.files.in
BitKeeper/deleted/.del-mysql-client-BASE.lintian-overrides.in:
  Delete: debian/mysql-client-BASE.lintian-overrides.in
BitKeeper/deleted/.del-mysql-common.README.Debian.in:
  Delete: debian/mysql-common.README.Debian.in
BitKeeper/deleted/.del-mysql-common.dirs.in:
  Delete: debian/mysql-common.dirs.in
BitKeeper/deleted/.del-mysql-common.files.in:
  Delete: debian/mysql-common.files.in
BitKeeper/deleted/.del-mysql-common.postrm.in:
  Delete: debian/mysql-common.postrm.in
BitKeeper/deleted/.del-mysql-common.preinst.in:
  Delete: debian/mysql-common.preinst.in
BitKeeper/deleted/.del-mysql-extra-BASE.dirs.in:
  Delete: debian/mysql-extra-BASE.dirs.in
BitKeeper/deleted/.del-mysql-extra-BASE.files.in:
  Delete: debian/mysql-extra-BASE.files.in
BitKeeper/deleted/.del-mysql-management-BASE.dirs.in:
  Delete: debian/mysql-management-BASE.dirs.in
BitKeeper/deleted/.del-mysql-management-BASE.files.in:
  Delete: debian/mysql-management-BASE.files.in
BitKeeper/deleted/.del-mysql-management-BASE.mysql-management.init.in:
  Delete: debian/mysql-management-BASE.mysql-management.init.in
BitKeeper/deleted/.del-mysql-server-BASE.NEWS.in:
  Delete: debian/mysql-server-BASE.NEWS.in
BitKeeper/deleted/.del-mysql-server-BASE.README.Debian.in:
  Delete: debian/mysql-server-BASE.README.Debian.in
BitKeeper/deleted/.del-mysql-server-BASE.config.in:
  Delete: debian/mysql-server-BASE.config.in
BitKeeper/deleted/.del-mysql-server-BASE.dirs.in:
  Delete: debian/mysql-server-BASE.dirs.in
BitKeeper/deleted/.del-mysql-server-BASE.docs.in:
  Delete: debian/mysql-server-BASE.docs.in
BitKeeper/deleted/.del-mysql-server-BASE.files.in:
  Delete: debian/mysql-server-BASE.files.in
BitKeeper/deleted/.del-mysql-server-BASE.links.in:
  Delete: debian/mysql-server-BASE.links.in
BitKeeper/deleted/.del-mysql-server-BASE.lintian-overrides.in:
  Delete: debian/mysql-server-BASE.lintian-overrides.in
BitKeeper/deleted/.del-mysql-server-BASE.logcheck.ignore.paranoid.in:
  Delete: debian/mysql-server-BASE.logcheck.ignore.paranoid.in
BitKeeper/deleted/.del-my.cnf:
  Delete: debian/additions/my.cnf
BitKeeper/deleted/.del-mysql-server-BASE.logcheck.ignore.server.in:
  Delete: debian/mysql-server-BASE.logcheck.ignore.server.in
BitKeeper/deleted/.del-mysql-server-BASE.logcheck.ignore.workstation.in:
  Delete: debian/mysql-server-BASE.logcheck.ignore.workstation.in
BitKeeper/deleted/.del-mysql-server-BASE.mysql-server.logrotate.in:
  Delete: debian/mysql-server-BASE.mysql-server.logrotate.in
BitKeeper/deleted/.del-mysql-server-BASE.postinst.in:
  Delete: debian/mysql-server-BASE.postinst.in
BitKeeper/deleted/.del-mysql-server-BASE.postrm.in:
  Delete: debian/mysql-server-BASE.postrm.in
BitKeeper/deleted/.del-mysql-server-BASE.preinst.in:
  Delete: debian/mysql-server-BASE.preinst.in
BitKeeper/deleted/.del-mysql-server-BASE.prerm.in:
  Delete: debian/mysql-server-BASE.prerm.in
BitKeeper/deleted/.del-mysql-server-BASE.templates.in:
  Delete: debian/mysql-server-BASE.templates.in
BitKeeper/deleted/.del-mysql-server-PREV.preinst.in:
  Delete: debian/mysql-server-PREV.preinst.in
BitKeeper/deleted/.del-mysql-server.lintian-overrides:
  Delete: debian/additions/mysql-server.lintian-overrides
BitKeeper/deleted/.del-mysql-server.preinst.in:
  Delete: debian/mysql-server.preinst.in
BitKeeper/deleted/.del-mysql-storage-BASE.dirs.in:
  Delete: debian/mysql-storage-BASE.dirs.in
BitKeeper/deleted/.del-mysql-storage-BASE.files.in:
  Delete: debian/mysql-storage-BASE.files.in
BitKeeper/deleted/.del-mysql-storage-BASE.mysql-storage.init.in:
  Delete: debian/mysql-storage-BASE.mysql-storage.init.in
BitKeeper/deleted/.del-mysql-test-BASE.dirs.in:
  Delete: debian/mysql-test-BASE.dirs.in
BitKeeper/deleted/.del-mysql-test-BASE.files.in:
  Delete: debian/mysql-test-BASE.files.in
BitKeeper/deleted/.del-mysql-tools-BASE.dirs.in:
  Delete: debian/mysql-tools-BASE.dirs.in
BitKeeper/deleted/.del-mysql-tools-BASE.files.in:
  Delete: debian/mysql-tools-BASE.files.in
BitKeeper/deleted/.del-rules:
  Delete: debian/rules
BitKeeper/deleted/.del-source.lintian-overrides.in:
  Delete: debian/source.lintian-overrides.in
BitKeeper/deleted/.del-watch:
  Delete: debian/watch
BitKeeper/deleted/.del-POTFILES.in.in:
  Delete: debian/po/POTFILES.in.in
BitKeeper/deleted/.del-ca.po:
  Delete: debian/po/ca.po
BitKeeper/deleted/.del-cs.po:
  Delete: debian/po/cs.po
BitKeeper/deleted/.del-da.po:
  Delete: debian/po/da.po
BitKeeper/deleted/.del-de.po:
  Delete: debian/po/de.po
BitKeeper/deleted/.del-es.po:
  Delete: debian/po/es.po
BitKeeper/deleted/.del-eu.po:
  Delete: debian/po/eu.po
BitKeeper/deleted/.del-fr.po:
  Delete: debian/po/fr.po
BitKeeper/deleted/.del-gl.po:
  Delete: debian/po/gl.po
BitKeeper/deleted/.del-it.po:
  Delete: debian/po/it.po
BitKeeper/deleted/.del-ja.po:
  Delete: debian/po/ja.po
BitKeeper/deleted/.del-nb.po:
  Delete: debian/po/nb.po
BitKeeper/deleted/.del-ndb_mgmd.cnf:
  Delete: debian/additions/ndb_mgmd.cnf
BitKeeper/deleted/.del-nl.po:
  Delete: debian/po/nl.po
BitKeeper/deleted/.del-pt.po:
  Delete: debian/po/pt.po
BitKeeper/deleted/.del-pt_BR.po:
  Delete: debian/po/pt_BR.po
BitKeeper/deleted/.del-ro.po:
  Delete: debian/po/ro.po
BitKeeper/deleted/.del-ru.po:
  Delete: debian/po/ru.po
BitKeeper/deleted/.del-sv.po:
  Delete: debian/po/sv.po
BitKeeper/deleted/.del-templates.pot:
  Delete: debian/po/templates.pot
BitKeeper/deleted/.del-tr.po:
  Delete: debian/po/tr.po
2007-10-12 02:15:32 -07:00
unknown
24a567e9f6 Fix for bug : field.h:1649: virtual int Field_bit::cmp(const uchar*, const uchar*): Assertion
Problem: GROUP_CONCAT(DISTINCT BIT_FIELD...) uses a tree to store keys;
which are constructed using a temporary table fields,
see Item_func_group_concat::setup().
As a) we don't store null bits in the tree where the bit fields store parts 
of their data and b) there's no method to properly compare two table records
we've got problem.

Fix: convert BIT fields to INT in the temporary table used.


mysql-test/r/func_gconcat.result:
  Fix for bug : field.h:1649: virtual int Field_bit::cmp(const uchar*, const uchar*): Assertion
    - test result.
mysql-test/t/func_gconcat.test:
  Fix for bug : field.h:1649: virtual int Field_bit::cmp(const uchar*, const uchar*): Assertion
    - test case.
sql/item_sum.cc:
  Fix for bug : field.h:1649: virtual int Field_bit::cmp(const uchar*, const uchar*): Assertion
    - force the create_tmp_table() to convert BIT columns to INT 
      in order to be able to compare records containing BIT fields.
2007-10-11 17:20:34 +05:00
unknown
1c7b80dff9 Fix for bug : "Repair" command on MyISAM crashes with small
myisam_sort_buffer_size.

An incorrect length of the sort buffer was used when calculating the
maximum number of keys. When myisam_sort_buffer_size is small enough,
this could result in the number of keys < number of
BUFFPEK structures which in turn led to use of uninitialized BUFFPEKs.

Fixed by correcting the buffer length calculation.


myisam/sort.c:
  Use a correct buffer length when calculating the maximum number of keys.
  Assert that for each BUFFPEK structure there is at least one
  corresponding key. Otherwise we would fail earlier and not reach
  merge_buffers().
mysql-test/r/repair.result:
  Added a test case for bug .
mysql-test/t/repair.test:
  Added a test case for bug .
2007-10-11 14:28:12 +04:00
unknown
bdd5b62399 Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.0-maint
into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint
2007-10-11 08:25:49 +04:00
unknown
c7ca2283a9 Merge ramayana.hindu.god:/home/tsmith/m/bk/50
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50


mysql-test/mysql-test-run.pl:
  Auto merged
scripts/mysql_system_tables_data.sql:
  Auto merged
2007-10-10 14:12:36 -06:00
unknown
80ace29416 Bug : Potential crash due to access of NULL thd in mark_transaction_to_rollback()
Introduced in mark_transaction_to_rollback(), part of fix for bug 24989;
fix is to check thd for NULL before using it.


sql/sql_class.cc:
  It is possible that mark_transaction_to_rollback() may be
  called in rare circumstances when thd is NULL (e.g., from
  some calls to convert_error_code_to_mysql()).  Don't use thd
  if it is NULL.
2007-10-10 14:00:57 -06:00
unknown
4e4dccb9aa Merge polly.(none):/home/kaa/src/maint/mysql-4.1-maint
into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint
2007-10-10 23:46:16 +04:00
unknown
ca188d3e67 Merge polly.(none):/home/kaa/src/maint/bug28878/my50-bug28878
into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint
2007-10-10 23:44:01 +04:00
unknown
74ce197bda Merge polly.(none):/home/kaa/src/maint/bug28878/my41-bug28878
into  polly.(none):/home/kaa/src/maint/mysql-4.1-maint
2007-10-10 23:39:53 +04:00
unknown
06e9aae707 Merge polly.(none):/home/kaa/src/maint/bug28878/my41-bug28878
into  polly.(none):/home/kaa/src/maint/bug28878/my50-bug28878


mysql-test/r/innodb_mysql.result:
  Null merge.
mysql-test/t/innodb_mysql.test:
  Null merge.
sql/field.cc:
  Null merge.
2007-10-10 23:16:12 +04:00
unknown
f9759397d2 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
into  damien-katzs-computer.local:/Users/dkatz/mysql-5.0-runtime
2007-10-10 14:46:30 -04:00
unknown
82107254e4 Merge stella.local:/home2/mydev/mysql-5.0-amain
into  stella.local:/home2/mydev/mysql-5.0-axmrg
2007-10-10 20:44:05 +02:00
unknown
77c5085882 Cleanup sp.test.
mysql-test/r/sp.result:
  Update result file.
2007-10-10 14:42:29 +04:00
unknown
e952df911c Merge virtua-cwbas201-21-158-74.ctb.virtua.com.br:/Users/davi/mysql/push/bugs/28318-5.0
into  virtua-cwbas201-21-158-74.ctb.virtua.com.br:/Users/davi/mysql/push/mysql-5.0-runtime


sql/sql_yacc.yy:
  Auto merged
2007-10-09 20:48:37 -03:00
unknown
ad104d5bfd Bug#28318 CREATE FUNCTION (UDF) requires a schema
Bug#29816 Syntactically wrong query fails with misleading error message

The core problem is that an SQL-invoked function name can be a <schema
qualified routine name> that contains no <schema name>, but the mysql
parser insists that all stored procedures (function, procedures and
triggers) must have a <schema name>, which is not true for functions.
This problem is especially visible when trying to create a function
or when a query contains a syntax error after a function call (in the
same query), both will fail with a "No database selected" message if
the session is not attached to a particular schema, but the first
one should succeed and the second fail with a "syntax error" message.

Part of the fix is to revamp the sp name handling so that a schema
name may be omitted for functions -- this means that the internal
function name representation may not have a dot, which represents
that the function doesn't have a schema name. The other part is
to place schema checks after the type (function, trigger or procedure)
of the routine is known.


mysql-test/r/sp-error.result:
  Add test case result for Bug#29816
mysql-test/r/udf.result:
  Add test case result for Bug#28318
mysql-test/t/sp-error.test:
  Add test case for Bug#29816
mysql-test/t/udf.test:
  Add test case for Bug#28318
sql/sp.cc:
  Copy the (last) nul byte of the stored routine key and move name parsing
  code to the sp_name class constructor.
sql/sp_head.cc:
  Revamp routine name parsing for when no schema is specified and
  omit dot from the qualified name if the routine is not associated
  with a scheme name.
sql/sp_head.h:
  Name parsing got bigger, uninline by moving to a single unit -- the sp_head.cc
  file.
sql/sql_yacc.yy:
  Only copy the schema name if one is actually set and check for schema
  name presence only where it's necessary.
2007-10-09 20:46:33 -03:00
unknown
e33a069c8c Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/41
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
2007-10-09 13:58:48 -06:00
unknown
ad8ca7b3b4 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50


sql/mysqld.cc:
  Auto merged
2007-10-09 13:49:58 -06:00
unknown
91923ed2d4 Merge moksha.com.br:/Users/davi/mysql/push/mysql-5.0-runtime
into  moksha.com.br:/Users/davi/mysql/push/bugs/31409-5.0
2007-10-09 16:27:54 -03:00
unknown
5a6b519a2f metadata test of bug # 31249: problem with convert(..., datetime) removed
as PS protocol gives slightly different metadata.
2007-10-09 22:40:22 +05:00
unknown
7d05e7e94c Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2007-10-09 11:04:45 -04:00
unknown
f57813e457 Bug#31409 RENAME TABLE causes server crash or deadlock when used with HANDLER statements
This deadlock occurs when a client issues a HANDLER ... OPEN statement
that tries to open a table that has a pending name-lock on it by another
client that also needs a name-lock on some other table which is already
open and associated to a HANDLER instance owned by the first client.
The deadlock happens because the open_table() function will back-off
and wait until the name-lock goes away, causing a circular wait if some
other name-lock is also pending for one of the open HANDLER tables.

Such situation, for example, can be easily repeated by issuing a RENAME
TABLE command in such a way that the existing table is already open
as a HANDLER table by another client and this client tries to open
a HANDLER to the new table name.

The solution is to allow handler tables with older versions (marked for
flush) to be closed before waiting for the name-lock completion. This is
safe because no other name-lock can be issued between the flush and the
check for pending name-locks.

The test case for this bug is going to be committed into 5.1 because it
requires a test feature only avaiable in 5.1 (wait_condition).


sql/sql_base.cc:
  Improve comments in the open_table() function, stating the importance
  of the handler tables flushing for the back-off process.
sql/sql_handler.cc:
  Allows handler tables flushes when opening new tables in order to avoid
  potential deadlocks. Add comments explaining the importance of the flush.
2007-10-09 12:02:59 -03:00
unknown
d28ce15779 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/home/ram/work/b31249/b31249.5.0


mysql-test/r/type_datetime.result:
  manual merge
mysql-test/t/type_datetime.test:
  manual merge
2007-10-09 18:14:13 +05:00
unknown
659c47785d Merge stella.local:/home2/mydev/mysql-5.0-bug15522-old
into  stella.local:/home2/mydev/mysql-5.0-bug15522
2007-10-09 13:38:46 +02:00
unknown
0c0042a5de Bug#15522 - create ... select and with merge tables
Added test case.
The fix for Bug#20662 does also fix this one.


mysql-test/r/merge.result:
  Bug#15522 - create ... select and with merge tables
  Added test result.
mysql-test/t/merge.test:
  Bug#15522 - create ... select and with merge tables
  Added test case.
2007-10-09 13:10:51 +02:00
unknown
1a5f13a12c Fix for bug : Assertion `!table || (!table->write_set ||
bitmap_is_set(table->write_set, fiel

Problem: creating a temporary table we allocate the group buffer if needed
followed by table bitmaps (see create_tmp_table()). Reserving less memory for 
the group buffer than actually needed (used) for values retrieval may lead 
to overlapping with followed bitmaps in the memory pool that in turn leads 
to unpredictable consequences.

As we use Item->max_length sometimes to calculate group buffer size,
it must be set to proper value. In this particular case 
Item_datetime_typecast::max_length is too small.

Another problem is that we use max_length to calculate the group buffer
key length for items represented as DATE/TIME fields which is superfluous.

Fix: set Item_datetime_typecast::max_length properly,
accurately calculate the group buffer key length for items 
represented as DATE/TIME fields in the buffer.


mysql-test/r/type_datetime.result:
  Fix for bug : Assertion `!table || (!table->write_set || 
  bitmap_is_set(table->write_set, fiel
    - test result.
mysql-test/t/type_datetime.test:
  Fix for bug : Assertion `!table || (!table->write_set || 
  bitmap_is_set(table->write_set, fiel
    - test case.
sql/item_timefunc.h:
  Fix for bug : Assertion `!table || (!table->write_set || 
  bitmap_is_set(table->write_set, fiel
    - set Item_datetime_typecast::max_length properly.
sql/sql_select.cc:
  Fix for bug : Assertion `!table || (!table->write_set || 
  bitmap_is_set(table->write_set, fiel
    - the group buffer key length for items represented as 
  DATE/TIME fields in the buffer should be calculated using
  the maximum pack length of such fields (== 8), using 
  max_length here is redundant.
2007-10-09 14:37:21 +05:00
unknown
715da32e8d Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  alf.(none):/src/bug28774/my50-bug28774
2007-10-08 22:40:30 -04:00
unknown
d020488971 Bug#28774 mysql_upgrade creates tempfiles in root-dir (C:\) and
doesn't clean them up
- Make sure to cleanup temporary files after use.


client/mysql_upgrade.c:
  Bug#28774 mysql_upgrade creates tempfiles in root-dir (C:\) and 
  doesn't clean them up
  - Close file handle and delete temporary file when write fails.
2007-10-08 22:30:41 -04:00
unknown
c986d919c6 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
into  damien-katzs-computer.local:/Users/dkatz/mysql-5.0-runtime


sql/item.cc:
  Auto merged
2007-10-08 13:10:55 -04:00
unknown
1711f4b02f Get rid of compilation warning. 2007-10-08 17:59:23 +04:00
unknown
fd0a679960 Fix compilation warning. 2007-10-08 17:09:28 +04:00
unknown
7ac3645abd Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  bodhi.(none):/opt/local/work/mysql-5.0-runtime


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2007-10-08 02:05:55 +04:00
unknown
c6e79e1143 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  sin.intern.azundris.com:/home/tnurnberg/31253/50-31253
2007-10-06 03:02:31 +02:00
unknown
66fd9a3473 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  sin.intern.azundris.com:/home/tnurnberg/19828/50-19828


mysql-test/r/grant.result:
  Auto merged
2007-10-06 00:14:22 +02:00
unknown
7b98539199 Merge pilot.mysql.com:/data/msvensson/mysql/bug27789/my50-bug27789
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-maint
2007-10-05 19:56:25 +02:00
unknown
dc02567205 Fixed Bug "Wrong permissions of sql/share/language directories"
extra/comp_err.c:
  Override my_mkdir() umask setting. The default is 0700 which perfectly 
  makes sense for the server but leads to Bug  when applied to comp_err
  generated directories in the souce tree. Generated directories and the
  files within won't be accessible to other users, sometimes including root 
  if on a non-local filesystem, making "sudo make install" fail.
2007-10-05 19:55:00 +02:00
unknown
79b4d29fb3 Merge msvensson2.mysql.internal:mysql/mysql-5.0-maint
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-maint
2007-10-05 19:32:14 +02:00
unknown
b5b89b8d03 Update test case to allow the .reject file to be in either var/log or r/ 2007-10-05 19:28:09 +02:00
unknown
574dbd8be0 Bug#27753 enable mysql-test-run.pl to ignore tests based on wildcard
mysql-test/lib/mtr_cases.pl:
  Allow --skip-test and --do-test to take a perl regex
mysql-test/mysql-test-run.pl:
  Update usage for --skip-test and --do-test
2007-10-05 19:23:44 +02:00
unknown
6f2c2dc8e8 Change URLs.
Our web server has been restructured several times, and references
to it in our source code has stayed the same.  This patch from Paul
DuBois updates all URLs to modern semantics.


debian/po/ca.po:
  Change URLs.
debian/po/cs.po:
  Change URLs.
debian/po/da.po:
  Change URLs.
debian/po/gl.po:
  Change URLs.
debian/po/ja.po:
  Change URLs.
debian/po/pt_BR.po:
  Change URLs.
debian/po/sv.po:
  Change URLs.
debian/po/tr.po:
  Change URLs.
mysql-test/lib/mtr_report.pl:
  Change URLs.
mysql-test/mysql-test-run-shell.sh:
  Change URLs.
ndb/include/ndbapi/Ndb.hpp:
  Change URLs.
netware/mysql_test_run.c:
  Change URLs.
scripts/mysqld_safe.sh:
  Change URLs.
sql/mysqld.cc:
  Change URLs.
2007-10-05 13:16:54 -04:00
unknown
9419cb42b9 Bug#30560 Valgrind option to mysql-test-run with spaces in cause strange error
mysql-test/mysql-test-run.pl:
  Just pass the $opt_valgrind_options to mtr_add_arg - it does a
  "push(@$args, sprintf($format, @fargs));" behind the scenes
2007-10-05 18:36:23 +02:00
unknown
b07a4abc4f Bug#31398 problems with mysql-test-run, part2
Write .reject file to r/ if it's writable else use opt_logdir 


client/mysqltest.c:
  Write .reject file to r/ if it's writable else use opt_logdir
2007-10-05 18:18:50 +02:00
unknown
133bd811db Bug#31398 problems with mysql-test-run
- "mysqld --verbose --help" need to be started in a writable directory 


mysql-test/mysql-test-run.pl:
  Create a tmpdir where mysqld can peform it's lowercase or uppercase test
2007-10-05 17:54:19 +02:00
unknown
017a0fef9c Merge bk-internal:/home/bk/mysql-5.0-runtime
into  pilot.mysql.com:/data/msvensson/mysql/my50-r-bug30992
2007-10-05 14:47:43 +02:00
unknown
01b3b7785b Fix for bug : MEMORY returns incorrect data if BTREE index is used for NULL lookup
Problem: creating an rb-tree key we store length (2 bytes) before the actual data for 
varchar key parts. The fact was missed for NULL key parts, when we set NULL byte and 
skip the rest.

Fix: take into account the length of the varchar key parts for NULLs.


heap/hp_hash.c:
  Fix for bug : MEMORY returns incorrect data if BTREE index is used for NULL lookup
    - skip varchar key parts length (2 byte) for null key parts.
mysql-test/r/heap_btree.result:
  Fix for bug : MEMORY returns incorrect data if BTREE index is used for NULL lookup
    -test result.
mysql-test/t/heap_btree.test:
  Fix for bug : MEMORY returns incorrect data if BTREE index is used for NULL lookup
    - test case.
2007-10-05 16:33:15 +05:00
unknown
2e8ca84e89 Bug : crash comparing datetime to double
convert(<invalid time>, datetime) in WHERE caused crash as function
returned (void*)NULL, but did not flag SQL NULL. It does now.


mysql-test/r/type_datetime.result:
  show that convert() to datetime in a WHERE-clause will no longer crash
  the server on invalid input.
mysql-test/t/type_datetime.test:
  show that convert() to datetime in a WHERE-clause will no longer crash
  the server on invalid input.
sql/item.cc:
  When failing to process time values, do not just return (void*)NULL,
  but flag SQL NULL as well so no caller will try to process the 0x0L.
  This makes behaviour for Item::Item::val_decimal_from_date() and
  Item::Item::val_decimal_from_time() identical.
2007-10-05 12:08:38 +02:00
unknown
28232df2ae Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  sin.intern.azundris.com:/home/tnurnberg/31227/50-31227
2007-10-05 10:04:45 +02:00