Commits · 6e985efb1e273a4e768b439337c56bb7dcd7ce26 · Kirill Smelkov / mariadb

28 Sep, 2006 1 commit

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 6e985efb

unknown authored Sep 28, 2006

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint


mysql-test/r/ctype_utf8.result:
  Manual merge.
mysql-test/t/ctype_utf8.test:
  Manual merge.

6e985efb

27 Sep, 2006 1 commit
- Patch for bug#21432 is reverted · abd883f4
  unknown authored Sep 27, 2006
  
  abd883f4
25 Sep, 2006 2 commits
- Merge neptunus.(none):/home/msvensson/mysql/work/my41-work · 7731acb5
  unknown authored Sep 25, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
```
  7731acb5
- Bug#18888 Trying to overwrite sql/lex_hash.h during build · 6f3c9bfa
  unknown authored Sep 25, 2006
```
 -Backport fix for bug19738 to 4.1 


sql/Makefile.am:
  Generated source should depend on their sources not the tool
```
  6f3c9bfa
24 Sep, 2006 1 commit

mysql_config.sh: · 103fc806

unknown authored Sep 25, 2006

  Filter out plain -O and Sun C/C++ style optimization flags, -xO<level>
  Filter out icc specific options from cflags/libs(_r)


scripts/mysql_config.sh:
  Filter out plain -O and Sun C/C++ style optimization flags, -xO<level>

103fc806

23 Sep, 2006 3 commits

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 53d2e32b
unknown authored Sep 23, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
```
53d2e32b

Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1 · 1e84e31c

unknown authored Sep 23, 2006

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge


BitKeeper/etc/ignore:
  auto-union
mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
sql/sql_select.cc:
  Auto merged

1e84e31c

Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl · 14ad51e0

unknown authored Sep 23, 2006

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge


BitKeeper/etc/ignore:
  auto-union
mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
sql/sql_select.cc:
  Auto merged

14ad51e0

22 Sep, 2006 3 commits

Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint · 41c25e01
unknown authored Sep 22, 2006
```
into  polly.local:/home/kaa/src/maint/m41-maint--07OGk
```
41c25e01
Merge polly.local:/tmp/22129/bug22129/my41-bug22129 · e749f9eb
unknown authored Sep 22, 2006
```
into  polly.local:/home/kaa/src/maint/m41-maint--07OGk


strings/strtod.c:
  Auto merged
```
e749f9eb

Fixed bug #22129: A small double precision number becomes zero · 2299727e

unknown authored Sep 22, 2006

Better checks for underflow/overflow


mysql-test/r/type_float.result:
  Added testcase for bug #22129
mysql-test/t/type_float.test:
  Added testcase for bug #22129

2299727e

21 Sep, 2006 5 commits

Merge knielsen.mysql.internal:/usr/local/mysql/mysql-4.1 · c9983fcf
unknown authored Sep 21, 2006
```
into  bk-internal.mysql.com:/tmp/knielsen/mysql-4.1-maint
```
c9983fcf
Adding proper setup phase for test case rpl_insert_id · 4d147f32
unknown authored Sep 21, 2006
```
mysql-test/r/rpl_insert_id.result:
  Updated result file
```
4d147f32

Fix for bug #20204: "order by" changes the results returned · 5d3a59fa

unknown authored Sep 21, 2006

Item_substr's results are improperly stored in a temporary table due to       
wrongly calculated max_length value for multi-byte charsets if two            
arguments specified.                                                          


mysql-test/r/ctype_utf8.result:
  Fix for bug #20204: "order by" changes the results returned
    - test case.
mysql-test/t/ctype_utf8.test:
  Fix for bug #20204: "order by" changes the results returned
    - test result.
sql/item_strfunc.cc:
  Fix for bug #20204: "order by" changes the results returned
    - always take into account current mbmaxlen value calculating max_length.

5d3a59fa

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · c19ac9ec

unknown authored Sep 21, 2006

into  mysql.com:/usr/home/ram/work/mysql-4.1-maint


mysql-test/r/func_time.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged

c19ac9ec

Vertical printout in test to make easier to read · 9e9632fd
unknown authored Sep 21, 2006

9e9632fd

20 Sep, 2006 2 commits

Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl · 941e5020
unknown authored Sep 20, 2006
```
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge


sql/sql_yacc.yy:
  Auto merged
```
941e5020

Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines · f6951675

unknown authored Sep 20, 2006

into  chilla.local:/home/mydev/mysql-4.1-bug14400-monty


BitKeeper/etc/ignore:
  auto-union
mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
sql/sql_select.cc:
  Auto merged

f6951675

19 Sep, 2006 3 commits

Merge kpdesk.mysql.com:/home/thek/dev2/bug21139/my41-bug21139 · 608e10e0
unknown authored Sep 19, 2006
```
into  kpdesk.mysql.com:/home/thek/dev2/mysql-4.1-maint
```
608e10e0

