Commits · 76468de853d0e3ed0afe0d0d25eea8424141c9bc · nexedi / MariaDB

27 Nov, 2007 5 commits
- Merge stella.local:/home2/mydev/mysql-5.0-ateam · 76468de8
  unknown authored Nov 27, 2007
```
into  stella.local:/home2/mydev/mysql-5.0-axmrg
```
  76468de8
- Bug#8693 Test 'rpl_log_pos' fails sometimes · ae5ff26d
  unknown authored Nov 27, 2007
```
Disabled the test case.
```
  ae5ff26d
- Merge mysql.com:/home/ram/work/mysql-5.0-engines · 061ac497
  unknown authored Nov 27, 2007
```
into  mysql.com:/home/ram/work/b30495/b30495.5.0
```
  061ac497
- Merge stella.local:/home2/mydev/mysql-5.0-amain · 6288fde2
  unknown authored Nov 27, 2007
```
into  stella.local:/home2/mydev/mysql-5.0-axmrg


sql/item_cmpfunc.cc:
  Auto merged
```
  6288fde2
- Merge mysql.com:/home/ram/work/mysql-5.0-engines · 51e24c02
  unknown authored Nov 27, 2007
```
into  mysql.com:/home/ram/work/b30495/b30495.5.0
```
  51e24c02
26 Nov, 2007 3 commits
- Bug#20830 - INSERT DELAYED does not honour SET INSERT_ID · 6cbb7d2f
  unknown authored Nov 26, 2007
```
Bug#20627 - INSERT DELAYED does not honour auto_increment_* variables
Fixed wrong variable assignment.
```
  6cbb7d2f
- Bug#32357 - ndb_backup_print test fails sometimes in pushbuild · af34d357
  unknown authored Nov 26, 2007
```
Disabled test case
```
  af34d357
- BUG#31277 - myisamchk --unpack corrupts a table · 0e758d9d
  unknown authored Nov 26, 2007
```
Another try to fix a compiler warning on win64.
```
  0e758d9d
25 Nov, 2007 1 commit
- Merge stella.local:/home2/mydev/mysql-5.0-ateam · f53f8868
  unknown authored Nov 25, 2007
```
into  stella.local:/home2/mydev/mysql-5.0-axmrg
```
  f53f8868
23 Nov, 2007 8 commits

Merge mysql.com:/home/ram/work/mysql-5.0-engines · 3f91e01f
unknown authored Nov 23, 2007
```
into  mysql.com:/home/ram/work/b32560/b32560.5.0
```
3f91e01f

Fix for bug #32560: crash with interval function and count(*) · 1f57bfb8

unknown authored Nov 23, 2007

Problem: INTERVAL function implementation doesn't handle NULL range values.

Fix: skip NULL ranges looking for a proper one.


mysql-test/r/func_set.result:
  Fix for bug #32560: crash with interval function and count(*)
    - test result.
mysql-test/t/func_set.test:
  Fix for bug #32560: crash with interval function and count(*)
    - test case.
sql/item_cmpfunc.cc:
  Fix for bug #32560: crash with interval function and count(*)
    - skip NULL ranges calculating INTERVAL(...).

1f57bfb8

Merge stella.local:/home2/mydev/mysql-5.0-ateam · 1be2f0fa
unknown authored Nov 23, 2007
```
into  stella.local:/home2/mydev/mysql-5.0-axmrg
```
1be2f0fa
Bug#32654: rpl_view.test fails randomly · 7ae4cfaf
unknown authored Nov 23, 2007
```
Disabled test case
```
7ae4cfaf
Bug#32653 - rpl_log.test fails randomly · a5761be2
unknown authored Nov 23, 2007
```
Disabled test case
```
a5761be2
BUG#31277 - myisamchk --unpack corrupts a table · 4d9f4895
unknown authored Nov 23, 2007
```
Fixed a compiler warning on win64. Backport from 5.1.
```
4d9f4895
Bug#32651 - grant_cache.test fails · e5a17f5c
unknown authored Nov 23, 2007
```
Disabled test case
```
e5a17f5c
Merge mysql.com:/home/ram/work/mysql-5.0-engines · 50f5ba45
unknown authored Nov 23, 2007
```
into  mysql.com:/home/ram/work/b32558/b32558.5.0
```
50f5ba45

