Commits · d41bc07359c68780f467278aec2b3f0abea5020e · Kirill Smelkov / mariadb

28 May, 2007 1 commit
- Bug #28653 Fast GCP + high load + high RedoBuffer causes ndbrequire · d41bc073
  unknown authored May 28, 2007
```
- correction, backport to 5.0
```
  d41bc073
24 May, 2007 2 commits
- Bug #28653 Fast GCP + high load + high RedoBuffer causes ndbrequire · 9202b48b
  unknown authored May 24, 2007
```
- correction, use recomputed _actual_ redobuffer
```
  9202b48b
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0 · 98a46edb
  unknown authored May 24, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
  98a46edb
23 May, 2007 4 commits
- Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines · 351abe5a
  unknown authored May 23, 2007
```
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
```
  351abe5a
- Merge mysql.com:/home/svoj/devel/bk/mysql-5.0 · adef6736
  unknown authored May 23, 2007
```
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
```
  adef6736
- Merge mysql.com:/home/svoj/devel/bk/mysql-4.1 · e5b2adea
  unknown authored May 23, 2007
```
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines
```
  e5b2adea
- remove some not used code · f0d2042b
  unknown authored May 23, 2007
  
  f0d2042b
22 May, 2007 3 commits
- 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.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
21 May, 2007 6 commits
- 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 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 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
19 May, 2007 2 commits

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

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

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-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 bk-internal:/home/bk/mysql-5.0-maint · ca633f5f
unknown authored May 18, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
ca633f5f
Merge bk-internal:/home/bk/mysql-4.1-maint · 768eab64
unknown authored May 18, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
```
768eab64

Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · f35dd614

unknown authored May 18, 2007

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/t/mysqltest.test:
  SCCS merged

f35dd614

WL#2247 mysqltest: add option for sorting results · 421d8ca9

unknown authored May 18, 2007

 - Final touchups


client/mysqltest.c:
  Final touch ups, rename sorted_results to sorted_result
mysql-test/r/mysqltest.result:
  Update test result
mysql-test/t/mysqltest.test:
  Update results with additional subtests for empty result set,
  NULL values and 1024 rows

421d8ca9

Merge perch.ndb.mysql.com:/home/jonas/src/41-work · c960adfe
unknown authored May 18, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
```
c960adfe

Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 7514d2f7

unknown authored May 18, 2007

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


ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged

7514d2f7

Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 507ad360
unknown authored May 18, 2007
```
into  moonbone.local:/mnt/gentoo64/work/28261-bug-5.0-opt-mysql
```
507ad360

Merge perch.ndb.mysql.com:/home/jonas/src/41-work · be77fa28

unknown authored May 18, 2007

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


ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged

be77fa28

ndb - bug#28443 · deba58ee

unknown authored May 18, 2007

  review comment 2, atleast 1 signal need for test prg


ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  review comment, atleast 1 signal need

deba58ee

Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 27d82d38

unknown authored May 18, 2007

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


ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged

27d82d38

Merge perch.ndb.mysql.com:/home/jonas/src/41-work · d1625447

unknown authored May 18, 2007

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


ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged

d1625447

Merge perch.ndb.mysql.com:/home/jonas/src/41-work · 692c13ab
unknown authored May 18, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
```
692c13ab

ndb - bug#28443 · a5731933

unknown authored May 18, 2007

  review comment
  if some tcp-transporter has data, then do select with timeout 0


ndb/src/common/transporter/TransporterRegistry.cpp:
  review comment
  if some tcp-transporter has data, then do select with timeout 0

a5731933

Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 7f6742d1

unknown authored May 18, 2007

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


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

7f6742d1

Merge perch.ndb.mysql.com:/home/jonas/src/41-work · b98be8f6
unknown authored May 18, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
```
b98be8f6

Merge perch.ndb.mysql.com:/home/jonas/src/41-work · 051c96f2

unknown authored May 18, 2007

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


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

051c96f2