Commits · 9f8c532f0c7d8472cb809be6f80bb596d38b336b · Kirill Smelkov / mariadb

19 Jun, 2006 1 commit

rpl_log.test, rpl_stm_log.result: · 9f8c532f

unknown authored Jun 19, 2006

  Fixed failing test case
field.cc, item_cmpfunc.cc, select.result:
  After merge fix


mysql-test/r/select.result:
  After merge fix
mysql-test/r/rpl_stm_log.result:
  Fixed failing test case
sql/item_cmpfunc.cc:
  After merge fix
sql/field.cc:
  After merge fix
mysql-test/extra/rpl_tests/rpl_log.test:
  Fixed failing test case

9f8c532f

18 Jun, 2006 1 commit

Manually merged · 610b1a4e

unknown authored Jun 18, 2006


configure.in:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/archive.result:
  Auto merged
mysql-test/r/auto_increment.result:
  Auto merged
mysql-test/r/cast.result:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/func_group.result:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/multi_update.result:
  Auto merged
mysql-test/r/ndb_lock.result:
  Auto merged
mysql-test/r/replace.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/t/archive.test:
  Auto merged
mysql-test/t/auto_increment.test:
  Auto merged
mysql-test/t/delayed.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/multi_update.test:
  Auto merged
mysql-test/t/ndb_lock.test:
  Auto merged
mysql-test/t/select.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.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_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/structs.h:
  Auto merged
storage/archive/ha_archive.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged

610b1a4e

17 Jun, 2006 6 commits

Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 60a9c875
unknown authored Jun 17, 2006
```
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
```
60a9c875

atomic ops: · d1fb2922

unknown authored Jun 17, 2006

    my_atomic_XX_t -> intXX, no implicit locking anymore
    simplified framework, support for requested cleanups


dbug/dbug.c:
  compiler warning
include/atomic/nolock.h:
  my_atomic_XX_t -> intXX
include/atomic/rwlock.h:
  my_atomic_XX_t -> intXX, no implicit locking anymore
include/atomic/x86-gcc.h:
  my_atomic_XX_t -> intXX, no implicit locking anymore
include/atomic/x86-msvc.h:
  my_atomic_XX_t -> intXX
  simplified defines
  support for cleanups
include/my_atomic.h:
  my_atomic_XX_t -> intXX, no implicit locking anymore
  simplified framework, support for requested cleanups
unittest/examples/no_plan-t.c:
  compiler warning
unittest/mysys/Makefile.am:
  fix for dependencies
unittest/mysys/my_atomic-t.c:
  my_atomic_XX_t -> intXX, no implicit locking anymore
unittest/mytap/tap.c:
  cosmetic fix

d1fb2922

ndb - bug#19285 post merge 5.0->5.1 fix (error codes) · 4f36bb01
unknown authored Jun 17, 2006
```
storage/ndb/src/ndbapi/ndberror.c:
  postmerge fix
```
4f36bb01

Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my50-bug19285 · 03c6f8cb

unknown authored Jun 17, 2006

into  clam.ndb.mysql.com:/space/pekka/ndb/version/my51-bug19285


storage/ndb/src/ndbapi/NdbBlob.cpp:
  SCCS merged
storage/ndb/src/ndbapi/ndberror.c:
  use local

03c6f8cb

ndb - bug#19285 minor fixes · 76d2ecea

unknown authored Jun 17, 2006


ndb/src/ndbapi/NdbBlob.cpp:
  bug#19285 minor fixes
ndb/src/ndbapi/ndberror.c:
  bug#19285 minor fixes

76d2ecea

Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my50-bug19285 · 6e0cdd89

unknown authored Jun 17, 2006

into  clam.ndb.mysql.com:/space/pekka/ndb/version/my51-bug19285


storage/ndb/include/ndbapi/NdbBlob.hpp:
  manual merge
storage/ndb/include/ndbapi/NdbScanOperation.hpp:
  SCCS merged
storage/ndb/src/ndbapi/NdbBlob.cpp:
  SCCS merged
storage/ndb/src/ndbapi/NdbBlobImpl.hpp:
  manual merge