21 Nov, 2007 12 commits

Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0 · d295bfaa

unknown authored Nov 21, 2007

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge


client/mysql.cc:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/t/ctype_uca.test:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.h:
  Auto merged

d295bfaa

Merge stella.local:/home2/mydev/mysql-4.1-axmrg · 93e0508e
unknown authored Nov 21, 2007
```
into  stella.local:/home2/mydev/mysql-5.0-axmrg
```
93e0508e
Merge stella.local:/home2/mydev/mysql-5.0-amain · e2df3c29
unknown authored Nov 21, 2007
```
into  stella.local:/home2/mydev/mysql-5.0-axmrg
```
e2df3c29
Merge stella.local:/home2/mydev/mysql-4.1-amain · 4045c9b3
unknown authored Nov 21, 2007
```
into  stella.local:/home2/mydev/mysql-4.1-axmrg
```
4045c9b3
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build · 787316f2
unknown authored Nov 21, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
787316f2
add wrong warning to suppression file · 98c55d39
unknown authored Nov 21, 2007
```
support-files/compiler_warnings.supp:
  we want that.
```
98c55d39
Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.0-build · e8673939
unknown authored Nov 21, 2007
```
into  five.local.lan:/work/trees/mysql-5.0-build-src-clean
```
e8673939

ignore readline warnings · 75f14d9b

unknown authored Nov 21, 2007


support-files/compiler_warnings.supp:
  readline is not maintained by us

75f14d9b

Fix for bug #32558: group by null-returning expression with rollup causes crash · 0c2dac2a

unknown authored Nov 21, 2007

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.


mysql-test/r/olap.result:
  Fix for bug #32558: group by null-returning expression with rollup causes crash
    - test result.
mysql-test/t/olap.test:
  Fix for bug #32558: group by null-returning expression with rollup causes crash
    - test case.
sql/item_func.h:
  Fix for bug #32558: group by null-returning expression with rollup causes crash
    - use args[0]->is_null() to obtain Item_func_rollup_const::null_value 
      instead of args[0]->null_value as it's not set in advance in case of 
      constant functions.

0c2dac2a

This changeset fixes · b6c38105

unknown authored Nov 21, 2007

   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.


mysql-test/suite/funcs_1/datadict/datadict_master.inc:
  Exclude collation 'utf8_general_cs' from result set.
mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc:
  Use mysqltest builtin sorting of result set.
mysql-test/suite/funcs_1/datadict/datadict_tables.inc:
  Exclude collation 'utf8_general_cs' from result set.
mysql-test/suite/funcs_1/r/innodb__datadict.result:
  Updated  results
mysql-test/suite/funcs_1/r/memory__datadict.result:
  Updated  results
mysql-test/suite/funcs_1/r/myisam__datadict.result:
  Updated  results

b6c38105

Merge stella.local:/home2/mydev/mysql-5.0-amain · 3d0c0fac
unknown authored Nov 21, 2007
```
into  stella.local:/home2/mydev/mysql-5.0-axmrg
```
3d0c0fac

Fix for bug #30495: optimize table t1,t2,t3 extended errors · 18851d9e

unknown authored Nov 21, 2007

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


mysql-test/r/analyze.result:
  Fix for bug #30495: optimize table t1,t2,t3 extended errors
    - test result.
mysql-test/t/analyze.test:
  Fix for bug #30495: optimize table t1,t2,t3 extended errors
    - test case.
sql/sql_yacc.yy:
  Fix for bug #30495: optimize table t1,t2,t3 extended errors
    - opt_mi_check_type (CHECK TABLE options) removed from analyze: and optimize:

18851d9e

20 Nov, 2007 3 commits

Applied InnoDB snapshot innodb-5.0-ss2095 · a3dc40e2

unknown authored Nov 20, 2007

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.

innobase/include/db0err.h:
Applied InnoDB snapshot innodb-5.0-ss2095

Revision r2091:
branches/5.0:

