Commits · fb0371d749886326feb6c0c4b13ba82ac696f601 · Kirill Smelkov / mariadb

20 Nov, 2007 5 commits

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

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)

fb0371d7

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 mysql.com:/home/kent/bk/tmpmerge/mysql-5.0-build · bc02d31b
unknown authored Nov 20, 2007
```
into  mysql.com:/home/kent/bk/tmpmerge/mysql-5.1-build
```
bc02d31b
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 9 commits

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


mysys/default.c:
  Auto merged
```
b5cd2124

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

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.

c25d0743

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 · 74e811cd
unknown authored Nov 19, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
74e811cd
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-18431 · 53f4da7b
unknown authored Nov 19, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
53f4da7b
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

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

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

6ba58c91

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 9 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

Merge trift2.:/MySQL/M50/push-5.0 · 51d94696

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".

51d94696

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 trift2.:/MySQL/M50/push-5.0 · 44a9ef16
unknown authored Nov 16, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
44a9ef16
Merge trift2.:/MySQL/M41/push-4.1 · 5f28ecad
unknown authored Nov 16, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
5f28ecad
Merge trift2.:/MySQL/M51/mysql-5.1 · 33c9d06b
unknown authored Nov 16, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
33c9d06b
Merge trift2.:/MySQL/M50/mysql-5.0 · 1f373cb1
unknown authored Nov 16, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
1f373cb1
Merge trift2.:/MySQL/M41/mysql-4.1 · ee85ee62
unknown authored Nov 16, 2007
```
into  trift2.:/MySQL/M41/push-4.1
```
ee85ee62

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


mysql-test/r/log_tables.result:
  Auto merged
```
  f4f7e1f4
- Bug#31700: thd->examined_row_count not incremented for 'const' type queries · dc7bc68f
  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)
```
  dc7bc68f
- updated result file · 6f97fb59
  unknown authored Nov 15, 2007
  
  6f97fb59
14 Nov, 2007 14 commits

updated result file · dfbd0952
unknown authored Nov 14, 2007

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


include/my_sys.h:
  Auto merged
```
6a86af04

Merge trift2.:/MySQL/M51/mysql-5.1 · d1d6920d

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".

d1d6920d

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


mysql-test/t/select.test:
  Auto merged
```
8fe6d1d4
after merge fix · 1490691e
unknown authored Nov 14, 2007

1490691e
Merge trift2.:/MySQL/M41/push-4.1 · 1140bed5
unknown authored Nov 14, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
1140bed5
Merge trift2.:/MySQL/M50/mysql-5.0 · e3c72651
unknown authored Nov 14, 2007
```
into  trift2.:/MySQL/M50/push-5.0


include/my_sys.h:
  Auto merged
```
e3c72651
Merge trift2.:/MySQL/M40/mysql-4.0 · a0708969
unknown authored Nov 14, 2007
```
into  trift2.:/MySQL/M41/push-4.1
```
a0708969
Merge trift2.:/MySQL/M41/mysql-4.1 · e8d3f160
unknown authored Nov 14, 2007
```
into  trift2.:/MySQL/M41/push-4.1
```
e8d3f160

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

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

f655bcda

Merge mysql.com:/home/gluh/MySQL/Merge/5.1 · 711cf750

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

711cf750

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

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

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

bed60e01

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