Commit graph

34880 commits

Author SHA1 Message Date
unknown
f27ea1b152 Merge mysql.com:/usr/home/ram/work/bug10798/my41-bug10798
into  mysql.com:/usr/home/ram/work/bug10798/my50-bug10798


sql/slave.cc:
  merging
2007-02-05 09:54:23 +04:00
unknown
1534bb792b Merge olga.mysql.com:/home/igor/mysql-5.0-opt
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug24035
2007-02-03 10:37:45 -08:00
unknown
d3c1511a36 After merge fix 2007-02-03 09:26:11 +01:00
unknown
e0d8e8fd09 Fix bug #24035.
This performance degradation for UPDATEs could be observed in the update
statements for which the search key cannot be converted to any valid
value of the type of the search column, like for a  the condition
int_fld=99999999999999999999999999, though it can be guaranteed here
that there is no row with such a key value. 


mysql-test/r/update.result:
  Added a test case for bug #24035.
mysql-test/t/update.test:
  Added a test case for bug #24035.
sql/opt_range.cc:
  Fix bug #24035.
  This performance degradation for could be observed in the update
  statements for which the search key cannot be converted to any valid
  value of the type of the search column, like for a  the condition
  int_fld=99999999999999999999999999, though it can be guaranteed here
  that there is no row with such a key value. 
  Now the function get_mm_leaf creates trees of the type SEL_ARG::IMPOSSIBLE 
  for such conditions that tells the range scan not to perform any search
  at all.
2007-02-02 15:22:10 -08:00
unknown
8a9c521bba Merge chilla.local:/home/mydev/mysql-4.1-axmrg
into  chilla.local:/home/mydev/mysql-5.0-axmrg


sql/handler.cc:
  Auto merged
sql/examples/ha_tina.cc:
  Auto merged
sql/examples/ha_tina.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
mysql-test/Makefile.am:
  Manual merged
2007-02-02 23:05:46 +01:00
unknown
3c0aca02fe Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  chilla.local:/home/mydev/mysql-5.0-axmrg


sql/item_func.cc:
  Auto merged
2007-02-02 21:32:58 +01:00
unknown
0dc19dadb9 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  chilla.local:/home/mydev/mysql-4.1-axmrg
2007-02-02 20:23:03 +01:00
unknown
98b9ac693a After merge fix 2007-02-02 20:19:13 +01:00
unknown
ed596723c7 Reverting previous change from 1L -> 1ULL and LL(1) -> 1ULL and
making all to be uniform ULL(1), which is a local definition.
2007-02-02 13:11:44 -05:00
unknown
04cbadde7a another valgrind error fix for 4.1(backport from 5.0) 2007-02-02 17:18:42 +04:00
unknown
9bb750f5e8 Merge mysql.com:/home/gluh/MySQL/Merge/5.0
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
2007-02-02 15:21:14 +04:00
unknown
84445bbb5d Valgrind errors
added valgrind.supp to EXTRA_SCRIPTS(for pushbuild)
2007-02-02 15:01:11 +04:00
unknown
61aee35cc7 Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into  dev3-63.(none):/home/zhl/mysql/tree-merge/5.0/mysql-5.0-ndb
2007-02-02 09:31:36 +00:00
unknown
d03d298735 Merge chilla.local:/home/mydev/mysql-4.1-axmrg
into  chilla.local:/home/mydev/mysql-5.0-axmrg


include/my_pthread.h:
  Auto merged
include/thr_alarm.h:
  Auto merged
mysys/my_pthread.c:
  Auto merged
mysys/my_thr_init.c:
  Auto merged
2007-02-02 10:03:22 +01:00
unknown
5305cd7caf After merge fix 2007-02-02 10:01:44 +01:00
unknown
0e57035b45 Merge dev3-63.(none):/home/zhl/mysql/tree-merge/5.0/mysql-5.0-ndb-bj
into  dev3-63.(none):/home/zhl/mysql/tree-merge/5.0/mysql-5.0-ndb


ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
ndb/src/ndbapi/Ndb.cpp:
  Auto merged
2007-02-01 16:42:12 +00:00
unknown
cd4670a7aa Merge chilla.local:/home/mydev/mysql-4.1-axmrg
into  chilla.local:/home/mydev/mysql-5.0-axmrg


BitKeeper/deleted/.del-valgrind.supp:
  Delete: mysql-test/valgrind.supp
mysql-test/r/ps.result:
  SCCS merged
mysql-test/r/symlink.result:
  Null merged
mysql-test/t/ps.test:
  SCCS merged
mysql-test/t/symlink.test:
  Null merged
sql/field_conv.cc:
  Null merged
sql/mysqld.cc:
  Null merged
vio/viosslfactories.c:
  Null merged
