- 19 Jun, 2006 2 commits
-
-
unknown authored
sql/ha_ndbcluster.cc: fix total extents display for FILES table. fix extra field to also contain UNDO_BUFFER_SIZE
-
unknown authored
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
-
- 18 Jun, 2006 1 commit
-
-
unknown authored
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
-
- 17 Jun, 2006 6 commits
-
-
unknown authored
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
-
unknown authored
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
-
unknown authored
storage/ndb/src/ndbapi/ndberror.c: postmerge fix
-
unknown authored
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
-
unknown authored
ndb/src/ndbapi/NdbBlob.cpp: bug#19285 minor fixes ndb/src/ndbapi/ndberror.c: bug#19285 minor fixes
-
unknown authored
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
-
- 16 Jun, 2006 25 commits
-
-
unknown authored
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
-
unknown authored
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
-
unknown authored
After merge fix mysql-test/r/select.result: After merge fix
-
unknown authored
sql/item_timefunc.cc: Auto merged sql/item_timefunc.h: Auto merged
-
unknown authored
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
-
unknown authored
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
-
unknown authored
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.
-
unknown authored
into serg.mylan:/usr/home/serg/Abk/m51 sql/log.cc: Auto merged
-
unknown authored
into serg.mylan:/usr/home/serg/Abk/m51
-
unknown authored
into mysql.com:/home/cps/mysql/devel/5.1-csv-remove-mmap
-
unknown authored
into c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1-fix
-
unknown authored
-
unknown authored
-
unknown authored
into mysql.com:/Users/emurphy/src/mysql/clean/mysql-5.1
-
unknown authored
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
-
unknown authored
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
-
unknown authored
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
-
unknown authored
fix Field::store(double) being used instead of store(longlong) NB: overloading functions is evil
-
unknown authored
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.
-
unknown authored
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
-
unknown authored
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)
-
unknown authored
-
unknown authored
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.
-
unknown authored
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
-
unknown authored
into rurik.mysql.com:/home/igor/mysql-5.0-opt sql/field.cc: Auto merged sql/opt_sum.cc: Auto merged
-
- 15 Jun, 2006 6 commits
-
-
unknown authored
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
-
unknown authored
into mysql.com:/home/cps/mysql/devel/5.1-csv-remove-mmap
-
unknown authored
into serg.mylan:/usr/home/serg/Abk/m51
-
unknown authored
into c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug20397
-
unknown authored
-
unknown authored
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
-