Skip to content

M
mariadb
Switch branch/tag
  1. 07 Sep, 2006 2 commits
  3. 06 Sep, 2006 14 commits
    • unknown's avatar
      Merge maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my51-bfx · 2bffa055
      unknown authored 
      into  maint1.mysql.com:/data/localhome/tsmith/bk/51
      2bffa055
    • unknown's avatar
      Merge maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my50-bfx · d99f2b88
      unknown authored 
      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
    • unknown's avatar
      Merge maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my41-bfx · bd8309cc
      unknown authored 
      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
    • unknown's avatar
      Force conflict to avoid bk automerge behavior; will be undone during merge. · 47728f16
      unknown authored
      47728f16
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-new-maint · 5f541162
      unknown authored 
      into  rama.(none):/home/jimw/my/mysql-5.1-clean
      5f541162
    • unknown's avatar
      Bug #21054: myisam_stats_method ignored in my.cnf and cmdline · 7a77b3d8
      unknown authored 
      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
    • unknown's avatar
      Bug #21250: esolve stack traces on AMD64 (backport to mysql-4.1) · ada41e24
      unknown authored 
      
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
    • unknown's avatar
      Fix build problem for when not compiled with debugging. · daa1d028
      unknown authored 
      
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
    • unknown's avatar
      Merge rama.(none):/home/jimw/my/mysql-5.1-19874 · 0f20c8a4
      unknown authored 
      into  rama.(none):/home/jimw/my/mysql-5.1-clean


sql/sql_parse.cc:
  Auto merged
      0f20c8a4
    • unknown's avatar
      Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 4b852686
      unknown authored 
      into  salvation.intern.azundris.com:/home/tnurnberg/21913/my51-21913
      4b852686
    • unknown's avatar
      Fix merge problems; work around disparate "ls" behaviors. · 5e9324a8
      unknown authored 
      
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
    • unknown's avatar
      mi_test_all.sh needs "./" before the executable names otherwise they · ff825de6
      unknown authored 
      are not found


storage/myisam/mi_test_all.sh:
  need "./" before the executable names otherwise they are not found
      ff825de6
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 325c699e
      unknown authored 
      into  gbichot3.local:/home/mysql_src/mysql-5.1-2
      325c699e
    • unknown's avatar
      New way to fix BUG#19243 "wrong LAST_INSERT_ID() after ON DUPLICATE KEY UPDATE". · c3cef377
      unknown authored 
      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
  5. 05 Sep, 2006 24 commits
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7