Commits · d295bfaa769fd895f392f6058295b83928732d14 · Kirill Smelkov / mariadb

21 Nov, 2007 6 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 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

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

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 6 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 trift2.:/MySQL/M41/push-4.1 · 5f28ecad
unknown authored Nov 16, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
5f28ecad
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 10 commits
- 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 mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl · 5a3baf3d
  unknown authored Nov 14, 2007
```
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl
```
  5a3baf3d
- 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/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
- Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0 · f5613086
  unknown authored Nov 14, 2007
```
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl
```
  f5613086
13 Nov, 2007 7 commits

Merge mysql.com:/home/hf/work/31305/my41-31305 · 9a0020b5
unknown authored Nov 13, 2007
```
into  mysql.com:/home/hf/work/31305/my50-31305
```
9a0020b5
Merge bk@192.168.21.1:mysql-5.0-opt · c07ae796
unknown authored Nov 13, 2007
```
into  mysql.com:/home/hf/work/31305/my50-31305
```
c07ae796
Merge bk@192.168.21.1:mysql-4.1-opt · 9248b402
unknown authored Nov 13, 2007
```
into  mysql.com:/home/hf/work/31305/my41-31305
```
9248b402

Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 4bc635e2

unknown authored Nov 13, 2007

into  magare.gmz:/home/kgeorge/mysql/autopush/B31562-5.0-opt


sql/item.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

4bc635e2

Bug #31562: HAVING and lower case · 170ae2d2

unknown authored Nov 13, 2007

The columns in HAVING can reference the GROUP BY and 
SELECT columns. There can be "table" prefixes when
referencing these columns. And these "table" prefixes
in HAVING use the table alias if available.
This means that table aliases are subject to the same
storage rules as table names and are dependent on 
lower_case_table_names in the same way as the table 
names are.
Fixed by :
1. Treating table aliases as table names
and make them lowercase when printing out the SQL
statement for view persistence.
2. Using case insensitive comparison for table 
aliases when requested by lower_case_table_names


mysql-test/r/lowercase_view.result:
  Bug #31562: test case
mysql-test/t/lowercase_view.test:
  Bug #31562: test case
sql/item.cc:
  Bug #31562: lower_case_table_name contious comparison
  when searching in GROUP BY
sql/sql_base.cc:
  Bug #31562: lower_case_table_name contious comparison
  when searching in SELECT
sql/sql_select.cc:
  Bug #31562: treat table aliases as table names
  and make them lowercase when printing

170ae2d2

Elimination of warning for unused function code_name() in non-debug mode. · c1b3466f
unknown authored Nov 13, 2007

c1b3466f
Fixes to eliminate warnings. · 8cc379eb
unknown authored Nov 13, 2007

8cc379eb

12 Nov, 2007 5 commits

Merge mattiasj@bk-internal.mysql.com:/home/bk/mysql-5.0-engines · 001c78e2
unknown authored Nov 12, 2007
```
into  mattiasj-laptop.(none):/home/mattiasj/clones/mysql-5.0-engines_with_main
```
001c78e2

BUG#31793 (log event corruption causes crash): · b3c4bc6e

unknown authored Nov 12, 2007

Corrections to get_str_len_and_pointer().


sql/log_event.cc:
  Adding missing return at end of get_str_len_and_pointer()
  and correcting computation of missing bytes.

b3c4bc6e

Merge mattiasj-laptop.(none):/home/mattiasj/clones/mysql-5.0-main · 53907ce8
unknown authored Nov 12, 2007
```
into  mattiasj-laptop.(none):/home/mattiasj/clones/mysql-5.0-engines_with_main
```
53907ce8
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1-build · dff7a5af
unknown authored Nov 12, 2007
```
into  mysql.com:/home/kent/bk/bug30069/mysql-4.1-build
```
dff7a5af

Merge mysql.com:/home/svoj/devel/mysql/BUG32111/mysql-4.1-engines · 2aa5037c

unknown authored Nov 12, 2007

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


mysql-test/r/symlink.result:
  Auto merged
mysql-test/t/symlink.test:
  Auto merged

2aa5037c