Bug#21139 Handling of database differs in "embedded" , test lowercase_fs_off fails · 7c8931d8

unknown authored Sep 19, 2006

- Access checks are omitted when compliled without --with-embedded-privilege-control
- Patch: skip this test


mysql-test/t/lowercase_fs_off.test:
  Added test to check if this embedded built in which case we just skip this test.

7c8931d8

Merge bk-internal:/home/bk/mysql-4.0 · 82a72ee1

unknown authored Sep 19, 2006

into  chilla.local:/home/mydev/mysql-4.1-bug14400-monty


BitKeeper/etc/ignore:
  auto-union
include/my_global.h:
  Auto merged
myisam/mi_rkey.c:
  Manual null merge as a better fix is already present.
mysql-test/r/myisam.result:
  Manual null merge as a better fix is already present.
mysql-test/t/myisam.test:
  Manual null merge as a better fix is already present.
sql/sql_select.cc:
  Manual merge of purify improvements.

82a72ee1

18 Sep, 2006 3 commits

Merge may.pils.ru:/home/svoj/devel/mysql/merge/mysql-4.1 · 186573b3

unknown authored Sep 18, 2006

into  may.pils.ru:/home/svoj/devel/mysql/merge/mysql-4.1-engines


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

186573b3

Merge bk-internal:/home/bk/mysql-4.1-opt · 96dbaffd
unknown authored Sep 18, 2006
```
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt
```
96dbaffd
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint · 1ba16a86
unknown authored Sep 18, 2006
```
into  mysql.com:/usr/home/ram/work/bug21142/my41-bug21142


client/mysql.cc:
  Auto merged
```
1ba16a86

15 Sep, 2006 3 commits

Merge bk-internal:/home/bk/mysql-4.1-opt · e5345197

unknown authored Sep 15, 2006

into  macbook.gmz:/Users/kgeorge/mysql/work/B21180-4.1-opt


mysql-test/r/subselect.result:
  merge of 4.1-opt
mysql-test/t/subselect.test:
  merge of 4.1-opt
sql/opt_range.h:
  merge of 4.1-opt

e5345197

Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines · ab7d1d70
unknown authored Sep 15, 2006
```
into  chilla.local:/home/mydev/mysql-4.1-bug14400


myisam/mi_rkey.c:
  Auto merged
```
ab7d1d70
Merge dl145s.mysql.com:/data/bk/team_tree_merge/CLEAN/mysql-4.1 · 341cc55a
unknown authored Sep 15, 2006
```
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt
```
341cc55a

14 Sep, 2006 4 commits

Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl · a72cd538
unknown authored Sep 15, 2006
```
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
```
a72cd538
Bug#14400 - Query joins wrong rows from table which is subject of · addff97f
unknown authored Sep 14, 2006
```
            "concurrent insert"
After merge fix.
```
addff97f
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1-opt · 76c48d43
unknown authored Sep 14, 2006
```
into  moonbone.local:/work/21677-bug-4.1-opt-mysql
```
76c48d43

type_date.test, type_date.result: · cca7be1c

unknown authored Sep 14, 2006

Added the test case for bug#21677: Wrong result when comparing a DATE and a DATETIME in BETWEEN

mysql-test/t/type_date.test:
Added the test case for bug#21677: Wrong result when comparing a DATE and a DATETIME in BETWEEN
mysql-test/r/type_date.result:
Added the test case for bug#21677: Wrong result when comparing a DATE and a DATETIME in BETWEEN

cca7be1c

13 Sep, 2006 2 commits

Merge polly.local:/tmp/20924/bug20294/my41-bug20294 · 5d7cdfb3

unknown authored Sep 13, 2006

into  polly.local:/home/kaa/src/maint/m41-maint--07OGk


sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/sql_class.h:
  Auto merged

5d7cdfb3

Cset exclude: kaa@polly.local|ChangeSet|20060912122540|09861 · 418ae41b

unknown authored Sep 13, 2006

Cset exclude: kaa@polly.local|ChangeSet|20060908100829|09983


sql/item_cmpfunc.cc:
  Exclude
sql/item_cmpfunc.h:
  Exclude
sql/item_func.cc:
  Exclude
sql/item_func.h:
  Exclude
sql/log_event.cc:
  Exclude
sql/sql_class.h:
  Exclude
mysql-test/r/case.result:
  Exclude
mysql-test/r/func_if.result:
  Exclude
mysql-test/r/func_test.result:
  Exclude
mysql-test/r/user_var.result:
  Exclude
mysql-test/t/case.test:
  Exclude
mysql-test/t/func_if.test:
  Exclude
mysql-test/t/func_test.test:
  Exclude
mysql-test/t/user_var.test:
  Exclude

418ae41b

12 Sep, 2006 4 commits

Merge polly.local:/tmp/20924/bug20294/my41-bug20294 · b479dcd1

