Commits · 3cae41c6f02e17a60ba85a5bbae915c7cf581150 · Kirill Smelkov / mariadb

13 Sep, 2006 3 commits

Merge polly.local:/tmp/20924/bug20294/my50-bug20294 · 3cae41c6

unknown authored Sep 13, 2006

into  polly.local:/tmp/20924/bug20294/my51-bug20294


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

3cae41c6

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

unknown authored Sep 13, 2006

into  polly.local:/tmp/20924/bug20294/my50-bug20294


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

b419501e

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/my50-bug20294 · 910c0075

unknown authored Sep 12, 2006

into  polly.local:/tmp/20924/bug20294/my51-bug20294


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

910c0075

Fixed compilation · d31a3434
unknown authored Sep 12, 2006

d31a3434

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

unknown authored Sep 12, 2006

into  polly.local:/tmp/20924/bug20294/my50-bug20294


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

db141b6b

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

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

07 Sep, 2006 2 commits
- make partition_mgm test deterministic wrt results of ls · 51e8434e
  unknown authored Sep 07, 2006
```
mysql-test/t/partition_mgm.test:
  make partition_mgm test deterministic
```
  51e8434e
- Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 53a7a267
  unknown authored Sep 07, 2006
```
into  salvation.intern.azundris.com:/home/tnurnberg/21913/my51-21913
```
  53a7a267
06 Sep, 2006 14 commits

Merge maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my51-bfx · 2bffa055
unknown authored Sep 07, 2006
```
into  maint1.mysql.com:/data/localhome/tsmith/bk/51
```
2bffa055

Merge maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my50-bfx · d99f2b88

unknown authored Sep 07, 2006

into  maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my51-bfx


sql/mysqld.cc:
  SCCS merged
sql/stacktrace.c:
  Manual merge (use local)
sql/stacktrace.h:
  !
  Manual merge (use local)

d99f2b88

Merge maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my41-bfx · bd8309cc

unknown authored Sep 07, 2006

into  maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my50-bfx


sql/mysqld.cc:
  Manual merge
sql/stacktrace.c:
  Manual merge; undo trivial change to avoid automerge.
sql/stacktrace.h:
  Manual merge; undo trivial change which avoided automerge

bd8309cc

Force conflict to avoid bk automerge behavior; will be undone during merge. · 47728f16
unknown authored Sep 07, 2006

47728f16
Merge bk-internal:/home/bk/mysql-5.1-new-maint · 5f541162
unknown authored Sep 06, 2006
```
into  rama.(none):/home/jimw/my/mysql-5.1-clean
```
5f541162

Bug #21054: myisam_stats_method ignored in my.cnf and cmdline · 7a77b3d8

unknown authored Sep 07, 2006

Fix OPT_MYISAM_STATS_METHOD case, where the NULLS_EQUAL and NULLS_NOT_EQUAL methods were mixed up


sql/mysqld.cc:
  Fix OPT_MYISAM_STATS_METHOD case, bug #21054

7a77b3d8

Bug #21250: esolve stack traces on AMD64 (backport to mysql-4.1) · ada41e24

unknown authored Sep 07, 2006


sql/stacktrace.c:
  stacktrace dumps for amd64 (backport fix for bug 21250 to mysql-4.1)
sql/stacktrace.h:
  stacktrace dumps for amd64 (backport fix for bug 21250 to mysql-4.1)

ada41e24

Fix build problem for when not compiled with debugging. · daa1d028

unknown authored Sep 06, 2006


dbug/dbug.c:
  Don't try to force DBUG on.
  
  Conditionally compile this file, as the headers we load may change the 
  value of DBUG_OFF /after/ we set it.

daa1d028

Merge rama.(none):/home/jimw/my/mysql-5.1-19874 · 0f20c8a4
unknown authored Sep 06, 2006
```
into  rama.(none):/home/jimw/my/mysql-5.1-clean


sql/sql_parse.cc:
  Auto merged
```
0f20c8a4
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 4b852686
unknown authored Sep 06, 2006
```
into  salvation.intern.azundris.com:/home/tnurnberg/21913/my51-21913
```
4b852686

