Commits · 67ca9a5eb66b5ce3ba5fba9db0e448d63befd941 · Kirill Smelkov / mariadb

23 May, 2007 2 commits
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 67ca9a5e
  unknown authored May 23, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


sql/ha_ndbcluster.cc:
  Auto merged
```
  67ca9a5e
- remove some not used code · f0d2042b
  unknown authored May 23, 2007
  
  f0d2042b
22 May, 2007 7 commits

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 2d95236b

unknown authored May 22, 2007

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


storage/ndb/src/common/transporter/Packer.cpp:
  Auto merged
storage/ndb/src/common/transporter/TCP_Transporter.hpp:
  Auto merged
storage/ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNdbApi.cpp:
  manual merge
storage/ndb/test/run-test/daily-basic-tests.txt:
  manual merge

2d95236b

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-ndb · d06875b3
unknown authored May 22, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
d06875b3
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1 · b8dc4b63
unknown authored May 22, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
```
b8dc4b63
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0 · f529d18b
unknown authored May 22, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
f529d18b
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-4.1 · 05464a4f
unknown authored May 22, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
```
05464a4f

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca · b19ae71c

unknown authored May 22, 2007

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/pgman.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
  manual merge

b19ae71c

Bug #28593 cluster backup scans in acc index order, bad for disk data · f77ba282

unknown authored May 22, 2007

- change to scan in tup and disk order (if applicable)


storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  tup scan for backup also, not only lcp
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  choose disk order scan for disktables during backup
  + move bug workaround for 27776 from tup to lqh
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
  add missing jamEntry
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
  move bug workaround for 27776 from tup to lqh
storage/ndb/src/kernel/blocks/pgman.cpp:
  missing jamEntry

f77ba282

21 May, 2007 13 commits

Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 · 1269a52d

unknown authored May 21, 2007

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51


configure.in:
  Auto merged
mysql-test/r/strict.result:
  Auto merged
mysql-test/r/type_datetime.result:
  Auto merged
mysql-test/t/type_datetime.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged

1269a52d

Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/41 · 9a1ab7e6
unknown authored May 21, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
```
9a1ab7e6
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 78332aa9
unknown authored May 21, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
```
78332aa9

Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51 · 9e6117c5

unknown authored May 21, 2007

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51


configure.in:
  Auto merged
mysql-test/r/strict.result:
  Auto merged
mysql-test/r/type_datetime.result:
  Auto merged
mysql-test/t/type_datetime.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged

9e6117c5

Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50 · 221e23ad

unknown authored May 21, 2007

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50


configure.in:
  Auto merged
mysql-test/r/strict.result:
  Auto merged
mysql-test/r/type_datetime.result:
  Auto merged
mysql-test/t/type_datetime.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged

221e23ad

Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/41 · ea263c4a
unknown authored May 21, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/41
```
ea263c4a
Merge trift2.:/MySQL/M51/mysql-5.1 · 3f946fac
unknown authored May 21, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
3f946fac

Prevent the failing "jp" suite from causing havoc in release builds (28563). · 25da4154

unknown authored May 21, 2007


Makefile.am:
  This is *no* fix, it is just to avoid the failure of the "jp" test suite 
  (28563 is the number of the bug) from causing havoc in release builds.

25da4154

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1 · 9004e312

unknown authored May 21, 2007

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


sql/ha_ndbcluster.cc:
  Auto merged

9004e312

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-ndb · 4d8de9e7
unknown authored May 21, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
4d8de9e7
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0 · 66dc33ee
unknown authored May 21, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
66dc33ee
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-4.1 · ae79786e
unknown authored May 21, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
```
ae79786e
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 0879be78
unknown authored May 21, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
```
0879be78

20 May, 2007 1 commit
- Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1 · 2343b95f
  unknown authored May 20, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
```
  2343b95f
19 May, 2007 5 commits

Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 3043367e
unknown authored May 19, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
```
3043367e
Bug#28401 mysql_upgrade Failed with STRICT_ALL_TABLES, ANSI_QUOTES and NO_ZERO_DATE · 0a9d4ca3
unknown authored May 19, 2007
```
 - Upgrade result file for 5.1


mysql-test/r/mysql_upgrade.result:
  Update result for 5.1 - it has more system tables
```
0a9d4ca3
Merge pilot.blaudden:/home/msvensson/mysql/bug28401/my50-bug28401 · f40047df
unknown authored May 19, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
f40047df

