mariadb

Tree: 8233b914ec

Author	SHA1	Message	Date
unknown	8233b914ec	After merge fix (WL#3567).	19 years ago
unknown	3e35fffa90	Merge mysql.com:/home/svoj/devel/mysql/WL3567/mysql-4.1-engines into mysql.com:/home/svoj/devel/mysql/WL3567/mysql-5.0-engines mysql-test/t/merge.test: Auto merged mysql-test/r/merge.result: Manually merged. sql/ha_myisam.cc: Manually merged. sql/ha_myisammrg.cc: Manually merged.	19 years ago
unknown	ab3abe1232	Merge mysql.com:/home/svoj/devel/bk/mysql-4.1-engines into mysql.com:/home/svoj/devel/mysql/WL3567/mysql-4.1-engines	19 years ago
unknown	f7b3c7c531	WL#3567 - MERGE engine: a check for underlying table conformance When a merge table is opened compare column and key definition of underlying tables against column and key definition of merge table. If any of underlying tables have different column/key definition refuse to open merge table. mysql-test/r/merge.result: A test case for WL#3456. mysql-test/t/merge.test: A test case for WL#3456. sql/ha_myisam.cc: Moved a part of code that converts TABLE object to MyISAM key and column definition to a separate function. Added check_definition() function that compares MyISAM table definitions. sql/ha_myisammrg.cc: Check if underlying table definition conforms to merge table definition, and in case underlying table definition differs, refuse to open merge table.	19 years ago
unknown	2ed7eaf564	Merge mysql.com:/home/svoj/devel/bk/mysql-5.0 into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines mysql-test/t/myisam.test: Auto merged	19 years ago
unknown	c26ffedb86	Merge mysql.com:/home/svoj/devel/bk/mysql-5.0 into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines mysql-test/r/symlink.result: Auto merged mysql-test/t/symlink.test: Auto merged sql/table.cc: Auto merged mysql-test/r/myisam.result: Manually merged. mysql-test/t/myisam.test: Manually merged.	19 years ago
unknown	9403c7ca67	Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines into chilla.local:/home/mydev/mysql-4.1-bug24607	19 years ago
unknown	6bb5fd6b28	Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines into chilla.local:/home/mydev/mysql-5.0-bug24607 mysql-test/r/myisam.result: Auto merged mysql-test/t/myisam.test: Auto merged	19 years ago
unknown	ccb002dbc2	Bug#24607 - MyISAM pointer size determined incorrectly After merge fix	19 years ago
unknown	4f73c75fba	Merge chilla.local:/home/mydev/mysql-4.1-bug24607 into chilla.local:/home/mydev/mysql-5.0-bug24607 mysql-test/r/myisam.result: Manual merged mysql-test/t/myisam.test: Manual merged	19 years ago
unknown	112ef50f28	Bug#24607 - MyISAM pointer size determined incorrectly Fixed test. On 32-bit machines which compile without -DBIG_TABLES, MAX_ROWS is truncated to a 32-bit value. Using a value below 4G is portable. mysql-test/r/myisam.result: Bug#24607 - MyISAM pointer size determined incorrectly Fixed test results.	19 years ago
unknown	bb5dccf260	Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0 into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work sql/ha_ndbcluster.cc: Auto merged	19 years ago
unknown	5e0fd916f1	After merge fix.	19 years ago
unknown	4c51028e46	Merge mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-4.1-engines into mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-5.0-engines mysql-test/r/myisam.result: Auto merged mysql-test/t/myisam.test: Auto merged	19 years ago
unknown	89e558c9c7	Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0-engines into mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-5.0-engines	19 years ago
unknown	7513ef2651	Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-engines into mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-4.1-engines	19 years ago
unknown	3f064efb0e	Merge bk-internal.mysql.com:/home/bk/mysql-5.0-ndb into willster.(none):/home/stewart/Documents/MySQL/5.0/ndb-work	19 years ago
unknown	71f606804c	fix hpux build problem and some ndb connect errors being missed ndb/src/common/util/SocketClient.cpp: fix two problems recently introduced: - HPUX build problem - some connect errors not being detected properly	19 years ago
unknown	02a9f2f719	Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 into poseidon.mysql.com:/home/tomas/mysql-5.0-ndb sql/mysqld.cc: Auto merged sql/sql_class.cc: Auto merged	19 years ago
unknown	1f4d8ba085	Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines into chilla.local:/home/mydev/mysql-4.1-bug24607 mysql-test/r/myisam.result: Auto merged mysql-test/t/myisam.test: Auto merged	19 years ago
unknown	4bec8b037f	Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines into chilla.local:/home/mydev/mysql-5.0-bug24607 mysql-test/r/myisam.result: Auto merged mysql-test/t/myisam.test: Auto merged	19 years ago
unknown	964f502cc2	Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb into clam.ndb.mysql.com:/export/space/pekka/ndb/version/my50-ndb	19 years ago
unknown	a717485064	Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb into willster.(none):/home/stewart/Documents/MySQL/5.0/bug25487	19 years ago
unknown	2244a36179	Merge mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-4.1-engines into mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-5.0-engines myisam/mi_open.c: Auto merged	19 years ago
unknown	25fb32ef84	ndb - bug#25562 use byte-size max_data_length() when setting blob part size sql/ha_ndbcluster.cc: bug#25562 use byte-size max_data_length() when setting blob part size	19 years ago
unknown	68ab0996b4	round up Transporter connect timeout ndb/src/common/transporter/Transporter.cpp: change so timeout is rounded up to nearest second	19 years ago
unknown	8deeb2f95b	Bug #25487 deleting ndb_cluster_connection object takes long time aim is to: a) if set_connect_timeout called, timeout connect attempt (for retry on next call) after timeout period b) preserve existing blocking behaviour otherwise (for, e.g. mgmapi) Related to customer issue with long time deleting ndb_cluster_connection object. believe we're hanging on the connect(2) call until timeout (when we then realise we should exit the thread). ndb/include/mgmapi/mgmapi.h: add ndb_mgm_set_connect_timeout ndb/include/util/SocketClient.hpp: add timeout (seconds) for max time to wait for connection ndb/src/common/transporter/Transporter.cpp: set limit on amount of time we'll wait for tcp connect ndb/src/common/util/SocketClient.cpp: only try to connect for a maximum of timeout time ndb/src/mgmapi/mgmapi.cpp: add ndb_mgm_set_connect_timeout	19 years ago
unknown	ab8355fab0	ndb - bug#22013 Fix bug in event handling wrt early node shutdown ndb/src/mgmsrv/MgmtSrvr.cpp: Fix bug in event handling wrt early node shutdown ndb/src/ndbapi/ClusterMgr.cpp: Fix reportNodeFailed if only connected wo/ having received any API_REGCONF ndb/src/ndbapi/ClusterMgr.hpp: Fix reportNodeFailed if only connected wo/ having received any API_REGCONF ndb/src/ndbapi/SignalSender.cpp: Fix memleak	19 years ago
unknown	188899cdfc	bug#25746 ndb: 4209 error with 2 VARCHAR primary keys - post review changes	19 years ago
unknown	442c1f8701	Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build	19 years ago
unknown	5f9e20de6c	bug#25746 ndb: 4209 error with 2 VARCHAR primary keys - make sure keys are copied correctly when varchar has 2 length bytes - test case mysql-test/r/ndb_basic.result: bug#25746 ndb: 4209 error with 2 VARCHAR primary keys - test case mysql-test/t/ndb_basic.test: bug#25746 ndb: 4209 error with 2 VARCHAR primary keys - test case sql/ha_ndbcluster.cc: bug#25746 ndb: 4209 error with 2 VARCHAR primary keys - make sure keys are copied correctly when varchar has 2 length bytes	19 years ago
unknown	bbad4c1ef6	Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work BUILD/check-cpu: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/t/myisam.test: Auto merged scripts/mysqld_multi.sh: Auto merged	19 years ago
unknown	91eddf6aaf	Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work1-testcases-20061 into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work BUILD/check-cpu: Auto merged	19 years ago
unknown	e2570e9811	Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work-24780 into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work scripts/mysqld_multi.sh: Auto merged	19 years ago
unknown	45b9381f07	Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work-24780 into kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work scripts/mysqld_multi.sh: Auto merged	19 years ago
unknown	4f69569dfa	after-merge fix	19 years ago
unknown	747ec6f904	Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work1-testcases-20061 into kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work BUILD/check-cpu: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/t/myisam.test: Auto merged	19 years ago
unknown	fde52a2f82	BUG#24401 - MySQL server crashes if you try to retrieve data from corrupted table Accessing a table with corrupted column definition results in server crash. This is fixed by refusing to open such tables. Affects MyISAM only. No test case, since it requires crashed table. myisam/mi_open.c: Refuse to open MyISAM table with summary columns length bigger than length of the record.	19 years ago
unknown	8718d835cf	Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build cmd-line-utils/readline/undo.c: Auto merged	19 years ago
unknown	6d76c8f328	Merge trift2.:/MySQL/M50/mysql-5.0 into trift2.:/MySQL/M50/push-5.0 configure.in: Auto merged myisam/mi_packrec.c: Use fix by Magnus.	19 years ago
unknown	644e6c7fdd	Merge recycle.(none):/src/bug22807/my50-bug22807 into recycle.(none):/src/mysql-5.0-maint mysys/string.c: Auto merged	19 years ago
unknown	4032c303a9	Bug#22807 mysql_upgrade fails when called with a basedir-path containing spaces - Corrected compiler warnings and performance problems with new dynstr_append_os_quoted function. mysys/string.c: Bug#22807 mysql_upgrade fails when called with a basedir-path containing spaces - Fix compiler warnings. - Used dynstr_append_mem where string length is known.	19 years ago
unknown	3271e716b2	Rearrange disable_warnings to enclose the warning emitters properly.	19 years ago
unknown	636a5b3fa4	Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint	19 years ago
unknown	df1b824262	The rpl tree added a test case, and another source added a warning, and combined, they add a platform-specific warning. The warnings are not the goal of the test, in any case. mysql-test/t/ps.test: Quash platform-specific warnings.	19 years ago
unknown	848a663b43	After merge fix	19 years ago
unknown	ca2aa14312	Use $MYSQLTESTVARDIR	19 years ago
unknown	87a569f3c0	cmd-line-utils/readline/undo.c : Replace an "uint" cast by the expanded "unsigned int" (compile problem on QNX). cmd-line-utils/readline/undo.c: Replace an "uint" cast by the expanded "unsigned int", because there are platforms (QNX) on which "uint" is not defined in the "readline" library (and so building it failed, version 5.0.34).	19 years ago
unknown	0c10457ec4	Merge bk-internal:/home/bk/mysql-5.0-maint into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint	19 years ago
unknown	d6e4472f89	Bug #15518 Reusing a stmt that has failed during prepare does not clear error - Additional patch removing check for mysql_errno on already closed mysql1 tests/mysql_client_test.c: No need to check mysql_errno of mysql1 which has already been closed.	19 years ago

1 2 3 4 5 ...

34548 Commits (8233b914ecc3cdc9cbec27aba4406c0ecd67cb58) All Branches Search

34548 Commits (8233b914ecc3cdc9cbec27aba4406c0ecd67cb58)

All Branches