Commits · fadb454ff767bcb3d5490684d7b1dc6d2f63b324 · nexedi / MariaDB

20 Nov, 2007 5 commits

Merge ramayana.hindu.god:/home/tsmith/m/inno/nov19/50 · fadb454f

unknown authored Nov 20, 2007

into  ramayana.hindu.god:/home/tsmith/m/inno/nov19/51


storage/innobase/handler/ha_innodb.cc:
  Use local (null merge)
storage/innobase/include/db0err.h:
  Use local (null merge)
storage/innobase/include/os0sync.h:
  Use local (null merge)
storage/innobase/include/page0cur.h:
  Use local (null merge)
storage/innobase/include/sync0rw.h:
  Use local (null merge)
storage/innobase/include/sync0rw.ic:
  Use local (null merge)
storage/innobase/include/sync0sync.ic:
  Use local (null merge)
storage/innobase/os/os0sync.c:
  Use local (null merge)
storage/innobase/srv/srv0srv.c:
  Use local (null merge)
storage/innobase/sync/sync0arr.c:
  Use local (null merge)
storage/innobase/sync/sync0rw.c:
  Use local (null merge)
storage/innobase/sync/sync0sync.c:
  Use local (null merge)

fadb454f

Applied InnoDB snapshot innodb-5.0-ss2095 · 31561cfa

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.

31561cfa

Merge mysql.com:/home/kent/bk/tmpmerge/mysql-5.0-build · a6e9f792
unknown authored Nov 20, 2007
```
into  mysql.com:/home/kent/bk/tmpmerge/mysql-5.1-build
```
a6e9f792
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 · b39cd4cf
unknown authored Nov 20, 2007
```
into  mysql.com:/home/kent/bk/tmpmerge/mysql-5.0-build
```
b39cd4cf
Raise version number after cloning 5.0.52 · 773b30ca
unknown authored Nov 20, 2007

773b30ca

19 Nov, 2007 9 commits

Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build · f062d702
unknown authored Nov 19, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
f062d702
Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50 · 18a36ce2
unknown authored Nov 19, 2007
```
into  ramayana.hindu.god:/home/tsmith/m/bk/build/51


mysys/default.c:
  Auto merged
```
18a36ce2

The error number for ER_ILLEGAL_HA_CREATE_OPTION changed from 1477 to 1478, · 2c93d5af

unknown authored Nov 19, 2007

this must be reflected in the test result files.


mysql-test/suite/funcs_1/r/ndb_cursors.result:
  Error number changed, adapt the test result.
mysql-test/suite/funcs_1/r/ndb_trig_0102.result:
  Error number changed, adapt the test result.
mysql-test/suite/funcs_1/r/ndb_trig_03.result:
  Error number changed, adapt the test result.
mysql-test/suite/funcs_1/r/ndb_trig_0407.result:
  Error number changed, adapt the test result.
mysql-test/suite/funcs_1/r/ndb_trig_08.result:
  Error number changed, adapt the test result.
mysql-test/suite/funcs_1/r/ndb_trig_09.result:
  Error number changed, adapt the test result.
mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result:
  Error number changed, adapt the test result.

2c93d5af

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build · 0190b029
unknown authored Nov 19, 2007
```
into  ramayana.hindu.god:/home/tsmith/m/bk/build/50
```
0190b029
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · 5b92b689
unknown authored Nov 19, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
5b92b689
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-18431 · 28c172ce
unknown authored Nov 19, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
28c172ce
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-18431 · 62243160
unknown authored Nov 19, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
62243160

Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-18431 · 2dcab4e8

unknown authored Nov 19, 2007

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-18431


cmd-line-utils/readline/bind.c:
  Auto merged
cmd-line-utils/readline/complete.c:
  Auto merged
cmd-line-utils/readline/display.c:
  Auto merged
cmd-line-utils/readline/histfile.c:
  Auto merged
cmd-line-utils/readline/rltty.c:
  Auto merged
cmd-line-utils/readline/undo.c:
  Auto merged
cmd-line-utils/readline/xmalloc.c:
  Auto merged

2dcab4e8

Update readline to version 5.2. This fixes bug#18431. · 6e66651e

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

6e66651e

16 Nov, 2007 9 commits

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

03b649f9

Merge trift2.:/MySQL/M50/push-5.0 · 71acc4eb

unknown authored Nov 16, 2007

into  trift2.:/MySQL/M51/push-5.1


support-files/mysql.spec.sh:
  Null-merge the "make test-bt-debug" from 5.0 to 5.1,
  because 5.1 already does it "the right way".