Merge pilot.blaudden:/home/msvensson/mysql/bug28401/my50-bug28401 · c626ddb1

unknown authored May 19, 2007

into  pilot.blaudden:/home/msvensson/mysql/bug28401/my51-bug28401


mysql-test/r/mysql_upgrade.result:
  Auto merged
mysql-test/t/mysql_upgrade.test:
  Auto merged
scripts/mysql_system_tables_fix.sql:
  Auto merged

c626ddb1

Bug #28401 mysql_upgrade Failed with STRICT_ALL_TABLES, ANSI_QUOTES and NO_ZERO_DATE · f52f931f

unknown authored May 19, 2007

 - The SQL commands used by mysql_upgrade are written to be run
    with sql_mode set to '' - thus the scripts should change sql_mode
    for the session to make sure the SQL is legal.


mysql-test/r/mysql_upgrade.result:
  Update test result
mysql-test/t/mysql_upgrade.test:
  The SQL commands used by mysql_upgrade are written to be run
  with sql_mode set to '' - thus the scripts should change sql_mode
  for the session to make sure the SQL is legal.
scripts/mysql_system_tables_fix.sql:
  Set sql_mode to '' before running the SQL commands
  to fix system tables - backport from 5.1

f52f931f

18 May, 2007 12 commits

merging · 5d207593
unknown authored May 18, 2007

5d207593

Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt · 7786aca7

unknown authored May 18, 2007

into  mysql.com:/d2/hf/mrg/mysql-5.1-opt


mysql-test/r/ps.result:
  Auto merged
mysql-test/r/strict.result:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/strict.test:
  Auto merged
sql/item.cc:
  Auto merged
mysql-test/r/sp_trans.result:
  merging
mysql-test/t/sp_trans.test:
  merging

7786aca7

Merge bk@192.168.21.1:mysql-5.0-opt · 8b33c415

unknown authored May 18, 2007

into  mysql.com:/d2/hf/mrg/mysql-5.0-opt


mysql-test/r/ps.result:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
sql/item.cc:
  Auto merged

8b33c415

Merge bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 8933c18c

unknown authored May 18, 2007

into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0


mysql-test/r/ps.result:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
sql/item.cc:
  Auto merged

8933c18c

added cleanup to some tests · f7434c4f

unknown authored May 18, 2007


mysql-test/r/sp_trans.result:
  added cleanup
mysql-test/r/strict.result:
  added cleanup
mysql-test/t/sp_trans.test:
  added cleanup
mysql-test/t/strict.test:
  added cleanup

f7434c4f

Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt · d3b45513

unknown authored May 18, 2007

into  mysql.com:/d2/hf/mrg/mysql-5.1-opt


mysql-test/r/ps.result:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
sql/item.cc:
  Auto merged

d3b45513

Merge bk@192.168.21.1:mysql-5.1 · f0abfddf

unknown authored May 18, 2007

into  mysql.com:/d2/hf/mrg/mysql-5.1-opt


mysql-test/include/mix1.inc:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged

f0abfddf

Merge mysql.com:/d2/hf/mrg/mysql-4.1-opt · 5f66ebe8
unknown authored May 18, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
```
5f66ebe8

Merge bk@192.168.21.1:mysql-5.0 · caf045db

unknown authored May 18, 2007

into  mysql.com:/d2/hf/mrg/mysql-5.0-opt


mysql-test/r/ps.result:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
sql/item.cc:
  Auto merged

caf045db

Merge bk@192.168.21.1:mysql-4.1 · 25090a6d
unknown authored May 18, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-4.1-opt
```
25090a6d

Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt · e0d006f3

unknown authored May 18, 2007

into  mysql.com:/d2/hf/mrg/mysql-5.1-opt


mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/include/mix1.inc:
  Auto merged
mysql-test/r/func_group.result:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
mysql-test/t/func_group.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
mysql-test/r/ps.result:
  merging
mysql-test/r/subselect.result:
  merging
mysql-test/r/type_datetime.result:
  SCCS merged
mysql-test/t/ps.test:
  merging
mysql-test/t/subselect.test:
  merging
mysql-test/t/type_datetime.test:
  merging
sql/opt_sum.cc:
  SCCS merged

e0d006f3

Merge bk-internal:/home/bk/mysql-5.1-maint · c9e524d4

unknown authored May 18, 2007

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged

c9e524d4