storage/ndb/src/ndbapi/ndberror.c:
  use local - add 4275 afterwards
storage/ndb/test/ndbapi/testBlobs.cpp:
  automerge

6e0cdd89

16 Jun, 2006 25 commits

Merge moonbone.local:/work/tmp_merge-5.0 · 9ec3f63f

unknown authored Jun 17, 2006

into moonbone.local:/work/tmp_merge-5.0-opt-mysql


configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/archive.result:
  Auto merged
mysql-test/r/auto_increment.result:
  Auto merged
mysql-test/r/ndb_lock.result:
  Auto merged
mysql-test/r/rpl_log.result:
  Auto merged
mysql-test/t/archive.test:
  Auto merged
mysql-test/t/auto_increment.test:
  Auto merged
mysql-test/t/ndb_lock.test:
  Auto merged
mysql-test/t/rpl_log.test:
  Auto merged
sql/ha_archive.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged

9ec3f63f

Manually merged · 9d3ddf38

unknown authored Jun 17, 2006


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/archive.result:
  Auto merged
mysql-test/r/auto_increment.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/ndb_lock.result:
  Auto merged
mysql-test/r/rpl_log.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/t/archive.test:
  Auto merged
mysql-test/t/auto_increment.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/ndb_lock.test:
  Auto merged
mysql-test/t/rpl_log.test:
  Auto merged
mysql-test/t/select.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged

9d3ddf38

select.result: · 60d55cc5

unknown authored Jun 17, 2006

  After merge fix


mysql-test/r/select.result:
  After merge fix

60d55cc5

Manually merged · d0f39b6a

unknown authored Jun 17, 2006


sql/item_timefunc.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged

d0f39b6a

Merge moonbone.local:/home/evgen/bk-trees/mysql-4.1-opt · 707de39a

unknown authored Jun 17, 2006

into moonbone.local:/work/tmp_merge-5.0-opt-mysql


mysql-test/r/cast.result:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged

707de39a

Manually merged · de292d67

unknown authored Jun 17, 2006


configure.in:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged

de292d67

item_strfunc.cc: · ca22a81b

unknown authored Jun 16, 2006

  Fix for bug#16716 for --ps-protocol mode.
item_cmpfunc.cc:
  Fix for a memory allocation/freeing problem in agg_cmp_type() after fix
for bug#16377. Few language corrections.


sql/item_cmpfunc.cc:
  Fix for a memory allocation/freeing problem in agg_cmp_type(). Few language corrections.
sql/item_strfunc.cc:
  Fix for bug#16716 for --ps-protocol mode.

ca22a81b

Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 0d8d39c8
unknown authored Jun 16, 2006
```
into serg.mylan:/usr/home/serg/Abk/m51


sql/log.cc:
  Auto merged
```
0d8d39c8
Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · a245f597
unknown authored Jun 16, 2006
```
into serg.mylan:/usr/home/serg/Abk/m51
```
a245f597
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1 · 1e56f376
unknown authored Jun 16, 2006
```
into  mysql.com:/home/cps/mysql/devel/5.1-csv-remove-mmap
```
1e56f376
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1 · 9479462b
unknown authored Jun 16, 2006
```
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1-fix
```
9479462b
Fix for broken compile if not compiling with partitioning · 9224719d
unknown authored Jun 16, 2006

9224719d
remove wrong assert · 6f160532
unknown authored Jun 16, 2006

6f160532
Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 1a7be737
unknown authored Jun 16, 2006
```
into  mysql.com:/Users/emurphy/src/mysql/clean/mysql-5.1
```
1a7be737

Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main · 9addb8fd

unknown authored Jun 16, 2006

into  mysql.com:/home/stewart/Documents/MySQL/5.1/main


storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged

9addb8fd

Merge mysql.com:/home/stewart/Documents/MySQL/5.0/merge-queue · 70cf8240

unknown authored Jun 16, 2006

into  mysql.com:/home/stewart/Documents/MySQL/5.0/main


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged

70cf8240

Merge mysql.com:/home/stewart/Documents/MySQL/5.0/merge-queue · ee1969d2

unknown authored Jun 16, 2006

