- 14 Dec, 2005 6 commits
-
-
unknown authored
into mysql.com:/usr/local/mysql/mysql-5.1-new storage/bdb/dist/gen_rec.awk: Auto merged
-
unknown authored
into mysql.com:/usr/local/mysql/mysql-5.1-new
-
unknown authored
bdb/dist/gen_rec.awk: Fix undefined behaviour.
-
unknown authored
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Auto merged
-
unknown authored
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new mysql-test/r/ndb_basic.result: Auto merged mysql-test/t/ndb_basic.test: Auto merged sql/ha_ndbcluster.cc: Auto merged storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp: Auto merged storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Auto merged storage/ndb/src/kernel/vm/SimulatedBlock.cpp: merge storage/ndb/src/ndbapi/ndberror.c: merge
-
unknown authored
mysql-test/r/ndb_basic.result: bug#15682 - invalid handling of varchar in position/rnd_pos mysql-test/t/ndb_basic.test: bug#15682 - invalid handling of varchar in position/rnd_pos ndb/src/kernel/blocks/dbtc/Dbtc.hpp: New error code for invalid key ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Handle invalid key gracefully ndb/src/kernel/vm/SimulatedBlock.cpp: Handle invalid key gracefully ndb/src/ndbapi/ndberror.c: New error code sql/ha_ndbcluster.cc: Fix varchar keys in position/rnd_pos
-
- 13 Dec, 2005 13 commits
-
-
unknown authored
into mysql.com:/home/alexi/innodb-ss/mysql-5.1-ss92 mysql-test/t/ndb_read_multi_range.test: Auto merged configure.in: Merged mysql-test/r/innodb.result: Null merge mysql-test/t/innodb.test: Null merge sql/ha_innodb.cc: Null merge storage/innobase/btr/btr0sea.c: Null merge storage/innobase/dict/dict0dict.c: Null merge storage/innobase/dict/dict0load.c: Null merge storage/innobase/include/buf0buf.h: Null merge storage/innobase/include/dict0dict.h: Null merge storage/innobase/include/dict0load.h: Null merge storage/innobase/include/os0file.h: Null merge storage/innobase/include/rem0cmp.h: Null merge storage/innobase/include/srv0srv.h: Null merge storage/innobase/rem/rem0cmp.c: Null merge storage/innobase/row/row0ins.c: Null merge storage/innobase/row/row0mysql.c: Null merge storage/innobase/srv/srv0srv.c: Null merge storage/innobase/srv/srv0start.c: Null merge storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto-merge storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Auto-merge support-files/mysql.spec.sh: Auto-merge
-
unknown authored
into mysql.com:/home/alexi/innodb-ss/mysql-5.0-ss92
-
unknown authored
table' lockup". Changes from the innodb-5.0-ss92 snapshot. Do not call os_file_create_tmpfile() at runtime. Instead, create all tempfiles at startup and guard access to them with mutexes. innobase/btr/btr0sea.c: Changes from the innodb-5.0ss92 snapshot. innobase/include/buf0buf.h: Changes from the innodb-5.0ss92 snapshot. innobase/include/os0file.h: Changes from the innodb-5.0ss92 snapshot. innobase/include/srv0srv.h: Changes from the innodb-5.0ss92 snapshot. innobase/row/row0ins.c: Changes from the innodb-5.0ss92 snapshot. innobase/srv/srv0srv.c: Changes from the innodb-5.0ss92 snapshot. innobase/srv/srv0start.c: Changes from the innodb-5.0ss92 snapshot. mysql-test/r/innodb.result: Changes from the innodb-5.0ss92 snapshot. mysql-test/t/innodb.test: Changes from the innodb-5.0ss92 snapshot. sql/ha_innodb.cc: Changes from the innodb-5.0ss92 snapshot.
-
unknown authored
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: merge fix
-
unknown authored
NOTE: only changes to test script mysql-test/t/ndb_read_multi_range.test: Bug#15675 - ndb - fix read_multi_range.test drop all tables it using
-
unknown authored
into mysql.com:/home/alexi/innodb-ss/mysql-5.0-ss11
-
unknown authored
note bug#15629 has been fixed in release clone (sp on 64 bit platform), but not merged here yet ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: merge error
-
unknown authored
-
unknown authored
into mysql.com:/home/alexi/innodb-ss/mysql-5.0-ss11 Null merge BitKeeper/deleted/.del-ha_blackhole.cc~727c69ef7846623a: Auto merged innobase/include/dict0load.h: Auto merged innobase/dict/dict0dict.c: Null-merge from 4.1 innobase/include/dict0dict.h: Null-merge from 4.1 innobase/include/os0file.h: Null-merge from 4.1 innobase/include/rem0cmp.h: Null-merge from 4.1 innobase/include/srv0srv.h: Null-merge from 4.1 innobase/rem/rem0cmp.c: Null-merge from 4.1 innobase/row/row0ins.c: Null-merge from 4.1 innobase/row/row0mysql.c: Null-merge from 4.1 innobase/srv/srv0srv.c: Null-merge from 4.1 innobase/srv/srv0start.c: Null-merge from 4.1 mysql-test/r/innodb.result: Null-merge from 4.1 mysql-test/t/innodb.test: Null-merge from 4.1 sql/ha_innodb.cc: Null-merge from 4.1
-
unknown authored
-
unknown authored
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp: Auto merged storage/ndb/include/ndb_version.h.in: Auto merged storage/ndb/src/kernel/blocks/ERROR_codes.txt: Auto merged storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp: Auto merged storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Auto merged storage/ndb/test/ndbapi/testNodeRestart.cpp: Auto merged storage/ndb/test/run-test/daily-basic-tests.txt: merge
-
unknown authored
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Auto merged
-
unknown authored
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0 ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged ndb/src/kernel/blocks/dblqh/Dblqh.hpp: Auto merged ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Auto merged ndb/test/ndbapi/testNodeRestart.cpp: Auto merged ndb/src/kernel/blocks/ERROR_codes.txt: merge ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: merge ndb/test/run-test/daily-basic-tests.txt: merge
-
- 12 Dec, 2005 21 commits
-
-
unknown authored
mysql-test/r/sp.result: Update results (t3 does exist here)
-
unknown authored
into mysql.com:/home/novo/MySQL/mysql-5.0
-
unknown authored
* made the following changes for the generic 5.0 RPM spec file - Added zlib to the list of (static) libraries installed - Added check against libtool wierdness (WRT: sql/mysqld || sql/.libs/mysqld) - Compile MySQL with bundled zlib - Fixed %packager name to "MySQL Production Engineering Team" support-files/mysql.spec.sh: * made the following changes for the generic 5.0 RPM spec file - Added zlib to the list of (static) libraries installed - Added check against libtool wierdness (WRT: sql/mysqld || sql/.libs/mysqld) - Compile MySQL with bundled zlib - Fixed %packager name to "MySQL Production Engineering Team"
-
unknown authored
into mysql.com:/home/jimw/my/mysql-5.1-clean mysql-test/r/sp.result: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_func.cc: Auto merged sql/item_strfunc.cc: Auto merged sql/item_subselect.cc: Auto merged sql/item_sum.cc: Auto merged sql/mysql_priv.h: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_db.cc: Auto merged sql/sql_delete.cc: 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_prepare.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_update.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/sql_base.cc: Resolve conflict
-
unknown authored
into mysql.com:/home/alexi/innodb-ss/mysql-4.1-ss11
-
unknown authored
into mysql.com:/home/jimw/my/mysql-5.0-clean
-
unknown authored
into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1 client/mysqltest.c: Auto merged
-
unknown authored
Put options in proper order. client/mysqltest.c: Put options in proper order.
-
unknown authored
into mysql.com:/home/jimw/my/mysql-5.0-clean mysql-test/r/bdb.result: Resolve conflicts mysql-test/t/bdb.test: Resolve conflicts sql/sql_delete.cc: Resolve conflicts sql/sql_insert.cc: Resolve conflicts sql/sql_update.cc: Resolve conflicts
-
unknown authored
into mysql.com:/M41/mysql-4.1
-
unknown authored
table' lockup". Changes from the innodb-4.1-ss11 snapshot. Do not call os_file-create_tmpfile() at runtime. Instead, create a tempfile at startup and guard access to it with a mutex. Also, fix bugs: 10511: "Wrong padding of UCS2 CHAR columns in ON UPDATE CASCADE"; 13778: "If FOREIGN_KEY_CHECKS=0, one can create inconsistent FOREIGN KEYs". When FOREIGN_KEY_CHECKS=0 we still need to check that datatypes between foreign key references are compatible. Also, added test cases (also for bug 9802). innobase/dict/dict0dict.c: Changes from the innodb-4.1-ss11 snapshot innobase/dict/dict0load.c: Changes from the innodb-4.1-ss11 snapshot innobase/include/dict0dict.h: Changes from the innodb-4.1-ss11 snapshot innobase/include/dict0load.h: Changes from the innodb-4.1-ss11 snapshot innobase/include/os0file.h: Changes from the innodb-4.1-ss11 snapshot innobase/include/rem0cmp.h: Changes from the innodb-4.1-ss11 snapshot innobase/include/srv0srv.h: Changes from the innodb-4.1-ss11 snapshot innobase/rem/rem0cmp.c: Changes from the innodb-4.1-ss11 snapshot innobase/row/row0ins.c: Changes from the innodb-4.1-ss11 snapshot innobase/row/row0mysql.c: Changes from the innodb-4.1-ss11 snapshot innobase/srv/srv0srv.c: Changes from the innodb-4.1-ss11 snapshot innobase/srv/srv0start.c: Changes from the innodb-4.1-ss11 snapshot libmysqld/ha_blackhole.cc: Changes from the innodb-4.1-ss11 snapshot mysql-test/r/innodb.result: Changes from the innodb-4.1-ss11 snapshot mysql-test/t/innodb.test: Changes from the innodb-4.1-ss11 snapshot sql/ha_innodb.cc: Changes from the innodb-4.1-ss11 snapshot
-
unknown authored
-
unknown authored
-
unknown authored
-
unknown authored
Manual merge from 4.1, extension of the old fix (1.1976 05/12/05 17:57:48 mleich@mysql.com) to two other places. mysql-test/t/rpl_until.test: Auto merged mysql-test/r/rpl_until.result: Manual merge from 4.1, extension of the old fix (1.1976 05/12/05 17:57:48 mleich@mysql.com) to two other places.
-
unknown authored
Fix for bug#12429: Replication tests fail: "Slave_IO_Running" differs: The value is not important, and it depends on timing. Mask it. Backport and extension of a fix made by Matthias in 5.0, originally it was 1.1976 05/12/05 17:57:48 mleich@mysql.com mysql-test/r/rpl_until.result: Fix for bug#12429: Replication tests fail: "Slave_IO_Running" differs: The value is not important, and it depends on timing. Mask it. Backport and extension of a fix made by Matthias in 5.0, originally it was 1.1976 05/12/05 17:57:48 mleich@mysql.com mysql-test/t/rpl_until.test: Fix for bug#12429: Replication tests fail: "Slave_IO_Running" differs: The value is not important, and it depends on timing. Mask it. Backport and extension of a fix made by Matthias in 5.0, originally it was 1.1976 05/12/05 17:57:48 mleich@mysql.com
-
unknown authored
Error in abort handling in TC when timeout during abort ndb/src/kernel/blocks/ERROR_codes.txt: New error codes ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: New error codes ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Dont release transaction record to early ndb/test/ndbapi/testNodeRestart.cpp: Test case ndb/test/run-test/daily-basic-tests.txt: Test case
-
unknown authored
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
-
unknown authored
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new mysql-test/t/symlink.test: Auto merged scripts/make_win_src_distribution.sh: Auto merged sql/mysqld.cc: Auto merged
-
unknown authored
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new sql/sp_head.cc: Auto merged
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
-