Commits · ad01aed8272eec7dff1e427ebe5c5b69dcd3c7e2 · nexedi / MariaDB

13 Dec, 2005 2 commits

Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0 · ad01aed8

unknown authored Dec 13, 2005

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new


storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp:
  Auto merged
storage/ndb/include/ndb_version.h.in:
  Auto merged
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  merge

ad01aed8

Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1 · 01c7bd20

unknown authored Dec 13, 2005

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
ndb/src/kernel/blocks/ERROR_codes.txt:
  merge
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  merge
ndb/test/run-test/daily-basic-tests.txt:
  merge

01c7bd20

12 Dec, 2005 22 commits

Fix sp.result after merge · 3cb80d32
unknown authored Dec 12, 2005
```
mysql-test/r/sp.result:
  Update results (t3 does exist here)
```
3cb80d32

Merge mysql.com:/home/jimw/my/mysql-5.0-clean · 6a53fec5

unknown authored Dec 12, 2005

into  mysql.com:/home/jimw/my/mysql-5.1-clean


mysql-test/r/sp.result:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/sql_base.cc:
  Resolve conflict

6a53fec5

Merge bk-internal:/home/bk/mysql-5.0 · 50bcb962
unknown authored Dec 12, 2005
```
into  mysql.com:/home/jimw/my/mysql-5.0-clean
```
50bcb962

Merge snake-hub.snake.net:/tmp/mysql-5.0 · 485a5f69

unknown authored Dec 12, 2005

into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1


client/mysqltest.c:
  Auto merged

485a5f69

mysqltest.c: · a4708948

unknown authored Dec 12, 2005

  Put options in proper order.


client/mysqltest.c:
  Put options in proper order.

a4708948

Merge mysql.com:/home/jimw/my/mysql-4.1-clean · d6e5fdf0

unknown authored Dec 12, 2005

into  mysql.com:/home/jimw/my/mysql-5.0-clean


mysql-test/r/bdb.result:
  Resolve conflicts
mysql-test/t/bdb.test:
  Resolve conflicts
sql/sql_delete.cc:
  Resolve conflicts
sql/sql_insert.cc:
  Resolve conflicts
sql/sql_update.cc:
  Resolve conflicts

d6e5fdf0

Merge mysql.com:/M50/mysql-5.0 into mysql.com:/M50/bug12429 · edf3915a
unknown authored Dec 12, 2005

edf3915a
Merge mysql.com:/M50/bug12429 into mysql.com:/M51/merge-5.1 · 16d4b1d8
unknown authored Dec 12, 2005

16d4b1d8

rpl_until.test + rpl_until.result Fix (completion) for bug#12429 · cc3f2163

unknown authored Dec 12, 2005

Manual merge from 4.1,
extension of the old fix (1.1976 05/12/05 17:57:48 mleich@mysql.com) to two other places.


mysql-test/t/rpl_until.test:
  Auto merged
mysql-test/r/rpl_until.result:
  Manual merge from 4.1,
  extension of the old fix (1.1976 05/12/05 17:57:48 mleich@mysql.com) to two other places.

cc3f2163

rpl_until.test + rpl_until.result · 56830072

unknown authored Dec 12, 2005

Fix for bug#12429: Replication tests fail: "Slave_IO_Running" differs:
The value is not important, and it depends on timing. Mask it.

Backport and extension of a fix made by Matthias in 5.0, originally it was
1.1976 05/12/05 17:57:48 mleich@mysql.com


mysql-test/r/rpl_until.result:
  Fix for bug#12429: Replication tests fail: "Slave_IO_Running" differs:
  The value is not important, and it depends on timing. Mask it.
  
  Backport and extension of a fix made by Matthias in 5.0, originally it was
  1.1976 05/12/05 17:57:48 mleich@mysql.com
mysql-test/t/rpl_until.test:
  Fix for bug#12429: Replication tests fail: "Slave_IO_Running" differs:
  The value is not important, and it depends on timing. Mask it.
  
  Backport and extension of a fix made by Matthias in 5.0, originally it was
  1.1976 05/12/05 17:57:48 mleich@mysql.com

56830072

ndb - bug#15685 · fd80fa2d

unknown authored Dec 12, 2005

  Error in abort handling in TC when timeout during abort
  


ndb/src/kernel/blocks/ERROR_codes.txt:
  New error codes
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  New error codes
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Dont release transaction record to early
ndb/test/ndbapi/testNodeRestart.cpp:
  Test case
ndb/test/run-test/daily-basic-tests.txt:
  Test case

fd80fa2d

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new · d4afe0f1
unknown authored Dec 12, 2005
```
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
```
d4afe0f1

Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 · fb0d4c3b

unknown authored Dec 12, 2005

into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new


mysql-test/t/symlink.test:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
sql/mysqld.cc:
  Auto merged

