Commits · e58420916c465540508af96ba319e3d80b043c9e · nexedi / MariaDB

26 Nov, 2007 1 commit

patch for bug#32496 (2nd) with ansi conformant and Mysql test case. · e5842091

unknown authored Nov 26, 2007


BitKeeper/etc/ignore:
  Added scripts/make_win_src_distribution_old server-tools/instance-manager/net_serv.cc to the ignore list

e5842091

22 Nov, 2007 1 commit

Makefile.am, configure.in: · 1b9a1b34

unknown authored Nov 22, 2007

  Include "manual.chm" in source TAR if it exists


configure.in:
  Include "manual.chm" in source TAR if it exists
Docs/Makefile.am:
  Include "manual.chm" in source TAR if it exists

1b9a1b34

21 Nov, 2007 3 commits

Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.0-build · e86dfae3
unknown authored Nov 21, 2007
```
into  five.local.lan:/work/trees/mysql-5.0-build-src-clean
```
e86dfae3

ignore readline warnings · 1b5c57d4

unknown authored Nov 21, 2007


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

1b5c57d4

This changeset fixes · c68db60f

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

c68db60f

20 Nov, 2007 3 commits

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 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 3 commits

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-work-18431 · 62243160
unknown authored Nov 19, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
62243160

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

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/M41/push-4.1 · 5feaeb45
unknown authored Nov 16, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
5feaeb45
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

14 Nov, 2007 8 commits
- 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/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
13 Nov, 2007 5 commits

Merge mysql.com:/home/hf/work/31305/my41-31305 · 509582f4
unknown authored Nov 13, 2007
```
into  mysql.com:/home/hf/work/31305/my50-31305
```
509582f4
Merge bk@192.168.21.1:mysql-5.0-opt · 12997acd
unknown authored Nov 13, 2007
```
into  mysql.com:/home/hf/work/31305/my50-31305
```
12997acd
Merge bk@192.168.21.1:mysql-4.1-opt · 38d1b2f5
unknown authored Nov 13, 2007
```
into  mysql.com:/home/hf/work/31305/my41-31305
```
38d1b2f5

Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 062f27ee

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

062f27ee

Bug #31562: HAVING and lower case · 5dc81f4f

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

5dc81f4f

12 Nov, 2007 10 commits

Merge mattiasj@bk-internal.mysql.com:/home/bk/mysql-5.0-engines · f01556d5
unknown authored Nov 12, 2007
```
into  mattiasj-laptop.(none):/home/mattiasj/clones/mysql-5.0-engines_with_main
```
f01556d5
Merge mattiasj-laptop.(none):/home/mattiasj/clones/mysql-5.0-main · 3b7f9911
unknown authored Nov 12, 2007
```
into  mattiasj-laptop.(none):/home/mattiasj/clones/mysql-5.0-engines_with_main
```
3b7f9911
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1-build · 88c2cc1a
unknown authored Nov 12, 2007
```
into  mysql.com:/home/kent/bk/bug30069/mysql-4.1-build
```
88c2cc1a

Merge mysql.com:/home/svoj/devel/mysql/BUG32111/mysql-4.1-engines · 90e09bfb

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

90e09bfb

symlink.test, symlink.result: · eb3c917d

unknown authored Nov 12, 2007

  Use proper variable for test.


mysql-test/t/symlink.test:
  Use proper variable for test.
mysql-test/r/symlink.result:
  Use proper variable for test.

eb3c917d

Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.0 · e193083c
unknown authored Nov 12, 2007
```
into  mysql.com:/home/svoj/devel/mysql/BUG32111/mysql-4.0
```
e193083c

Merge mysql.com:/home/kent/bk/bug30069/mysql-4.1-build · a115d318

unknown authored Nov 12, 2007

into  mysql.com:/home/kent/bk/bug30069/mysql-5.0-build


mysql-test/t/bigint.test:
  Auto merged
strings/ctype-simple.c:
  Auto merged
mysql-test/r/bigint.result:
  SCCS merged

a115d318

bigint.test, bigint.result: · a4277209

unknown authored Nov 12, 2007

  Test case for Bug#30069


mysql-test/r/bigint.result:
  Test case for Bug#30069
mysql-test/t/bigint.test:
  Test case for Bug#30069

a4277209

Merge mysql.com:/home/svoj/devel/mysql/BUG32111/mysql-4.1-engines · 7cc910a0

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
mysys/my_symlink2.c:
  Auto merged

7cc910a0

After merge fix. · e8e897bc
unknown authored Nov 12, 2007

e8e897bc