Commits · e5a17f5c306db31db3a7e4c94582e8130d3f8a27 · nexedi / MariaDB

23 Nov, 2007 1 commit
- Bug#32651 - grant_cache.test fails · e5a17f5c
  unknown authored Nov 23, 2007
```
Disabled test case
```
  e5a17f5c
21 Nov, 2007 9 commits

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

unknown authored Nov 21, 2007


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

75f14d9b

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

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 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
- 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
- Merge trift2.:/MySQL/M41/push-4.1 · 5f28ecad
  unknown authored Nov 16, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
  5f28ecad
- Merge stella.local:/home2/mydev/mysql-4.1-amain · 425478ba
  unknown authored Nov 16, 2007
```
into  stella.local:/home2/mydev/mysql-4.1-axmrg
```
  425478ba
- 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
14 Nov, 2007 15 commits

Merge stella.local:/home2/mydev/mysql-5.0-ateam · 4fa7902f
unknown authored Nov 14, 2007
```
into  stella.local:/home2/mydev/mysql-5.0-axmrg
```
4fa7902f
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 stella.local:/home2/mydev/mysql-5.0-ateam · 6519df0b
unknown authored Nov 14, 2007
```
into  stella.local:/home2/mydev/mysql-5.0-axmrg
```
6519df0b
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines · 3160957e
unknown authored Nov 14, 2007
```
into  stella.local:/home2/mydev/mysql-5.0-bug4692


myisam/mi_check.c:
  Auto merged
```
3160957e
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

Bug#4692 - DISABLE/ENABLE KEYS waste a space · 706a8b09

unknown authored Nov 14, 2007

Post-pushbuild fix

Added a purecov comment and a test for coverage of parallel
enable keys.


myisam/mi_check.c:
  Bug#4692 - DISABLE/ENABLE KEYS waste a space
  Added purecov comment.
mysql-test/r/myisam.result:
  Bug#4692 - DISABLE/ENABLE KEYS waste a space
  Added test result.
mysql-test/t/myisam.test:
  Bug#4692 - DISABLE/ENABLE KEYS waste a space
  Added test for coverage of parallel enable keys.

706a8b09

Merge stella.local:/home2/mydev/mysql-5.0-ateam · aba705b0
unknown authored Nov 14, 2007
```
into  stella.local:/home2/mydev/mysql-5.0-axmrg
```
aba705b0

Merge mysql.com:/home/svoj/devel/mysql/BUG31277/mysql-4.1-engines · 09e24d13

unknown authored Nov 14, 2007

into  mysql.com:/home/svoj/devel/mysql/BUG31277/mysql-5.0-engines


myisam/mi_check.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
myisam/mi_packrec.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/mysql_priv.h:
  Auto merged
include/mysql_com.h:
  Use local.
sql-common/client.c:
  Use local.

09e24d13

Merge mysql.com:/home/svoj/devel/bk/mysql-4.1-engines · 209c69f8
unknown authored Nov 14, 2007
```
into  mysql.com:/home/svoj/devel/mysql/BUG31277/mysql-4.1-engines
```
209c69f8