Fix merge problems; work around disparate "ls" behaviors. · 5e9324a8

unknown authored Sep 06, 2006


mysql-test/r/ctype_recoding.result:
  Case change in 5.1.
mysql-test/t/heap_btree.test:
  Fixes bad merge.
mysql-test/t/partition.test:
  Split terrible "ls" test into two parts so that the different sorting orders
  of sundry OSes don't affect the output.

5e9324a8

mi_test_all.sh needs "./" before the executable names otherwise they · ff825de6

unknown authored Sep 06, 2006

are not found


storage/myisam/mi_test_all.sh:
  need "./" before the executable names otherwise they are not found

ff825de6

Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 325c699e
unknown authored Sep 06, 2006
```
into  gbichot3.local:/home/mysql_src/mysql-5.1-2
```
325c699e

New way to fix BUG#19243 "wrong LAST_INSERT_ID() after ON DUPLICATE KEY UPDATE". · c3cef377

unknown authored Sep 06, 2006

This bug report was two problems:
1) LAST_INSERT_ID() returns a value which does not exist in the table
2) the reporter would want it to return the autoinc id of the updated
row.
1) is a real bug, 2) is a feature request.
In July I implemented 2) in 5.1 (which automatically fixes 1).
This has not yet been documented or released, so is changeable.
Precisely, recently Paul and a user found an easy workaround to give
2), which works in 4.1-5.0-5.1. So I can revert my code for 2),
because it's not needed, that's what I do here;
we forget about 2) (we will document the workaround).
But when I revert my code for 2), 1) comes back. We solve 1) by saying
that if INSERT ON DUPLICATE KEY UPDATE updates a row, it's like a
regular UPDATE: LAST_INSERT_ID() should not be affected (instead of
returning a non-existent value).
So note: no behaviour change compared to the last released 5.1; just
a bugfix for 1).


mysql-test/r/innodb_mysql.result:
  result update
mysql-test/t/innodb_mysql.test:
      test for the new way to fix BUG#19243: that if INSERT ON DUPLICATE
      KEY UPDATE updates a row, SELECT LAST_INSERT_ID() is not affected.
      Test of the workaround for people who want SELECT LAST_INSERT_ID()
      to return the autoinc id of the updated row.
sql/sql_insert.cc:
  No need to change LAST_INSERT_ID() if INSERT ON DUPLICATE KEY UPDATE
  updates a row, there is a workaround to achieve this without changing
  code: just add "autoinc_col=LAST_INSERT_ID(autoinc_col)" to your
  ON DUPLICATE KEY UPDATE clause.
  Prevent LAST_INSERT_ID() to contain an inexistent value in this case:
  if the row is updated it should be like a regular UPDATE: don't
  affect LAST_INSERT_ID() (achieved by marking that we didn't generate
  an id for this row: insert_id_for_cur_row=0).

c3cef377

05 Sep, 2006 16 commits

Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · de678389
unknown authored Sep 06, 2006
```
into  salvation.intern.azundris.com:/home/tnurnberg/21913/my51-21913
```
de678389
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · 716b3e54
unknown authored Sep 05, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
716b3e54
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · 2c1bf1bc
unknown authored Sep 05, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
2c1bf1bc

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · db018233

unknown authored Sep 05, 2006

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


client/mysql.cc:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
vio/viosocket.c:
  Auto merged
mysql-test/r/ctype_recoding.result:
  Manual merge.
mysql-test/t/ctype_recoding.test:
  Manual merge.

db018233

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · 9111f711
unknown authored Sep 05, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
9111f711

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · ebe937cc

unknown authored Sep 05, 2006

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


mysql-test/r/heap_btree.result:
  Auto merged

ebe937cc

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · 4a974740