Merge r2088 from trunk:

log for r2088:

Fix Bug#32125 (http://bugs.mysql.com/32125)
"Database crash due to ha_innodb.cc:3896: ulint convert_search_mode_to_innobase":

Approved by: Heikki
innobase/include/os0sync.h:
Applied InnoDB snapshot innodb-5.0-ss2095

Revision r2082:
branches/5.0: bug#29560

Reviewed by: Heikki
innobase/include/page0cur.h:
Applied InnoDB snapshot innodb-5.0-ss2095

Revision r2091:
branches/5.0:

Merge r2088 from trunk:

log for r2088:

Fix Bug#32125 (http://bugs.mysql.com/32125)
"Database crash due to ha_innodb.cc:3896: ulint convert_search_mode_to_innobase":

Approved by: Heikki
innobase/include/sync0rw.h:
Applied InnoDB snapshot innodb-5.0-ss2095

Revision r2082:
branches/5.0: bug#29560

Reviewed by: Heikki
innobase/include/sync0rw.ic:
Applied InnoDB snapshot innodb-5.0-ss2095

Revision r2082:
branches/5.0: bug#29560

Reviewed by: Heikki
innobase/include/sync0sync.ic:
Applied InnoDB snapshot innodb-5.0-ss2095

Revision r2082:
branches/5.0: bug#29560

Reviewed by: Heikki
innobase/os/os0sync.c:
Applied InnoDB snapshot innodb-5.0-ss2095

Revision r2082:
branches/5.0: bug#29560

Reviewed by: Heikki
innobase/srv/srv0srv.c:
Applied InnoDB snapshot innodb-5.0-ss2095

Revision r2082:
branches/5.0: bug#29560

Reviewed by: Heikki
innobase/sync/sync0arr.c:
Applied InnoDB snapshot innodb-5.0-ss2095

Revision r2082:
branches/5.0: bug#29560

Reviewed by: Heikki
innobase/sync/sync0rw.c:
Applied InnoDB snapshot innodb-5.0-ss2095

Revision r2082:
branches/5.0: bug#29560

Reviewed by: Heikki
innobase/sync/sync0sync.c:
Applied InnoDB snapshot innodb-5.0-ss2095

Revision r2082:
branches/5.0: bug#29560

Reviewed by: Heikki
sql/ha_innodb.cc:
Applied InnoDB snapshot innodb-5.0-ss2095

Revision r2091:
branches/5.0:

Merge r2088 from trunk:

log for r2088:

Fix Bug#32125 (http://bugs.mysql.com/32125)
"Database crash due to ha_innodb.cc:3896: ulint convert_search_mode_to_innobase":

Approved by: Heikki

Revision r2095:
branches/5.0: Merge r2093 from trunk:

convert_search_mode_to_innobase(): Add the missing case label
HA_READ_MBR_EQUAL that was forgotten in r2088.

a3dc40e2

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 · 49934f49
unknown authored Nov 20, 2007
```
into  mysql.com:/home/kent/bk/tmpmerge/mysql-5.0-build
```
49934f49
Raise version number after cloning 5.0.52 · aa4b42ff
unknown authored Nov 20, 2007

aa4b42ff

19 Nov, 2007 3 commits

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build · 29d7b245
unknown authored Nov 19, 2007
```
into  ramayana.hindu.god:/home/tsmith/m/bk/build/50
```
29d7b245
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-18431 · dd433ff1
unknown authored Nov 19, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
dd433ff1

Update readline to version 5.2. This fixes bug#18431. · 17146fc9

unknown authored Nov 19, 2007


cmd-line-utils/readline/INSTALL:
  update readline to version 5.2
cmd-line-utils/readline/README:
  update readline to version 5.2
cmd-line-utils/readline/bind.c:
  update readline to version 5.2
cmd-line-utils/readline/callback.c:
  update readline to version 5.2
cmd-line-utils/readline/chardefs.h:
  update readline to version 5.2
cmd-line-utils/readline/compat.c:
  update readline to version 5.2
cmd-line-utils/readline/complete.c:
  update readline to version 5.2