into  mysql.com:/home/stewart/Documents/MySQL/5.1/main


storage/ndb/include/mgmapi/mgmapi.h:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.hpp:
  Auto merged

ee1969d2

String::set(double) and set(longlong) -> set_real() and set_int() · 0237d9b0
unknown authored Jun 16, 2006
```
fix Field::store(double) being used instead of store(longlong)

NB: overloading functions is evil
```
0237d9b0

after-merge fixes. · dd285aac

unknown authored Jun 16, 2006


mysql-test/r/rpl_log.result:
  after-merge fix.
sql/ha_archive.cc:
  after-merge fix.
sql/item_func.cc:
  after-merge fix.
sql/sql_class.cc:
  after-merge fix.
sql/sql_class.h:
  after-merge fix.

dd285aac

Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main · 61f4440c

unknown authored Jun 16, 2006

into  mysql.com:/home/stewart/Documents/MySQL/5.1/main


mysql-test/r/ndb_condition_pushdown.result:
  Auto merged
mysql-test/r/type_newdecimal.result:
  Auto merged
mysql-test/r/view_grant.result:
  Auto merged
mysql-test/t/ndb_condition_pushdown.test:
  Auto merged
mysql-test/t/type_newdecimal.test:
  Auto merged
mysql-test/t/view_grant.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
mysql-test/valgrind.supp:
  Manual merge

61f4440c

Merge mysql.com:/home/marty/MySQL/mysql-5.0 · 81284709

unknown authored Jun 16, 2006

into  mysql.com:/home/marty/MySQL/mysql-5.1


mysql-test/t/ndb_lock.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Auto merged
mysql-test/r/ndb_lock.result:
  Merge (using local)

81284709

Post_merges fixes. · b47705ab
unknown authored Jun 15, 2006

b47705ab

Fixing false alarm errors on windows build from a clean clone. · 59d38c15

unknown authored Jun 15, 2006


win/build-vs71.bat:
  Don't trigger 'could not find the file specified' errors when 
  running from a clean clone.
win/build-vs8.bat:
  Don't trigger 'could not find the file specified' errors when 
  running from a clean clone.

59d38c15

Merge rurik.mysql.com:/home/igor/mysql-4.1-opt · 79966e67

unknown authored Jun 15, 2006

into  rurik.mysql.com:/home/igor/mysql-5.0-opt


mysql-test/t/func_group.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/opt_sum.cc:
  Auto merged
mysql-test/r/func_group.result:
  SCCS merged

79966e67

Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · eb219834

unknown authored Jun 15, 2006

into  rurik.mysql.com:/home/igor/mysql-5.0-opt


sql/field.cc:
  Auto merged
sql/opt_sum.cc:
  Auto merged

eb219834

15 Jun, 2006 7 commits
- Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0 · 2996b49a
  unknown authored Jun 15, 2006
```
into serg.mylan:/usr/home/serg/Abk/m51


mysql-test/r/ctype_sjis.result:
  Auto merged
mysql-test/t/ctype_sjis.test:
  Auto merged
sql/sql_lex.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
```
  2996b49a
- Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1 · ee69455c
  unknown authored Jun 16, 2006
```
into  mysql.com:/home/cps/mysql/devel/5.1-csv-remove-mmap
```
  ee69455c
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 9b402b90
  unknown authored Jun 15, 2006
```
into serg.mylan:/usr/home/serg/Abk/m51
```
  9b402b90
- Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1 · 6d16282f
  unknown authored Jun 15, 2006
```
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug20397
```
  6d16282f
- BUG#19940: Add Valgrind suppression for false alarm report. · 9668198e
  unknown authored Jun 15, 2006
  
  9668198e
- Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1 · 1dd45d5c
  unknown authored Jun 15, 2006
```
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug20397


mysql-test/r/partition_error.result:
  Auto merged
mysql-test/t/partition_error.test:
  Auto merged
sql/sql_table.cc:
  Auto merged
```
  1dd45d5c
- BUG#20397: Crash when alter table t1 engine = x; · 6dd40f3e
  unknown authored Jun 15, 2006
```
Review fixes


sql/sql_table.cc:
  Review fixes
```
  6dd40f3e