Commit graph

38379 commits

Author SHA1 Message Date
istruewing@stella.local
a39180c1f2 Merge stella.local:/home2/mydev/mysql-5.0-amain
into  stella.local:/home2/mydev/mysql-5.0-axmrg
2007-11-27 16:24:44 +01:00
hhunger@hh-nb.hhunger
cb33d0dcdf Merge hh-nb.hhunger:/work/trees/mysql-5.0-build-src-clean
into  hh-nb.hhunger:/work/merge/mysql-5.0-build
2007-11-27 13:02:40 +01:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
14e74e82e8 Merge mysql.com:/home/ram/work/mysql-5.0-engines
into  mysql.com:/home/ram/work/b30495/b30495.5.0
2007-11-27 15:15:28 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
ac034767c0 Fix for bug #32559: connection hangs on query with name_const
Problem: passing a non-constant name to the NAME_CONST function results in a crash.

Fix: check the NAME_CONST name argument; return fake item type if we got
non-constant argument(s).
2007-11-27 09:36:43 +04:00
hhunger@hh-nb.hhunger
10ea2aa927 patch for bug#32496 (2nd) with ansi conformant and Mysql test case. 2007-11-26 21:28:01 +01:00
msvensson@pilot.mysql.com
f035f5e05d Merge pilot.mysql.com:/data/msvensson/mysql/bug32429/my50-bug32429
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-runtime
2007-11-26 20:08:32 +01:00
istruewing@stella.local
f140e7e000 Bug#20830 - INSERT DELAYED does not honour SET INSERT_ID
Bug#20627 - INSERT DELAYED does not honour auto_increment_* variables
Fixed wrong variable assignment.
2007-11-26 19:16:23 +01:00
thek@adventure.(none)
b894128b90 Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
into  adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime
2007-11-26 17:21:15 +01:00
davi@mysql.com/endora.local
cdad8669df Bug#29592 SQL Injection issue
Remove the mysql_odbc_escape_string() function. The function
has multi-byte character escaping issues, doesn't honor the
NO_BACKSLASH_ESCAPES mode and is not used anymore by the
Connector/ODBC as of 3.51.17.
2007-11-26 14:09:37 -02:00
thek@adventure.(none)
0ca073c610 Merge adventure.(none):/home/thek/Development/cpp/bug32436/my50-bug32436
into  adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime
2007-11-26 15:58:06 +01:00
thek@adventure.(none)
95bfde3d01 Bug #32436 KILL QUERY completely deadlocks mysqld
Sending several "KILL QUERY" statements to target a connection running
"SELECT SLEEP" could freeze the server.

The locking order in Item_func_sleep was wrong and this could lead to a
dead lock.

This patch solves the issue by resolving the locking order properly.
2007-11-26 15:44:05 +01:00
istruewing@stella.local
a7aa278482 Bug#32357 - ndb_backup_print test fails sometimes in pushbuild
Disabled test case
2007-11-26 14:49:41 +01:00
istruewing@stella.local
6c39d13209 BUG#31277 - myisamchk --unpack corrupts a table
Another try to fix a compiler warning on win64.
2007-11-26 14:48:49 +01:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
5adf16e288 Fix for bug #32676: insert delayed crash with wrong column and function specified
Problem: using wrong local lock type value in the mysql_insert() results in a crash. 

Fix: use a proper value.
2007-11-26 13:29:26 +04:00
istruewing@stella.local
2cc3e56ea4 Merge stella.local:/home2/mydev/mysql-5.0-ateam
into  stella.local:/home2/mydev/mysql-5.0-axmrg
2007-11-25 14:14:52 +01:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
7a41acfd40 Merge mysql.com:/home/ram/work/mysql-5.0-engines
into  mysql.com:/home/ram/work/b32560/b32560.5.0
2007-11-23 17:24:54 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
51ca3235b8 Fix for bug #32560: crash with interval function and count(*)
Problem: INTERVAL function implementation doesn't handle NULL range values.