cmd-line-utils/readline/configure.in:
  update readline to version 5.2
cmd-line-utils/readline/display.c:
  update readline to version 5.2
cmd-line-utils/readline/funmap.c:
  update readline to version 5.2
cmd-line-utils/readline/histexpand.c:
  update readline to version 5.2
cmd-line-utils/readline/histfile.c:
  update readline to version 5.2
cmd-line-utils/readline/history.c:
  update readline to version 5.2
cmd-line-utils/readline/histsearch.c:
  update readline to version 5.2
cmd-line-utils/readline/input.c:
  update readline to version 5.2
cmd-line-utils/readline/isearch.c:
  update readline to version 5.2
cmd-line-utils/readline/keymaps.c:
  update readline to version 5.2
cmd-line-utils/readline/kill.c:
  update readline to version 5.2
cmd-line-utils/readline/macro.c:
  update readline to version 5.2
cmd-line-utils/readline/mbutil.c:
  update readline to version 5.2
cmd-line-utils/readline/misc.c:
  update readline to version 5.2
cmd-line-utils/readline/nls.c:
  update readline to version 5.2
cmd-line-utils/readline/parens.c:
  update readline to version 5.2
cmd-line-utils/readline/readline.c:
  update readline to version 5.2
cmd-line-utils/readline/readline.h:
  update readline to version 5.2
cmd-line-utils/readline/rlconf.h:
  update readline to version 5.2
cmd-line-utils/readline/rldefs.h:
  update readline to version 5.2
cmd-line-utils/readline/rlmbutil.h:
  update readline to version 5.2
cmd-line-utils/readline/rlprivate.h:
  update readline to version 5.2
cmd-line-utils/readline/rltty.c:
  update readline to version 5.2
cmd-line-utils/readline/savestring.c:
  update readline to version 5.2
cmd-line-utils/readline/search.c:
  update readline to version 5.2
cmd-line-utils/readline/shell.c:
  update readline to version 5.2
cmd-line-utils/readline/signals.c:
  update readline to version 5.2
cmd-line-utils/readline/terminal.c:
  update readline to version 5.2
cmd-line-utils/readline/text.c:
  update readline to version 5.2
cmd-line-utils/readline/tilde.c:
  update readline to version 5.2
cmd-line-utils/readline/tilde.h:
  update readline to version 5.2
cmd-line-utils/readline/undo.c:
  update readline to version 5.2
cmd-line-utils/readline/util.c:
  update readline to version 5.2
cmd-line-utils/readline/vi_keymap.c:
  update readline to version 5.2
cmd-line-utils/readline/vi_mode.c:
  update readline to version 5.2
cmd-line-utils/readline/xmalloc.c:
  update readline to version 5.2

17146fc9

16 Nov, 2007 5 commits

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build · 7f99a2db
unknown authored Nov 16, 2007
```
into  ramayana.hindu.god:/home/tsmith/m/bk/build/50
```
7f99a2db
Eliminate 'unused variable' warnings when compiling non-debug build · 975731aa
unknown authored Nov 16, 2007

975731aa

In the "spec" file for RPM builds, handle the debug server tests different... · 9395439c

unknown authored Nov 16, 2007

In the "spec" file for RPM builds, handle the debug server tests different from the standard server.


support-files/mysql.spec.sh:
  Don't use the "test-bt" target to run the tests on the debug server,
  rather use "test-bt-debug".
  
  There are two reasons for this:
  1) Consistency with the "tar.gz" builds.
  2) The tool that evaluates the build logs needs unique "--comment=" options in the log,
     or else it will fail when it generates the test status summary.

9395439c

Merge stella.local:/home2/mydev/mysql-4.1-axmrg · 3f43b07b
unknown authored Nov 16, 2007
```
into  stella.local:/home2/mydev/mysql-5.0-axmrg
```
3f43b07b
Merge stella.local:/home2/mydev/mysql-5.0-amain · 36fc6f56
unknown authored Nov 16, 2007
```
into  stella.local:/home2/mydev/mysql-5.0-axmrg


sql/mysql_priv.h:
  Auto merged
```
36fc6f56