71acc4eb

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

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.

d23ba1c2

Merge trift2.:/MySQL/M50/push-5.0 · c72a606b
unknown authored Nov 16, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
c72a606b
Merge trift2.:/MySQL/M41/push-4.1 · 5feaeb45
unknown authored Nov 16, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
5feaeb45
Merge trift2.:/MySQL/M51/mysql-5.1 · a77e046f
unknown authored Nov 16, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
a77e046f
Merge trift2.:/MySQL/M50/mysql-5.0 · 841be8fd
unknown authored Nov 16, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
841be8fd
Merge trift2.:/MySQL/M41/mysql-4.1 · 535a351f
unknown authored Nov 16, 2007
```
into  trift2.:/MySQL/M41/push-4.1
```
535a351f

15 Nov, 2007 3 commits
- Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 62f73616
  unknown authored Nov 15, 2007
```
into  mysql.com:/misc/mysql/31700/51-31700


mysql-test/r/log_tables.result:
  Auto merged
```
  62f73616
- Bug#31700: thd->examined_row_count not incremented for 'const' type queries · 3181c85c
  unknown authored Nov 15, 2007
```
tests adjusted for Windows


mysql-test/r/log_tables.result:
  Be more conservative in tests (for Windows)
mysql-test/t/log_tables.test:
  Be more conservative in tests (for Windows)
```
  3181c85c
- updated result file · 0a2b1ead
  unknown authored Nov 15, 2007
  
  0a2b1ead
14 Nov, 2007 14 commits

updated result file · fb0e2183
unknown authored Nov 14, 2007

fb0e2183
Merge trift2.:/MySQL/M50/push-5.0 · c402ea17
unknown authored Nov 14, 2007
```
into  trift2.:/MySQL/M51/push-5.1


include/my_sys.h:
  Auto merged
```
c402ea17

Merge trift2.:/MySQL/M51/mysql-5.1 · 569636ab

unknown authored Nov 14, 2007

into  trift2.:/MySQL/M51/push-5.1


include/my_sys.h:
  Auto merged
sql/CMakeLists.txt:
  Manual merge: Keep the workaround for the cmake 2.4.6 bug, enclose it in "if".

569636ab

Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt · c243eb6a
unknown authored Nov 14, 2007
```
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt


mysql-test/t/select.test:
  Auto merged
```
c243eb6a
after merge fix · 72d70ff8
unknown authored Nov 14, 2007

72d70ff8
Merge trift2.:/MySQL/M41/push-4.1 · ad8b056a
unknown authored Nov 14, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
ad8b056a
Merge trift2.:/MySQL/M50/mysql-5.0 · 778e234f
unknown authored Nov 14, 2007
```
into  trift2.:/MySQL/M50/push-5.0


include/my_sys.h:
  Auto merged
```
778e234f
Merge trift2.:/MySQL/M40/mysql-4.0 · 2622d3b0
unknown authored Nov 14, 2007
```
into  trift2.:/MySQL/M41/push-4.1
```
2622d3b0
Merge trift2.:/MySQL/M41/mysql-4.1 · 541ca724
unknown authored Nov 14, 2007
```
into  trift2.:/MySQL/M41/push-4.1
```
541ca724

Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt · a4bb840d

unknown authored Nov 14, 2007

into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt


mysql-test/r/select.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged

a4bb840d

Merge mysql.com:/home/gluh/MySQL/Merge/5.1 · acb7a755

unknown authored Nov 14, 2007

into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt


BitKeeper/etc/ignore:
  auto-union
mysql-test/r/events_bugs.result:
  Auto merged
mysql-test/r/partition.result:
  Auto merged
mysql-test/r/ps_2myisam.result:
  Auto merged
mysql-test/r/ps_3innodb.result:
  Auto merged
mysql-test/r/ps_4heap.result:
  Auto merged
mysql-test/r/ps_5merge.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/partition.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/r/select.result:
  manual merge
mysql-test/t/select.test:
  manual merge

acb7a755

Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt · c875efb0
unknown authored Nov 14, 2007
```
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
```
c875efb0

Merge mysql.com:/home/gluh/MySQL/Merge/5.0 · b1e5f7ad

unknown authored Nov 14, 2007

into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt


mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
mysql-test/r/select.result:
  manual merge
mysql-test/t/select.test:
  manual merge

b1e5f7ad

Merge mysql.com:/home/gluh/MySQL/Merge/4.1 · 28876ad9
unknown authored Nov 14, 2007
```
into  mysql.com:/home/gluh/MySQL/Merge/4.1-opt
```
28876ad9