Commits · f8d6d13781d45ecfe2893d9d2a2ff4564da4eb97 · nexedi / MariaDB

08 Dec, 2005 1 commit

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

Updated sp.result. · 09e75b98
unknown authored Dec 07, 2005
```
mysql-test/r/sp.result:
  Updated result.
```
09e75b98
Post-merge fix of sql/share/errmsg.txt · 6a0bf1d4
unknown authored Dec 07, 2005
```
sql/share/errmsg.txt:
  Post-merge fix.
```
6a0bf1d4

Merge mysql.com:/usr/home/pem/bug14834/mysql-5.0 · 2dbeedd5

unknown authored Dec 07, 2005

into  mysql.com:/usr/home/pem/mysql-5.1-new


BitKeeper/triggers/post-commit:
  Merge.
configure.in:
  Manual merge.
mysql-test/r/sp.result:
  Merge.
mysql-test/r/view.result:
  Merge.
sql/share/errmsg.txt:
  Manual merge.
sql/sp_head.cc:
  Merge.
sql/sql_parse.cc:
  Merge.
sql/sql_table.cc:
  Merge.
sql/sql_yacc.yy:
  Merge.

2dbeedd5

Merge pmartin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 20f59cd2

unknown authored Dec 07, 2005

into  mysql.com:/usr/home/pem/mysql-5.1-new


mysql-test/t/disabled.def:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged

20f59cd2

Fixed compile error in sql_acl.cc. · 920c1a35
unknown authored Dec 07, 2005
```
sql/sql_acl.cc:
  Fixed compile error.
```
920c1a35
Merge bk-internal:/home/bk/mysql-5.0 · 9c8773f5
unknown authored Dec 07, 2005
```
into  mysql.com:/data0/mysqldev/my/mysql-5.0
```
9c8773f5
Bump version number following 5.0.17 release clone-off · c4b8823f
unknown authored Dec 07, 2005
```
configure.in:
  Bump version number following release clone-off
```
c4b8823f
Merge lgrimmer@bk-internal:/home/bk/mysql-5.0 · 6ccd6c0f
unknown authored Dec 07, 2005
```
into  mysql.com:/space/my/mysql-5.0
```
6ccd6c0f

Merge lgrimmer@bk-internal:/home/bk/mysql-5.1-new · 24239406

unknown authored Dec 07, 2005

into  mysql.com:/space/my/mysql-5.1


mysql-test/t/disabled.def:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged

24239406

Merge mysql.com:/space/my/mysql-5.0-merg · 9adfccfb
unknown authored Dec 07, 2005
```
into  mysql.com:/space/my/mysql-5.0
```
9adfccfb

Merge mysql.com:/space/my/mysql-5.0 · 509ceca6

unknown authored Dec 07, 2005

into  mysql.com:/space/my/mysql-5.1


mysql-test/t/disabled.def:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged

509ceca6

Merge pmartin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 6f4fb143

unknown authored Dec 07, 2005

into  mysql.com:/usr/home/pem/mysql-5.1-new


mysql-test/t/disabled.def:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged

6f4fb143

Merge mysql.com:/space/my/mysql-4.1 · 2c2cbdb7

unknown authored Dec 07, 2005

into  mysql.com:/space/my/mysql-5.0-merg


BitKeeper/triggers/post-commit:
  Auto merged

2c2cbdb7

Merge mysql.com:/home/timka/mysql/src/5.0-2486 · f1ac6bb9

unknown authored Dec 07, 2005

into  mysql.com:/home/timka/mysql/src/5.1-dbg


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_acl.h:
  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_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged
sql/sql_base.cc:
  SCCS merged
sql/table.cc:
  SCCS merged

f1ac6bb9

merged · 6cf8483d

unknown authored Dec 07, 2005


mysql-test/t/sp.test:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

6cf8483d

Merge mysql.com:/home/timka/mysql/src/5.0-virgin · f095abaa
unknown authored Dec 07, 2005
```
into  mysql.com:/home/timka/mysql/src/5.0-2486
```
f095abaa