Fix: skip NULL ranges looking for a proper one.
2007-11-23 16:30:06 +04:00
istruewing@stella.local
a1c5fef49a Merge stella.local:/home2/mydev/mysql-5.0-ateam
into  stella.local:/home2/mydev/mysql-5.0-axmrg
2007-11-23 13:09:01 +01:00
istruewing@stella.local
3b09d3708a Bug#32654: rpl_view.test fails randomly
Disabled test case
2007-11-23 13:03:38 +01:00
istruewing@stella.local
695afd5d07 Bug#32653 - rpl_log.test fails randomly
Disabled test case
2007-11-23 12:54:05 +01:00
istruewing@stella.local
1d2a0d1d6e BUG#31277 - myisamchk --unpack corrupts a table
Fixed a compiler warning on win64. Backport from 5.1.
2007-11-23 12:52:29 +01:00
istruewing@stella.local
17399e7be3 Bug#32651 - grant_cache.test fails
Disabled test case
2007-11-23 12:06:55 +01:00
kent@kent-amd64.(none)
99c4a164fa Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/kent/bk/docs-cleanup/mysql-5.0-build
2007-11-23 10:22:19 +01:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
a13b5e9d80 Merge mysql.com:/home/ram/work/mysql-5.0-engines
into  mysql.com:/home/ram/work/b32558/b32558.5.0
2007-11-23 13:04:13 +04:00
kent@mysql.com/kent-amd64.(none)
41778b565b Makefile.am, configure.in:
Include "manual.chm" in source TAR if it exists
2007-11-22 17:48:40 +01:00
davi@endora.local
9817d93edb Merge endora.local:/Users/davi/mysql/bugs/32528-5.0
into  endora.local:/Users/davi/mysql/mysql-5.0-runtime
2007-11-22 10:20:12 -02:00
davi@endora.local
351c474153 Bug#32528 Global read lock with a low priority write lock causes a server crash
FLUSH TABLES WITH READ LOCK fails to properly detect write locked
tables when running under low priority updates.

The problem is that when trying to aspire a global read lock, the
reload_acl_and_cache() function fails to properly check if the thread
has a low priority write lock, which later my cause a server crash or
deadlock.

The solution is to simple check if the thread has any type of the
possible exclusive write locks.
2007-11-22 10:18:19 -02:00
malff@lambda.hsd1.co.comcast.net.
d7a7f2f183 Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-base
into  lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-rt-merge
2007-11-21 18:35:02 -07:00
mkindahl@dl145h.mysql.com
3cf2733086 Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
2007-11-21 21:11:57 +01:00
istruewing@stella.local
82bf8f36f3 Merge stella.local:/home2/mydev/mysql-4.1-axmrg
into  stella.local:/home2/mydev/mysql-5.0-axmrg
2007-11-21 20:31:47 +01:00
istruewing@stella.local
0d76c73fd5 Merge stella.local:/home2/mydev/mysql-5.0-amain
into  stella.local:/home2/mydev/mysql-5.0-axmrg
2007-11-21 20:30:07 +01:00
istruewing@stella.local
ca95af018e Merge stella.local:/home2/mydev/mysql-4.1-amain
into  stella.local:/home2/mydev/mysql-4.1-axmrg
2007-11-21 20:27:16 +01:00
df@pippilotta.erinye.com
9d8981033d Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-11-21 19:44:40 +01:00
df@pippilotta.erinye.com
cf7b21c005 add wrong warning to suppression file 2007-11-21 19:41:13 +01:00
mleich@five.local.lan
2bc3dba9c8 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  five.local.lan:/work/trees/mysql-5.0-build-src-clean
2007-11-21 18:55:27 +01:00
df@pippilotta.erinye.com
c25cbcec13 ignore readline warnings 2007-11-21 18:11:08 +01:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
924bdf2c78 Fix for bug #32558: group by null-returning expression with rollup causes crash
Problem: setting Item_func_rollup_const::null_value property to argument's null_value
before (without) the argument evaluation may result in a crash due to wrong null_value.