2007-02-01 17:33:54 +01:00
unknown
da984b3376 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  chilla.local:/home/mydev/mysql-5.0-axmrg


BUILD/SETUP.sh:
  Auto merged
configure.in:
  Auto merged
2007-02-01 17:10:09 +01:00
unknown
3b8011015f Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into  mysql.com:/home/ram/work/b26012/b26012.4.1


sql/field.h:
  Auto merged
2007-02-01 19:56:14 +04:00
unknown
a4f74b8664 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/home/ram/work/b26012/b26012.5.0


sql/field.h:
  Auto merged
2007-02-01 19:55:11 +04:00
unknown
b591da5347 Merge mysql.com:/home/ram/work/b26012/b26012.4.1
into  mysql.com:/home/ram/work/b26012/b26012.5.0


sql/field.h:
  Auto merged
2007-02-01 19:51:45 +04:00
unknown
4e1772e990 Fix for bug #26012: missed Field_double::size_of()
As we have Field_double::not_fixed we must have Field_double::size_of().


sql/field.h:
  Fix for bug #26012: missed Field_double::size_of()
    - Field_double::size_of() added.
2007-02-01 19:51:02 +04:00
unknown
bdd52e8970 Merge dev3-63.(none):/home/zhl/mysql/tree-merge/4.1/mysql-4.1-ndb-bj
into  dev3-63.(none):/home/zhl/mysql/tree-merge/4.1/mysql-4.1-ndb
2007-02-01 15:48:23 +00:00
unknown
a308304607 Bug#23299 Some queries against INFORMATION_SCHEMA with subqueries fail
additional call of file->extra() method with HA_EXTRA_NO_CACHE parameter


mysql-test/r/information_schema.result:
  test result
mysql-test/t/information_schema.test:
  test case
sql/sql_show.cc:
  additional call of file->extra() method with HA_EXTRA_NO_CACHE parameter
2007-02-01 19:12:45 +04:00
unknown
8c2c52714d Bug#25844: "make test" does not find mysql-test-run.pl
Need to change directory before calling mysql-test-run.pl
2007-02-01 15:59:51 +01:00
unknown
5698114c97 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  chilla.local:/home/mydev/mysql-4.1-axmrg


mysql-test/r/symlink.result:
  Auto merged
mysql-test/t/symlink.test:
  Auto merged
sql/mysqld.cc:
  Auto merged
2007-02-01 15:51:25 +01:00
unknown
2df2922586 Valgrind error fixes
Notes:
This patch doesn't fix all issues in the tree and we need jani's fix for that
This patch shoud not be merged into 5.0


mysql-test/r/ps.result:
  result fix
mysql-test/r/symlink.result:
  result fix
mysql-test/t/ps.test:
  test is moved to 'symlink' test
mysql-test/t/symlink.test:
  test from 'ps' test
sql/field_conv.cc:
  valgrind error fix: backport from 5.0
sql/mysqld.cc:
  release of ssl_context
vio/viosslfactories.c:
  release of ssl_context
mysql-test/valgrind.supp:
  New BitKeeper file ``mysql-test/valgrind.supp''
  This file is backported from 5.0, added suppressing of OpenSSL errors
2007-02-01 18:00:24 +04:00
unknown
8d975637ab Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb


sql/ha_ndbcluster.cc:
  Auto merged
2007-02-01 13:59:34 +01:00
unknown
1ff126e935 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  rakia.gmz:/home/kgeorge/mysql/autopush/B23556-5.0-opt
2007-02-01 13:26:25 +02:00
unknown
0c52332512 trigger.result:
merge of the 5.0-opt tree


mysql-test/r/trigger.result:
  merge of the 5.0-opt tree
2007-02-01 13:25:50 +02:00
unknown
8772cb168b Merge chilla.local:/home/mydev/mysql-4.1-axmrg
into  chilla.local:/home/mydev/mysql-5.0-axmrg


include/my_global.h:
  Auto merged
include/thr_alarm.h:
  Auto merged
mysys/my_pthread.c:
  Auto merged
mysys/thr_alarm.c:
  Auto merged
include/my_pthread.h:
  Manual merged
mysys/default.c:
  Manual merged
mysys/my_thr_init.c:
  Manual merged
sql/mysqld.cc:
  Manual merged
2007-02-01 10:19:22 +01:00
unknown
020e82c650 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  rakia.gmz:/home/kgeorge/mysql/autopush/B23556-5.0-opt


mysql-test/t/trigger.test:
  Auto merged
sql/sql_delete.cc:
  Auto merged
2007-02-01 11:07:17 +02:00
unknown
6bddf2a01f Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  rakia.gmz:/home/kgeorge/mysql/autopush/B25551-5.0-opt


sql/sql_select.cc:
  Auto merged