fb0d4c3b

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new · ca7b228d
unknown authored Dec 12, 2005
```
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new


sql/sp_head.cc:
  Auto merged
```
ca7b228d
Merge bk-internal:/home/bk/mysql-5.1-new · 54ad687e
unknown authored Dec 12, 2005
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
```
54ad687e
Merge bk-internal:/home/bk/mysql-5.1-new · 6a460be7
unknown authored Dec 12, 2005
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
```
6a460be7
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 · e6145a7d
unknown authored Dec 12, 2005
```
into  neptunus.(none):/home/msvensson/mysql/bug9535/my51-bug9535
```
e6145a7d

Merge mysql.com:/home/dlenev/src/mysql-5.0-merges · 346694bd

unknown authored Dec 12, 2005

into  mysql.com:/home/dlenev/src/mysql-5.1-merges


mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged

346694bd

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 031ec5d2

unknown authored Dec 12, 2005

into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new


mysql-test/r/sp.result:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_class.h:
  Auto merged

031ec5d2

Merge WL#2984 · e8edf40f

unknown authored Dec 12, 2005


mysql-test/r/sp-vars.result:
  Merge
mysql-test/r/sp.result:
  Merge
mysql-test/r/type_newdecimal-big.result:
  Merge
mysql-test/t/type_newdecimal-big.test:
  Merge
sql/sp_head.cc:
  Merge
sql/sql_select.cc:
  Merge

e8edf40f

Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 95cabee1
unknown authored Dec 12, 2005
```
into  mysql.com:/home/alexi/dev/mysql-5.0-14614
```
95cabee1

item_sum.h, item.cc: · 04d5378c

unknown authored Dec 11, 2005

  Post review corrections in comments.


sql/item.cc:
  Post review corrections in comments.
sql/item_sum.h:
  Post review corrections in comments.

04d5378c

11 Dec, 2005 3 commits

Fixed BUG #14614: Replication of tables with trigger generates · a26e2c20

unknown authored Dec 11, 2005

 error message if database is changed.


mysql-test/r/rpl_trigger.result:
  Fixed results for the added test cases
mysql-test/t/rpl_trigger.test:
  Added test cases for bug #14614
sql/sql_db.cc:
  Fixed bug #14614.
   Modified mysql_change_db(): The memory where db name resides
   is freed by a slave thread.

a26e2c20

make_win_src_distribution.sh: · ff410f95

unknown authored Dec 11, 2005

  Removed Visual Studio 6 project files, as they are not maintained


scripts/make_win_src_distribution.sh:
  Removed Visual Studio 6 project files, as they are not maintained

ff410f95

Merge rurik.mysql.com:/home/igor/mysql-5.0 · 53f8fed4

unknown authored Dec 10, 2005

into  rurik.mysql.com:/home/igor/dev/mysql-5.0-2


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

53f8fed4

09 Dec, 2005 3 commits

bug#15632 - ndb · 5b10b7bc

unknown authored Dec 09, 2005

  Fix race between INCL_NODEREQ(prio b) and GCP_PREPARE(prio a) by also waiting for starting nodes


ndb/include/ndb_version.h.in:
  Handle upgrade of bug fix
ndb/src/kernel/blocks/ERROR_codes.txt:
  New error code for delaying INCL_NODE_REQ
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Fix race between INCL_NODEREQ(prio b) and GCP_PREPARE(prio a)
    by also waiting for starting nodes
ndb/test/ndbapi/testNodeRestart.cpp:
  Add testcase for bug#15632

5b10b7bc

Merge mysql.com:/home/alik/MySQL/devel/5.0-wl2984 · 16bca982

unknown authored Dec 09, 2005

into  mysql.com:/home/alik/MySQL/devel/5.1-wl2984-merge


mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
BitKeeper/deleted/.del-type_newdecimal-big.result:
  Auto merged
BitKeeper/deleted/.del-type_newdecimal-big.test:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
sql/field.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/field.cc:
  Merge.
sql/sp_head.cc:
  Merge.
sql/sql_select.cc:
  Merge.

16bca982

Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0 · f81ed05c
unknown authored Dec 09, 2005
```
into  devsrv-b.mysql.com:/space/magnus/my50-bug9535
```
f81ed05c

08 Dec, 2005 7 commits

A fix and a test case for Bug#15441 "Running SP causes Server · 9c4985de

unknown authored Dec 09, 2005