Fix: use is_null() to set Item_func_rollup_const::null_value instead as it evaluates
the argument if necessary and returns a proper value.
2007-11-21 20:53:44 +04:00
jperkin/mysqldev@mysql.com/production.mysql.com
003f5640e7 configure.in:
Revert version back to 5.0.52 for release build
2007-11-21 14:27:35 +01:00
mleich@five.local.lan
4922727fb7 This changeset fixes
Bug#31567 "datadict" tests (all engines) fail:
             Reference protocol is non-standard build
   Bug#30418 "datadict" tests (all engines) fail:
             Dependency on the host name for ordering   
Modifications:
   1. The standard builds (build team) do not contain
      the collation 'utf8_general_cs'.
      The common developer builds (compuile-....-max)
      contain this collation.
      Solution fitting to both build variants:
         Exclude the collation 'utf8_general_cs' from
         result sets.
   2. Use mysqltest builtin sorting of result set for
      the statement where the hostname affects the
      row order.
2007-11-21 13:50:17 +01:00
thek@adventure.(none)
0b38e67453 Merge adventure.(none):/home/thek/Development/cpp/bug31153/my50-bug31153
into  adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime
2007-11-21 10:02:44 +01:00
istruewing@stella.local
f8a855a7c8 Merge stella.local:/home2/mydev/mysql-5.0-amain
into  stella.local:/home2/mydev/mysql-5.0-axmrg
2007-11-21 09:31:08 +01:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
725b2d35f4 Fix for bug #30495: optimize table t1,t2,t3 extended errors
Problem: we have CHECK TABLE options allowed (by accident?) for
ANALYZE/OPTIMIZE TABLE.

Fix: disable them.

Note: it might require additional fixes in 5.1/6.0
2007-11-21 11:11:22 +04:00
tsmith@ramayana.hindu.god
2b985d0762 Applied InnoDB snapshot innodb-5.0-ss2095
Fixes the following bugs:

- Bug #29560: InnoDB >= 5.0.30 hangs on adaptive hash rw-lock 'waiting for an X-lock'

  Fixed a race condition in the rw_lock where an os_event_reset()
  can overwrite an earlier os_event_set() triggering an indefinite
  wait.
  NOTE: This fix for windows is different from that for other platforms.
  NOTE2: This bug is introduced in the scalability fix to the
  sync0arr which was applied to 5.0 only. Therefore, it need not be
  applied to the 5.1 tree. If we decide to port the scalability fix
  to 5.1 then this fix should be ported as well.

- Bug #32125: Database crash due to ha_innodb.cc:3896: ulint convert_search_mode_to_innobase

  When unknown find_flag is encountered in convert_search_mode_to_innobase()
  do not call assert(0); instead queue a MySQL error using my_error() and
  return the error code PAGE_CUR_UNSUPP. Change the functions that call
  convert_search_mode_to_innobase() to handle that error code by "canceling"
  execution and returning appropriate error code further upstream.
2007-11-20 10:53:19 -07:00
kent@kent-amd64.(none)
cb6885c134 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/kent/bk/tmpmerge/mysql-5.0-build
2007-11-20 16:23:19 +01:00
dfischer/mysqldev@mysql.com/production.mysql.com
4b94aec52a Raise version number after cloning 5.0.52 2007-11-20 11:26:16 +01:00
guilhem@gbichot4.local
2bcf5b4e97 BUG#27850 "mysqldump --single-transaction does not work if TRUNCATE/DROP/RENAME/ALTER":
this has already been closed by a note in the manual, now we
complete this by a note in "mysqldump --help"
2007-11-20 10:25:07 +01:00
tsmith@ramayana.hindu.god
dc403f8128 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  ramayana.hindu.god:/home/tsmith/m/bk/build/50
2007-11-19 13:17:58 -07:00
thek@adventure.(none)
1794242b24 Bug #31153 calling stored procedure crashes server if available memory is low
When the server was out of memory it crashed because of invalid memory access.

This patch adds detection for failed memory allocations and make the server
output a proper error message.
2007-11-19 17:59:44 +01:00
df@pippilotta.erinye.com
d3b0403a1b Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-18431
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-11-19 15:42:12 +01:00
df@pippilotta.erinye.com
44ab4b2e7d Update readline to version 5.2. This fixes bug#18431. 2007-11-19 14:38:08 +01:00