Commits · 60d102711bf9a127742930b664315fe68c300809 · nexedi / MariaDB

28 Mar, 2008 13 commits

Merge witty.:/Users/mattiasj/clones/bug21413-51-engines · 60d10271
unknown authored Mar 28, 2008
```
into  witty.:/Users/mattiasj/clones/bug21413-51-bugteam
```
60d10271
Merge witty.:/Users/mattiasj/clones/bug21413-50-engines · ad64909c
unknown authored Mar 28, 2008
```
into  witty.:/Users/mattiasj/clones/bug21413-51-engines


sql/sql_insert.cc:
  Auto merged
```
ad64909c
Merge witty.:/Users/mattiasj/Public/shared-vms/bug21413-41-engines · 5e7d2481
unknown authored Mar 28, 2008
```
into  witty.:/Users/mattiasj/clones/bug21413-50-engines


sql/sql_insert.cc:
  Manual merge
```
5e7d2481

Bug#21413 - Engine table handler used by multiple threads · 97b3c330

unknown authored Mar 28, 2008

            in REPLACE DELAYED
    
post push patch, removing the optimization for
copying delayed_insert variables.


sql/sql_insert.cc:
  Bug#21413 - Engine table handler used by multiple threads
              in REPLACE DELAYED
  
  post push patch, removing the optimization for
  copying delayed_insert variables.
  (restored some parts which caused errors)

97b3c330

Merge magare.gmz:/home/kgeorge/mysql/work/merge-5.0-bugteam · 4e6f0e2e
unknown authored Mar 28, 2008
```
into  magare.gmz:/home/kgeorge/mysql/work/merge-5.1-bugteam


sql/sql_acl.cc:
  Auto merged
```
4e6f0e2e

Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1 · ffe4016b

unknown authored Mar 28, 2008

into  magare.gmz:/home/kgeorge/mysql/work/merge-5.1-bugteam


sql/sql_acl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

ffe4016b

Merge bk-internal:/home/bk/mysql-5.0 · 04735c04

unknown authored Mar 28, 2008

into  magare.gmz:/home/kgeorge/mysql/work/merge-5.0-bugteam


sql/sql_acl.cc:
  Auto merged

04735c04

Merge magare.gmz:/home/kgeorge/mysql/work/merge-5.0-bugteam · 8400d442
unknown authored Mar 28, 2008
```
into  magare.gmz:/home/kgeorge/mysql/work/merge-5.1-bugteam
```
8400d442

Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1 · 9db1668d

unknown authored Mar 28, 2008

into  magare.gmz:/home/kgeorge/mysql/work/merge-5.1-bugteam


mysql-test/r/grant.result:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_connect.cc:
  Auto merged

9db1668d

Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam · 0619a0a5
unknown authored Mar 28, 2008
```
into  magare.gmz:/home/kgeorge/mysql/work/merge-5.1-bugteam
```
0619a0a5
Merge bk-internal:/home/bk/mysql-5.0 · 1a512292
unknown authored Mar 28, 2008
```
into  magare.gmz:/home/kgeorge/mysql/work/merge-5.0-bugteam
```
1a512292

Merge magare.gmz:/home/kgeorge/mysql/work/merge-5.0-bugteam · 043d0714

unknown authored Mar 28, 2008

into  magare.gmz:/home/kgeorge/mysql/work/merge-5.1-bugteam


mysql-test/t/grant.test:
  Auto merged
sql/sql_acl.cc:
  Auto merged
mysql-test/r/grant.result:
  merge 5.0-bugteam to 5.1-bugteam

043d0714

Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam · 235117d5
unknown authored Mar 28, 2008
```
into  magare.gmz:/home/kgeorge/mysql/autopush/B35206-5.1-bugteam


sql/sql_select.cc:
  Auto merged
```
235117d5

27 Mar, 2008 27 commits

Merge mysql.com:/misc/mysql/mysql-5.0-opt · b04e344a

unknown authored Mar 28, 2008

into  mysql.com:/misc/mysql/mysql-5.1-opt


CMakeLists.txt:
  Auto merged
configure.in:
  Auto merged
include/config-win.h:
  Auto merged
include/my_global.h:
  Auto merged

b04e344a

Merge mysql.com:/misc/mysql/mysql-5.0 · f723dec4

unknown authored Mar 27, 2008

into  mysql.com:/misc/mysql/mysql-5.0-opt


CMakeLists.txt:
  Auto merged
configure.in:
  Auto merged
include/config-win.h:
  Auto merged
include/my_global.h:
  Auto merged

f723dec4

Merge mysql.com:/misc/mysql/mysql-5.1 · 938e0817

unknown authored Mar 27, 2008

into  mysql.com:/misc/mysql/mysql-5.1-opt


CMakeLists.txt:
  Auto merged
configure.in:
  Auto merged
include/config-win.h:
  Auto merged
include/my_global.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_db.cc:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged

938e0817

Bug #35206: select query result different if the key is indexed or not · 82242b93

unknown authored Mar 27, 2008

The code for executing indexed ORDER BY was not setting all the 
internal fields correctly when selecting to execute ORDER BY over
and index.
Fixed by change the access method to one that will use the 
quick indexed access if one is selected while selecting indexed
ORDER BY.


mysql-test/r/order_by.result:
  Bug #35206: test case
mysql-test/t/order_by.test:
  Bug #35206: test case
sql/sql_select.cc:
  Bug #35206: Change the access method when selecting a 
  quick indexed access.

82242b93