to Crash": the bug was that due to non-standard name
resolution precedence in stored procedures (See Bug#5967)
a stored procedure variable took precedence over a table column
when the arguments for VALUES() function were resolved.
The implementation of VALUES() function was not designed to work
with Item_splocal and crashed.
VALUES() function is non-standard. It can refer to, and
is meaningful for, table columns only. The patch disables SP 
variables as possible arguments of VALUES() function.


mysql-test/r/sp.result:
  Test results fixed (Bug#15441).
  Also make sure that the recently added test cases follow sp.test
  internal tests standard.
mysql-test/t/sp.test:
  Add a test case for Bug#15441 "Running SP causes Server to Crash".
sql/item.cc:
  Cleanup Item_insert_value::fix_fields().
sql/item.h:
  Add a comment for Item_insert_value.
sql/sql_yacc.yy:
  Actual fix for Bug#15441 "Running SP causes Server to Crash":
  we should not allow VALUES() function to reference SP variables.

9c4985de

Fix calls to free_underlaid_joins() in INSERT, DELETE, and UPDATE · ab597139

unknown authored Dec 08, 2005

handling so that indexes are closed before trying to commit the
transaction. (Bug #15536)


mysql-test/r/bdb.result:
  Add new results
mysql-test/t/bdb.test:
  Add new test
sql/sql_delete.cc:
  Move call to free_underlaid_joins() to before ha_autocommit_or_rollback().
sql/sql_insert.cc:
  Move call to free_underlaid_joins() to before ha_autocommit_or_rollback().
sql/sql_update.cc:
  Move call to free_underlaid_joins() to before ha_autocommit_or_rollback().

ab597139

mysqld.cc: · eea6e15d

unknown authored Dec 08, 2005

  Bug#14960, reverted code to make symdir work on Windows
symlink.test:
  Disabled test case on Windows


mysql-test/t/symlink.test:
  Disabled test case on Windows
sql/mysqld.cc:
  Bug#14960, reverted code to make symdir work on Windows

eea6e15d

bug#15587 - ndb · fc4c198e

unknown authored Dec 08, 2005

  Fix typo in autotest script


ndb/test/run-test/daily-basic-tests.txt:
  Fix typo in autotest script

fc4c198e

bug#15587 - ndb · e5269eed

unknown authored Dec 08, 2005

  Fix error in NF during NR


ndb/include/kernel/signaldata/DumpStateOrd.hpp:
  Add dump for ERROR 5002 with specified table
ndb/src/kernel/blocks/ERROR_codes.txt:
  Add dump for ERROR 5002 with specified table
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Run updateNodeInfo if failed node is not in list of storedReplicas
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Add dump for ERROR 5002 with specified table
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Add dump for ERROR 5002 with specified table
ndb/test/ndbapi/testNodeRestart.cpp:
  Add testcase for bug#15587
ndb/test/run-test/daily-basic-tests.txt:
  Add testcase for bug#15587

e5269eed

Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 2309be62
unknown authored Dec 08, 2005
```
into  mysql.com:/home/alexi/innodb-ss/mysql-5.1-new
```
2309be62

The innodb-5.0-ss52 snapshot changes were erroneously auto-merged · f8d6d137

unknown authored Dec 08, 2005

 to 5.1. Undoing the merge.


mysql-test/r/innodb.result:
  Undoing erroneous auto-merge 5.0 -> 5.1
mysql-test/t/innodb.test:
  Undoing erroneous auto-merge 5.0 -> 5.1
sql/ha_innodb.cc:
  Undoing erroneous auto-merge 5.0 -> 5.1
sql/ha_innodb.h:
  Undoing erroneous auto-merge 5.0 -> 5.1
storage/innobase/btr/btr0sea.c:
  Undoing erroneous auto-merge 5.0 -> 5.1
storage/innobase/dict/dict0dict.c:
  Undoing erroneous auto-merge 5.0 -> 5.1
storage/innobase/dict/dict0load.c:
  Undoing erroneous auto-merge 5.0 -> 5.1
storage/innobase/include/buf0buf.h:
  Undoing erroneous auto-merge 5.0 -> 5.1
storage/innobase/include/dict0dict.h:
  Undoing erroneous auto-merge 5.0 -> 5.1
storage/innobase/include/dict0load.h:
  Undoing erroneous auto-merge 5.0 -> 5.1
storage/innobase/include/rem0cmp.h:
  Undoing erroneous auto-merge 5.0 -> 5.1
storage/innobase/rem/rem0cmp.c:
  Undoing erroneous auto-merge 5.0 -> 5.1
storage/innobase/row/row0mysql.c:
  Undoing erroneous auto-merge 5.0 -> 5.1

f8d6d137

07 Dec, 2005 3 commits
- Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 750671be
  unknown authored Dec 07, 2005
```
into  krsna.patg.net:/home/patg/mysql-build/mysql-5.1-new2
```
  750671be
- Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0 · 871cc84c
  unknown authored Dec 07, 2005
```
into  devsrv-b.mysql.com:/space/magnus/my50-bug9535
```
  871cc84c
- Merge mysql.com:/home/dlenev/src/mysql-5.0-relfix · 4d87cf98
  unknown authored Dec 08, 2005
```
into  mysql.com:/home/dlenev/src/mysql-5.0-merges


sql/sql_parse.cc:
  Auto merged
```
  4d87cf98