Merge mysql.com:/space/my/mysql-4.0 · 59e4781b

unknown authored Dec 07, 2005

into  mysql.com:/space/my/mysql-4.1


BitKeeper/triggers/post-commit:
  Auto merged

59e4781b

Fix innodb result file (merge clean-up) · fd2beeda

unknown authored Dec 06, 2005


BitKeeper/etc/ignore:
  added client/mysqlslap
mysql-test/r/innodb.result:
  Update results

fd2beeda

Merge mysql.com:/home/jimw/my/mysql-5.0-clean · 1365856e

unknown authored Dec 06, 2005

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


mysql-test/r/sp.result:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/innobase/btr/btr0sea.c:
  Auto merged
storage/innobase/dict/dict0dict.c:
  Auto merged
storage/innobase/dict/dict0load.c:
  Auto merged
storage/innobase/include/buf0buf.h:
  Auto merged
storage/innobase/include/dict0dict.h:
  Auto merged
storage/innobase/include/dict0load.h:
  Auto merged
storage/innobase/include/rem0cmp.h:
  Auto merged
storage/innobase/rem/rem0cmp.c:
  Auto merged
storage/innobase/row/row0mysql.c:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
mysql-test/r/innodb.result:
  Resolve conflicts
sql/share/errmsg.txt:
  Resolve conflict

1365856e

Fix innodb.result file (was missing a line) · 43dd386d
unknown authored Dec 06, 2005
```
mysql-test/r/innodb.result:
  Update result file
```
43dd386d
Merge bk-internal:/home/bk/mysql-5.0 · 4b9a7c7c
unknown authored Dec 06, 2005
```
into  mysql.com:/home/jimw/my/mysql-5.0-clean
```
4b9a7c7c

06 Dec, 2005 18 commits

Merge mysql.com:/home/jimw/my/mysql-5.0-14299 · bf802ab7

unknown authored Dec 06, 2005

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


sql/field.cc:
  Auto merged
mysql-test/r/type_binary.result:
  Resolve conflicts
mysql-test/t/type_binary.test:
  Resolve conflicts

bf802ab7

A fix and a test case for Bug#15392 "Server crashes during · 8c2d8ac7

unknown authored Dec 07, 2005

 prepared statement execute


mysql-test/r/sp.result:
  Test results fixed: a fix for Bug#15392
mysql-test/t/sp.test:
  A test case for Bug#15392 "Server crashes during prepared
  statement execute". No test case for error in
  Item_func_set_user_var::update as the only possible one is OOM.
sql/sp_head.cc:
  A fix for Bug#15392 "Server crashes during prepared statement
  execute": the bug was caused by mysql_change_db() call
  which was overwriting the error state of 'ret'.
  Later in the code, suv->fix_fields() would discover
  thd->net.report_error and return it without completing
  its work. As the return value of fix_fields() was ignored,
  the server would afterwards crash in suv->update().
  The fix makes sure that a possible internal error
  is raised in reset_lex_and_exec_core and then is
  handled in sp_head::execute_procedure.

8c2d8ac7

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · c34e0817
unknown authored Dec 06, 2005
```
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
```
c34e0817
Merge bk-internal:/home/bk/mysql-5.1-new · 440da8a7
unknown authored Dec 06, 2005
```
into  mysql.com:/home/jimw/my/mysql-5.1-clean
```
440da8a7
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 3d1e9eae
unknown authored Dec 06, 2005
```
into  mysql.com:/home/alexi/innodb-ss/mysql-5.0-ss52
```
3d1e9eae

mysqld.cc: · 0a3da3b0

unknown authored Dec 06, 2005

  Put options in order.
set_var.cc:
  Put system variables back in order.


sql/set_var.cc:
  Put system variables back in order.
sql/mysqld.cc:
  Put options in order.

0a3da3b0

Fix BUG#14747: "Race condition can cause btr_search_drop_page_hash_index() · b83c2976

