mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 13:32:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
38204 commits 2784 branches 343 tags 1.6 GiB
Commit graph

38204 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
tsmith@ramayana.hindu.god
587c27e1d8 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  ramayana.hindu.god:/home/tsmith/m/bk/build/50
 2007-11-16 14:57:47 -07:00
tsmith@ramayana.hindu.god
de0d55edf4 Eliminate 'unused variable' warnings when compiling non-debug build 2007-11-16 14:56:37 -07:00
joerg@trift2.
9ffd927e7d In the "spec" file for RPM builds, handle the debug server tests different from the standard server. 2007-11-16 17:36:13 +01:00
istruewing@stella.local
ad721c8909 Merge stella.local:/home2/mydev/mysql-4.1-axmrg 
into  stella.local:/home2/mydev/mysql-5.0-axmrg
 2007-11-16 13:27:58 +01:00
istruewing@stella.local
a0aad59f03 Merge stella.local:/home2/mydev/mysql-5.0-amain 
into  stella.local:/home2/mydev/mysql-5.0-axmrg
 2007-11-16 13:27:23 +01:00
joerg@trift2.
31114adb6b Merge trift2.:/MySQL/M41/push-4.1 
into  trift2.:/MySQL/M50/push-5.0
 2007-11-16 13:07:21 +01:00
istruewing@stella.local
1e435dce80 Merge stella.local:/home2/mydev/mysql-4.1-amain 
into  stella.local:/home2/mydev/mysql-4.1-axmrg
 2007-11-16 13:04:17 +01:00
joerg@trift2.
61a9d77784 Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-11-16 10:42:32 +01:00
joerg@trift2.
4ede405d87 Merge trift2.:/MySQL/M41/mysql-4.1 
into  trift2.:/MySQL/M41/push-4.1
 2007-11-16 10:34:36 +01:00
istruewing@stella.local
d2f67317f7 Merge stella.local:/home2/mydev/mysql-5.0-ateam 
into  stella.local:/home2/mydev/mysql-5.0-axmrg
 2007-11-14 20:05:52 +01:00
gluh@mysql.com/eagle.(none)
b56f668ca3 after merge fix 2007-11-14 18:56:14 +04:00
joerg@trift2.
3bf8f6534a Merge trift2.:/MySQL/M41/push-4.1 
into  trift2.:/MySQL/M50/push-5.0
 2007-11-14 15:48:44 +01:00
joerg@trift2.
86674bc412 Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-11-14 15:26:38 +01:00
joerg@trift2.
96aaa245e2 Merge trift2.:/MySQL/M40/mysql-4.0 
into  trift2.:/MySQL/M41/push-4.1
 2007-11-14 15:22:55 +01:00
joerg@trift2.
02464c6868 Merge trift2.:/MySQL/M41/mysql-4.1 
into  trift2.:/MySQL/M41/push-4.1
 2007-11-14 15:11:37 +01:00
istruewing@stella.local
1bbf5684da Merge stella.local:/home2/mydev/mysql-5.0-ateam 
into  stella.local:/home2/mydev/mysql-5.0-axmrg
 2007-11-14 15:11:03 +01:00
istruewing@stella.local
398caa9ad8 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines 
into  stella.local:/home2/mydev/mysql-5.0-bug4692
 2007-11-14 14:42:11 +01:00
gluh@eagle.(none)
294c872fa5 Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
 2007-11-14 17:26:59 +04:00
gluh@eagle.(none)
246c6c35a9 Merge mysql.com:/home/gluh/MySQL/Merge/5.0 
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
 2007-11-14 17:26:22 +04:00
gluh@mysql.com/eagle.(none)
ea3bfdb26d Merge mysql.com:/home/gluh/MySQL/Merge/4.1 
into  mysql.com:/home/gluh/MySQL/Merge/4.1-opt
 2007-11-14 17:22:03 +04:00
istruewing@stella.local
43a5312157 Bug#4692 - DISABLE/ENABLE KEYS waste a space 
Post-pushbuild fix

Added a purecov comment and a test for coverage of parallel
enable keys.
 2007-11-14 12:02:20 +01:00
istruewing@stella.local
c2983307c1 Merge stella.local:/home2/mydev/mysql-5.0-ateam 
into  stella.local:/home2/mydev/mysql-5.0-axmrg
 2007-11-14 11:48:12 +01:00
svoj@june.mysql.com
b4ad73d079 Merge mysql.com:/home/svoj/devel/mysql/BUG31277/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG31277/mysql-5.0-engines
 2007-11-14 14:38:26 +04:00