unknown authored Sep 05, 2006

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


mysql-test/r/heap_btree.result:
  Auto merged
sql/set_var.cc:
  Auto merged
mysql-test/t/heap_btree.test:
  Manually merged.

4a974740

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · a7a605cb

unknown authored Sep 05, 2006

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


BitKeeper/deleted/.del-CMakeLists.txt~1:
  Delete: CMakeLists.txt
BitKeeper/deleted/.del-CMakeLists.txt~2:
  Delete: server-tools/instance-manager/CMakeLists.txt
BitKeeper/deleted/.del-CMakeLists.txt~3:
  Delete: sql/CMakeLists.txt
BitKeeper/deleted/.del-CMakeLists.txt~4:
  Delete: strings/CMakeLists.txt
BitKeeper/deleted/.del-CMakeLists.txt~5:
  Delete: tests/CMakeLists.txt
BitKeeper/deleted/.del-CMakeLists.txt~6:
  Delete: vio/CMakeLists.txt
BitKeeper/deleted/.del-Makefile.am~2:
  Delete: win/Makefile.am
BitKeeper/deleted/.del-README~1:
  Delete: win/README
BitKeeper/deleted/.del-build-vs71.bat:
  Delete: win/build-vs71.bat
BitKeeper/deleted/.del-build-vs8.bat:
  Delete: win/build-vs8.bat
BitKeeper/deleted/.del-configure.js:
  Delete: win/configure.js
BitKeeper/deleted/.del-CMakeLists.txt~7:
  Delete: client/CMakeLists.txt
BitKeeper/deleted/.del-CMakeLists.txt~8:
  Delete: zlib/CMakeLists.txt
BitKeeper/deleted/.del-CMakeLists.txt~9:
  Delete: dbug/CMakeLists.txt
BitKeeper/deleted/.del-CMakeLists.txt~10:
  Delete: extra/CMakeLists.txt
BitKeeper/deleted/.del-CMakeLists.txt~11:
  Delete: extra/yassl/CMakeLists.txt
BitKeeper/deleted/.del-CMakeLists.txt~12:
  Delete: extra/yassl/taocrypt/CMakeLists.txt
BitKeeper/deleted/.del-CMakeLists.txt~13:
  Delete: libmysql/CMakeLists.txt
BitKeeper/deleted/.del-CMakeLists.txt~14:
  Delete: mysys/CMakeLists.txt
BitKeeper/deleted/.del-CMakeLists.txt~15:
  Delete: regex/CMakeLists.txt

a7a605cb

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · 52f5b9dd

unknown authored Sep 05, 2006

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


storage/ndb/tools/ndb_condig.cpp:
  Auto merged

52f5b9dd

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · 721e9417

unknown authored Sep 05, 2006

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


mysql-test/r/ctype_recoding.result:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/t/ctype_recoding.test:
  manual merge.
sql/sql_lex.h:
  manual merge.
sql/sql_table.cc:
  manual merge.

721e9417

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · 2e3e6ef1

unknown authored Sep 05, 2006

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


mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
sql/sql_select.cc:
  Auto merged

2e3e6ef1

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · fc70197a
unknown authored Sep 05, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
fc70197a
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · d79f0300
unknown authored Sep 05, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


client/mysql.cc:
  Manual merge.
```
d79f0300

Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 2af0f2fb

unknown authored Sep 05, 2006

into  salvation.intern.azundris.com:/home/tnurnberg/21913/my51-21913


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

2af0f2fb

Merge salvation.intern.azundris.com:/home/tnurnberg/21913/my50-21913 · cbf19728

unknown authored Sep 05, 2006

into  salvation.intern.azundris.com:/home/tnurnberg/21913/my51-21913


sql/sql_string.cc:
  Auto merged
mysql-test/r/func_time.result:
  manual merge
mysql-test/t/func_time.test:
  manual merge

cbf19728

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · 3d3529f9
unknown authored Sep 05, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
3d3529f9