Bug#35272: @@global.key_buffer_size = 4294967295 let the server crash · df93bab5

unknown authored Mar 27, 2008

reverting test that has been obsoleted by changes to the code


mysql-test/r/key_cache.result:
  reverting test that has been obsoleted by changes to the code
mysql-test/t/key_cache.test:
  reverting test that has been obsoleted by changes to the code

df93bab5

Merge host.loc:/home/uchum/work/5.0-opt · 50f2f20c

unknown authored Mar 27, 2008

into  host.loc:/home/uchum/work/5.1-opt


configure.in:
  Auto merged
sql/item.cc:
  Auto merged

50f2f20c

Merge host.loc:/home/uchum/work/mysql-5.0 · abd0aeb8

unknown authored Mar 27, 2008

into  host.loc:/home/uchum/work/5.0-opt


configure.in:
  Auto merged
sql/item.cc:
  Auto merged

abd0aeb8

Merge witty.:/Users/mattiasj/clones/bug21413-50-engines · 37562f7f
unknown authored Mar 27, 2008
```
into  witty.:/Users/mattiasj/clones/bug21413-51-engines


sql/sql_insert.cc:
  manual merge
```
37562f7f
Merge witty.:/Users/mattiasj/Public/shared-vms/bug21413-41-engines · 09edf843
unknown authored Mar 27, 2008
```
into  witty.:/Users/mattiasj/clones/bug21413-50-engines


sql/sql_insert.cc:
  Manual merge
```
09edf843

Patch clean up. · d71bd5fa

unknown authored Mar 27, 2008

Fixed interference between tests: Users were added but not properly removed.
This caused later tests to fail.


mysql-test/r/grant.result:
  Fixed interference between tests: Users were added but not properly removed.
  This caused later tests to fail.
mysql-test/t/grant.test:
  Fixed interference between tests: Users were added but not properly removed.
  This caused later tests to fail.

d71bd5fa

Merge trift2.:/MySQL/M50/push-5.0 · f1af4839
unknown authored Mar 27, 2008
```
into  trift2.:/MySQL/M51/push-5.1
```
f1af4839
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build · a02f8c67
unknown authored Mar 27, 2008
```
into  trift2.:/MySQL/M51/push-5.1
```
a02f8c67
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0-build · afc05e63
unknown authored Mar 27, 2008
```
into  trift2.:/MySQL/M50/push-5.0
```
afc05e63
Merge trift2.:/MySQL/M51/ndb-decl-5.1 · 2e79d50b
unknown authored Mar 27, 2008
```
into  trift2.:/MySQL/M51/push-5.1
```
2e79d50b
Merge mysql.com:/Users/davi/mysql/mysql-5.1-bug33201 · d455ee29
unknown authored Mar 27, 2008
```
into  mysql.com:/Users/davi/mysql/mysql-5.0-bugteam


sql/sql_acl.cc:
  Auto merged
```
d455ee29

Merge host.loc:/home/uchum/work/5.0-opt · 764e03ee

unknown authored Mar 27, 2008

into  host.loc:/home/uchum/work/5.1-opt


sql/sql_delete.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
configure.in:
  SCCS merged

764e03ee

Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · 948da163

unknown authored Mar 27, 2008

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build


BitKeeper/deleted/.del-configure.js:
  Auto merged

948da163

BUG#25340 · b68bddae
unknown authored Mar 27, 2008

b68bddae
Merge host.loc:/home/uchum/work/4.1-opt · 9f8619d7
unknown authored Mar 27, 2008
```
into  host.loc:/home/uchum/work/5.0-opt


configure.in:
  Merge with 4.1-opt.
```
9f8619d7

Merge host.loc:/home/uchum/work/mysql-5.1 · 494b6f86

unknown authored Mar 27, 2008

into  host.loc:/home/uchum/work/5.1-opt


client/mysqltest.c:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged

494b6f86

Merge trift2.:/MySQL/M50/push-5.0 · 3890079a
unknown authored Mar 27, 2008
```
into  trift2.:/MySQL/M51/push-5.1


configure.in:
  Auto merged
```
3890079a

Merge host.loc:/home/uchum/work/mysql-5.0 · 15b8b221

unknown authored Mar 27, 2008

into  host.loc:/home/uchum/work/5.0-opt


sql/sql_delete.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged

15b8b221

Merge trift2.:/MySQL/M51/mysql-5.1 · 216abda6

unknown authored Mar 27, 2008

into  trift2.:/MySQL/M51/push-5.1


configure.in:
  Auto merged
mysql-test/r/federated.result:
  Auto merged
mysql-test/t/federated.test:
  Auto merged

216abda6

Merge trift2.:/MySQL/M50/mysql-5.0 · 774bd919
unknown authored Mar 27, 2008
```
into  trift2.:/MySQL/M50/push-5.0


configure.in:
  Auto merged
```
774bd919
Merge rhel5-ia64-a.mysql.com:/data0/tsmith/build/50 · 6af7b853
unknown authored Mar 27, 2008
```
into  rhel5-ia64-a.mysql.com:/data0/tsmith/build/51
```
6af7b853
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0 · 288394f5
unknown authored Mar 27, 2008
```
into  rhel5-ia64-a.mysql.com:/data0/tsmith/build/50
```
288394f5
Merge rhel5-ia64-a.mysql.com:/data0/tsmith/51 · d08e8faf
unknown authored Mar 27, 2008
```
into  rhel5-ia64-a.mysql.com:/data0/tsmith/build/51
```
d08e8faf