unknown authored Dec 06, 2005

 to crash".
 Changes from snapshot innodb-5.0-ss52.
 Note that buf_block_t::index should be protected by btr_search_latch
 or an s-latch or x-latch on the index page.
 btr_search_drop_page_hash_index(): Read block->index while holding
 btr_search_latch and use the cached value in the loop. Remove some
 redundant assertions.
 Also fix 13778. When FOREIGN_KEY_CHECKS=0 we still need to check that
 datatypes between foreign key references are compatible.
 Also added test cases to 9802.


innobase/btr/btr0sea.c:
  Changes from innodb-5.0-ss52
innobase/dict/dict0dict.c:
  Changes from innodb-5.0-ss52
innobase/dict/dict0load.c:
  Changes from innodb-5.0-ss52
innobase/include/buf0buf.h:
  Changes from innodb-5.0-ss52
innobase/include/dict0dict.h:
  Changes from innodb-5.0-ss52
innobase/include/dict0load.h:
  Changes from innodb-5.0-ss52
innobase/include/rem0cmp.h:
  Changes from innodb-5.0-ss52
innobase/rem/rem0cmp.c:
  Changes from innodb-5.0-ss52
innobase/row/row0mysql.c:
  Changes from innodb-5.0-ss52
mysql-test/r/innodb.result:
  Changes from innodb-5.0-ss52
mysql-test/t/innodb.test:
  Changes from innodb-5.0-ss52
sql/ha_innodb.cc:
  Changes from innodb-5.0-ss52
sql/ha_innodb.h:
  Changes from innodb-5.0-ss52

b83c2976

Merge mysql.com:/home/jimw/my/mysql-5.1-bdb · 2cbf400b
unknown authored Dec 06, 2005
```
into  mysql.com:/home/jimw/my/mysql-5.1-clean
```
2cbf400b
Update BDB project file for Windows build · 39361ade
unknown authored Dec 06, 2005
```
VC++Files/storage/bdb/bdb.vcproj:
  Update BDB project file
```
39361ade

Merge · 6b5b3f3a

unknown authored Dec 06, 2005


mysql-test/r/sp-error.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/share/errmsg.txt:
  SCCS merged

6b5b3f3a

Fix 'make dist' with new bundled BDB · 2c6d7500
unknown authored Dec 06, 2005
```
storage/bdb/Makefile.in:
  Trim list of BDB directories
```
2c6d7500

Merge mysql.com:/usr/home/pem/bug14233/mysql-5.0 · 2097b7f4

unknown authored Dec 06, 2005

into  mysql.com:/usr/home/pem/mysql-5.1-new


mysql-test/t/disabled.def:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
sql/share/errmsg.txt:
  Manual merge.

2097b7f4

Merge mysql.com:/home/timka/mysql/src/5.0-virgin · 1a7a8067

unknown authored Dec 06, 2005

into  mysql.com:/home/timka/mysql/src/5.0-2486


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged

1a7a8067

Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 7d01da59
unknown authored Dec 06, 2005
```
into  production.mysql.com:/usersnfs/istruewing/autopush/mysql-5.1-new
```
7d01da59
Final review fix of #14233: Crash after tampering with the mysql.proc table. · 29eac312
unknown authored Dec 06, 2005
```
Changed variable type and added comment in sp.c.


sql/sp.cc:
  Changed variable type and added comment. (Review fix)
```
29eac312
- commit emails are now sent to commits@lists.mysql.com instead of · 835acc86
unknown authored Dec 06, 2005
```
   internals@lists.mysql.com to reduce the noise on the internals list.
```
835acc86

Merge mysql.com:/usr/local/bk/mysql-5.0 · 47fe4475

unknown authored Dec 06, 2005

into  mysql.com:/usr/home/pem/bug14233/mysql-5.0


mysql-test/r/sp-error.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_trigger.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/share/errmsg.txt:
  SCCS merged

47fe4475

cp1250.xml: · ac36a084

unknown authored Dec 06, 2005

Index.xml:
  Adding Polish collation for cp1250.


sql/share/charsets/Index.xml:
  Adding Polish collation for cp1250.
  ,
sql/share/charsets/cp1250.xml:
  Adding Polish collation for cp1250.

ac36a084