unknown authored Sep 12, 2006

into  polly.local:/home/kaa/src/maint/m41-maint--07OGk


sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/sql_class.h:
  Auto merged

b479dcd1

item_cmpfunc.cc: · f3e83870

unknown authored Sep 12, 2006

  Removed changes to the Item_func_between::fix_length_and_dec() made in the fix for bug#16377
query_cache.result:
  Corrected a test case after removing a fix for bug#16377


mysql-test/r/query_cache.result:
  Corrected a test case after removing a fix for bug#16377
sql/item_cmpfunc.cc:
  Removed changes to the Item_func_between::fix_length_and_dec() made in the fix for bug#16377

f3e83870

Post-review fixes for bug #20924 · 5aa6e861

unknown authored Sep 12, 2006


mysql-test/r/case.result:
  Post-review fix for bug #20924
mysql-test/r/func_if.result:
  Post-review fix for bug #20924
mysql-test/r/func_test.result:
  Post-review fix for bug #20924
mysql-test/r/user_var.result:
  Post-review fix for bug #20924
mysql-test/t/case.test:
  Post-review fix for bug #20924
mysql-test/t/func_if.test:
  Post-review fix for bug #20924
mysql-test/t/func_test.test:
  Post-review fix for bug #20924
mysql-test/t/user_var.test:
  Post-review fix for bug #20924
sql/item_func.cc:
  Post-review fix for bug #20924
sql/item_func.h:
  Post-review fix for bug #20924
sql/log_event.cc:
  Post-review fix for bug #20924

5aa6e861

Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines · 562763f1

unknown authored Sep 12, 2006

into  chilla.local:/home/mydev/mysql-4.1-bug14400


mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
myisam/mi_rkey.c:
  Bug#14400 - Query joins wrong rows from table which is subject of
              "concurrent insert"
  Manual merge

562763f1

11 Sep, 2006 2 commits

BUG#16282 · a5a48382

unknown authored Sep 11, 2006

Build gcc.o as a small library, instead of passing .cpp sources to the
linker command (causes problems with parallel make on Solaris).

This fix is for 4.1. In 5.0 and up a different fix is used.


ndb/config/common.mk.am:
  Build gcc.o as a small library, instead of passing .cpp sources to the
  linker command (causes problems with parallel make on Solaris).
ndb/config/type_ndbapitools.mk.am:
  Build gcc.o as a small library, instead of passing .cpp sources to the
  linker command (causes problems with parallel make on Solaris).
ndb/src/common/portlib/Makefile.am:
  Build gcc.o as a small library, instead of passing .cpp sources to the
  linker command (causes problems with parallel make on Solaris).
ndb/src/kernel/Makefile.am:
  Build gcc.o as a small library, instead of passing .cpp sources to the
  linker command (causes problems with parallel make on Solaris).

a5a48382

Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl · 2780bad0
unknown authored Sep 11, 2006
```
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
```
2780bad0

08 Sep, 2006 1 commit

Bug #20924: CAST(expr as UNSIGNED) returns SIGNED value when used in various functions · f64483cb

unknown authored Sep 08, 2006

- Honor unsigned_flag in the corresponding functions
- Use compare_int_signed_unsigned()/compare_int_unsigned_signed() instead of explicit comparison in GREATEST() and LEAST()


mysql-test/r/case.result:
  Added test case for bug #20924
mysql-test/r/func_if.result:
  Added test case for bug #20924
mysql-test/r/func_test.result:
  Added test case for bug #20924
mysql-test/r/user_var.result:
  Added test case for bug #20924
mysql-test/t/case.test:
  Added test case for bug #20924
mysql-test/t/func_if.test:
  Added test case for bug #20924
mysql-test/t/func_test.test:
  Added test case for bug #20924
mysql-test/t/user_var.test:
  Added test case for bug #20924
sql/item_cmpfunc.cc:
  Bug #20924: CAST(expr as UNSIGNED) returns SIGNED value when used in various functions
  
  - Moved some code out of Arg_comparator to external functions to be reused in Item_func_min_max
  - Fixed IFNULL(), IF(), CASE() and COALESCE()
sql/item_cmpfunc.h:
  Bug #20924: CAST(expr as UNSIGNED) returns SIGNED value when used in various functions
  
  - Moved some code out of Arg_comparator to external functions to be reused in Item_func_min_max
sql/item_func.cc:
  Bug #20924: CAST(expr as UNSIGNED) returns SIGNED value when used in various functions
  
  Fixed LEAST(), GREATEST() and "SET @A=..." parts
sql/item_func.h:
  Bug #20924: CAST(expr as UNSIGNED) returns SIGNED value when used in various functions
  
  Fixed "SET @A=..." part
sql/sql_class.h:
  Bug #20924: CAST(expr as UNSIGNED) returns SIGNED value when used in various functions
  
  Fixed "SET @A=..." part

f64483cb