2007-02-01 10:50:41 +02:00
unknown
c9950f2694 Bug #25522 Update with IN syntax Clustertable + Trigger leads to mysqld segfault: moved back assignment 2007-02-01 09:48:45 +01:00
unknown
ad7a4ebbe3 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines
into  chilla.local:/home/mydev/mysql-5.0-axmrg
2007-02-01 09:26:09 +01:00
unknown
62fdcb54a7 Merge chilla.local:/home/mydev/mysql-4.0-axmrg
into  chilla.local:/home/mydev/mysql-4.1-axmrg


include/my_global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
include/thr_alarm.h:
  Auto merged
mysys/default.c:
  Auto merged
mysys/my_pthread.c:
  Auto merged
mysys/thr_alarm.c:
  Auto merged
mysys/my_thr_init.c:
  Manual merged
sql/mysqld.cc:
  Manual merged
2007-02-01 08:09:36 +01:00
unknown
a94b1b5077 Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines
into  chilla.local:/home/mydev/mysql-4.1-axmrg
2007-02-01 07:52:28 +01:00
unknown
c15b2e4152 Fixed bug #25407.
The bug could cause choosing a sub-optimal execution plan for 
a single-table query if a unique index with many null keys were 
defined for the table. 
It happened because the code of the check_quick_keys function 
made an assumption that any key may occur in an unique index 
only once. Yet this is not true for keys with nulls that may 
have multiple occurrences in the index.


mysql-test/r/null_key.result:
  Fixed bug #25407
  Adjusted result after the fix.
mysql-test/r/select.result:
  Added a test case for bug #25407.
mysql-test/t/select.test:
  Added a test case for bug #25407.
2007-01-31 19:31:36 -08:00
unknown
c7a69d255d Bug #25522 Update with IN syntax Clustertable + Trigger leads to mysqld segfault: in start_stmt, only change query_state if starting a new transactions, in read_multi_range_next, change query state when end is reached 2007-01-31 22:38:06 +01:00
unknown
70fe372a2c Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint


configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
scripts/mysqld_multi.sh:
  Auto merged
sql/mysqld.cc:
  Auto merged
2007-01-31 16:26:12 -05:00
unknown
659a1255af Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint


configure.in:
  Auto merged
mysql-test/r/range.result:
  Auto merged
mysql-test/t/range.test:
  Auto merged
2007-01-31 16:23:10 -05:00
unknown
ffe6fae3bb Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint


configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/range.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged
scripts/mysqld_multi.sh:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2007-01-31 16:23:05 -05:00
unknown
3d6e5feaf9 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug25341/my50-bug25341
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint


BitKeeper/etc/collapsed:
  auto-union
2007-01-31 16:14:12 -05:00
unknown
f50bf87281 Bug#25341: "init.d/mysql stop" may timeout too quickly
Thirty five seconds is entirely too short of a period to wait for a server 
to exit.  Instead, make a valliant effort to make sure it exits, and only
give up after a very long period (arbitrarily chosen as 15 minutes).

In addition, if we're being asked to restart the server, then don't try
to start again if trying to stop the server failed.
---
Return zero by default, when the script exits.
---
Set return-/exit-value based on whether we successfully dealt with the 
PID-file.
---
Don't wait that long if the program we're waiting on exits.  It 
should only exit if the server is not going to be started.


support-files/mysql.server.sh:
  Raise timeout to a pessimistic value, 15 minutes.  We should only be willing
  to give up and exit after an extraordinary effort.
  ---
  Return zero by default, when the script exits.
  ---
  Set return-/exit-value based on whether we successfully dealt with the 
  PID-file.
  ---
  Don't wait that long if the program we're waiting on exits.  It 
  should only exit if the server is not going to be started.
2007-01-31 15:39:41 -05:00
unknown
bca07eea64 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
2007-01-31 15:37:12 -05:00
unknown
539465508c Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into  qualinost.(none):/home/mtaylor/src/mysql-4.1-maint
2007-01-31 15:35:26 -05:00
unknown
4a7724b75f Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work


support-files/mysql.spec.sh:
  Auto merged
2007-01-31 18:54:15 +01:00
unknown
50c3198d91 MTR_BUILD_THREAD=auto for test runs during RPM build
support-files/mysql.spec.sh:
  MTR_BUILD_THREAD=auto for test runs
2007-01-31 18:18:44 +01:00
unknown
717850d362 Merge trift2.:/MySQL/M50/bug23293-5.0
into  trift2.:/MySQL/M50/push-5.0
2007-01-31 18:18:11 +01:00
unknown
30b9028280 Merge trift2.:/MySQL/M50/bug12676-5.0
into  trift2.:/MySQL/M50/push-5.0


configure.in:
  Auto merged
2007-01-31 18:16:51 +01:00