mariadb

Tree: ad7a4ebbe3

Author	SHA1	Message	Date
unknown	ad7a4ebbe3	Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines into chilla.local:/home/mydev/mysql-5.0-axmrg	19 years ago
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	1042a25a7f	Merge chilla.local:/home/mydev/mysql-4.1-axmrg into chilla.local:/home/mydev/mysql-5.0-axmrg BUILD/SETUP.sh: Auto merged configure.in: Auto merged include/my_global.h: Auto merged include/thr_alarm.h: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/symlink.result: Auto merged mysql-test/t/myisam.test: Auto merged mysql-test/t/symlink.test: Auto merged mysys/my_pthread.c: Auto merged sql/item_func.cc: Auto merged include/my_pthread.h: Manual merged mysql-test/r/myisam.result: Manual merged mysys/thr_alarm.c: Manual merged sql/ha_ndbcluster.cc: Manual merged sql/mysqld.cc: Manual merged	19 years ago
unknown	d308799383	Merge bk-internal.mysql.com:/home/bk/mysql-4.1 into chilla.local:/home/mydev/mysql-4.1-axmrg mysql-test/r/symlink.result: Auto merged mysql-test/t/symlink.test: Auto merged mysql-test/r/myisam.result: Manual merged mysql-test/t/myisam.test: Manual merged	19 years ago
unknown	92a7c1ed9c	Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt into mysql.com:/home/gluh/MySQL/Merge/5.0 sql/item.h: Auto merged sql/sql_table.cc: Auto merged sql/sql_update.cc: Auto merged	19 years ago
unknown	fddf3c3979	Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt into mysql.com:/home/gluh/MySQL/Merge/4.1 sql/item_func.cc: Auto merged	19 years ago
unknown	ea41474bf8	Merge bk-internal.mysql.com:/home/bk/mysql-5.0 into mockturtle.local:/home/dlenev/src/mysql-5.0-merge	19 years ago
unknown	24903ed56c	Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into mysql.com:/home/psergey/mysql-5.0-bug8804-r12 sql/mysqld.cc: Auto merged	19 years ago
unknown	a34166065d	BUG#24127: wrong result for (null,not-null) IN (SELECT a,b ...): Fixed typo problem that surfaced after the merge	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	130523af45	BUG#24127: merge fixes: If subselect is a union, dont allocate several identical pushed_cond_guards arrays. Allocate only one always. mysql-test/r/subselect.result: BUG#24127: merge mysql-test/t/subselect3.test: BUG#24127: merge	19 years ago
unknown	259a465822	Disabling back im_daemon_life_cycle.test, which was temporarily enabled in the team tree for additional investigation.	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	7b109de61a	Merge bk-internal.mysql.com:/home/bk/mysql-5.0 into mockturtle.local:/home/dlenev/src/mysql-5.0-merge mysql-test/t/disabled.def: Auto merged mysql-test/t/ps.test: Auto merged	19 years ago
unknown	dfeac169a6	Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into mysql.com:/home/psergey/mysql-5.0-bug8804-r12 sql/item_cmpfunc.cc: Auto merged sql/item_cmpfunc.h: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_select.cc: Auto merged mysql-test/r/subselect.result: Manual Merge	19 years ago
unknown	e396abc986	Merge mysql.com:/home/gluh/MySQL/Merge/5.0 into mysql.com:/home/gluh/MySQL/Merge/5.0-opt	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	0c302993e6	Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work into kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build	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	16e600c02e	Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1 into kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work	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	457d431556	Bug#25668 mysqld may core if cluster disconnected - recommit in 4.1	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	bf12442461	Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into olga.mysql.com:/home/igor/mysql-5.0-opt sql/item_func.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	5d9d649310	Post-merge fix.	19 years ago
unknown	8dc8acbb09	Merge olga.mysql.com:/home/igor/mysql-4.1-opt into olga.mysql.com:/home/igor/mysql-5.0-opt mysql-test/r/fulltext_left_join.result: Auto merged mysql-test/t/fulltext_left_join.test: Auto merged sql/item_func.cc: 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	5f544ed032	Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime into mockturtle.local:/home/dlenev/src/mysql-5.0-bg24491 sql/item.h: Auto merged mysql-test/r/ps.result: Manual merge. mysql-test/t/ps.test: Manual merge.	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	1dead07d14	Proposed fix for bug#24491 "using alias from source table in insert ... on duplicate key". INSERT ... SELECT ... ON DUPLICATE KEY UPDATE which was used in stored routine or as prepared statement and which in its ON DUPLICATE KEY clause erroneously tried to assign value to a column mentioned only in its SELECT part was properly emitting error on the first execution but succeeded on the second and following executions. Code which is responsible for name resolution of fields mentioned in UPDATE clause (e.g. see select_insert::prepare()) modifies table list and Name_resolution_context used in this process. It uses Name_resolution_context_state::save_state/restore_state() to revert these modifications. Unfortunately those two methods failed to revert properly modifications to TABLE_LIST::next_name_resolution_table and this broke name resolution process for successive executions. This patch fixes Name_resolution_context_state::save_state/restore_state() in such way that it properly handles TABLE_LIST::next_name_resolution_table. mysql-test/r/ps.result: Added test case for bug#24491 "using alias from source table in insert ... on duplicate key" mysql-test/r/sp-error.result: Added test case for bug#24491 "using alias from source table in insert ... on duplicate key" mysql-test/t/ps.test: Added test case for bug#24491 "using alias from source table in insert ... on duplicate key" mysql-test/t/sp-error.test: Added test case for bug#24491 "using alias from source table in insert ... on duplicate key" sql/item.h: Name_resolution_context::save_state/restore_state(): At the moment these methods are used only by code implementing INSERT and INSERT ... SELECT statements. This code doesn't modify 'next_name_resolution_table' member of table list element corresponding to the first table of SELECT clause (pointed by 'first_name_resolution_table'). But it modifies table list element corresponding to the target table of INSERT (pointed by 'table_list') So these methods were changed to reflect this.	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	acef88bee3	Merge mysql.com:/home/gluh/MySQL/Merge/5.0 into mysql.com:/home/gluh/MySQL/Merge/5.0-opt mysql-test/r/func_in.result: Auto merged mysql-test/r/range.result: Auto merged mysql-test/r/sp-code.result: Auto merged mysql-test/t/func_in.test: Auto merged mysql-test/t/range.test: Auto merged mysql-test/t/trigger.test: Auto merged mysql-test/t/view.test: Auto merged sql/item.cc: Auto merged sql/item_func.cc: Auto merged sql/mysql_priv.h: Auto merged sql/sql_insert.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_table.cc: Auto merged mysql-test/r/select.result: manual merge mysql-test/r/view.result: manual merge mysql-test/t/select.test: manual merge	19 years ago
unknown	4eec436001	Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1-build into trift2.:/MySQL/M41/push-4.1	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

1 2 3 4 5 ...

34623 Commits (ad7a4ebbe31d3bd6113e5f26107db6fffaddea1c) All Branches Search

34623 Commits (ad7a4ebbe31d3bd6113e5f26107db6fffaddea1c)

All Branches