mariadb

Tree: 2f863451b5

Author	SHA1	Message	Date
unknown	82fd170338	Bug#25203 Mysql crashes when mysql_kill() is executed in a connection using SSL - It's too early to free the SSL object in 'vio_ssl_close'. There might still be a thread using or reading from it on platforms where we need to close the active connection/socket in order to break the read. - Add new function 'vio_ssl_delete' and install it as the viodelete function for SSL connections. vio/vio.c: Install 'vio_ssl_delete' as viodelete function for SSL connections Cleanup 'vio_delete' vio/vio_priv.h: Add declaration of vio_ssl_delete vio/viossl.c: Add new function 'vio_ssl_delete' that takes care of freeing the memory allocated by the SSL connection Move the code to free the SSL object from vio_ssl_close	19 years ago
unknown	917adbaec4	Post merge fix	19 years ago
unknown	483a41bbb7	Merge olga.mysql.com:/home/igor/dev-opt/mysql-4.1-opt-bug24653 into olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug24653 sql/item.cc: Auto merged sql/item.h: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_func.cc: Auto merged sql/sql_select.cc: Auto merged mysql-test/r/subselect.result: Manual merge mysql-test/t/subselect.test: Manual merge sql/filesort.cc: Manual merge sql/item_cmpfunc.h: Manual merge sql/item_subselect.cc: Manual merge	19 years ago
unknown	da561a802c	Fixed bug #24653 . The bug report has demonstrated the following two problems. 1. If an ORDER/GROUP BY list includes a constant expression being optimized away and, at the same time, containing single-row subselects that return more that one row, no error is reported. Strictly speaking the standard allows to ignore error in this case. Yet, now a corresponding fatal error is reported in this case. 2. If a query requires sorting by expressions containing single-row subselects that, however, return more than one row, then the execution of the query may cause a server crash. To fix this some code has been added that blocks execution of a subselect item in case of a fatal error in the method Item_subselect::exec. mysql-test/r/subselect.result: Added a test cases for bug #24653. mysql-test/t/subselect.test: Added a test cases for bug #24653. sql/filesort.cc: Fixed bug #24653. Added a check for fatal error after reading the next row from the table in the function find_all_keys. sql/item.cc: Fixed bug #24653. Down-ported calculation of the attribute with_subselect of for Item objects. sql/item.h: Fixed bug #24653. Down-ported calculation of the attribute with_subselect of for Item objects. sql/item_cmpfunc.cc: Fixed bug #24653. Down-ported calculation of the attribute with_subselect of for Item objects. sql/item_cmpfunc.h: Fixed bug #24653. Down-ported calculation of the attribute with_subselect of for Item objects. sql/item_func.cc: Fixed bug #24653. Down-ported calculation of the attribute with_subselect of for Item objects. sql/item_subselect.cc: Fixed bug #24653. Added a check for fatal error in the method Item_subselect::exec to block evaluation of subselects in erroneous situations. Down-ported calculation of the attribute with_subselect of for Item objects. sql/sql_select.cc: Fixed bug #24653. Added a check to verify that any constant expression used in ORDER BY and/or GROUP BY lists which is optimized away does not contain subselects returning more than one row. If it does a fatal error is reported.	19 years ago
unknown	2ec2fa6d08	Cleanup of thread-type (linuxthread or NTPL) detection code Move get_thread_lib to mysys/my_pthread.c Set 'thr_client_alarm' to signal number used by thr_alarm to give alarms include/my_global.h: Fixed to be same as in 5.1 include/my_pthread.h: Move things around to be more in line with rest of code include/thr_alarm.h: extern of thr_client_alarm mysys/default.c: Fixed two wrong pointer incrementations. mysys/my_pthread.c: Cleanup: Use variable thr_client_alarm mysys/my_thr_init.c: Detect thread library at startup mysys/thr_alarm.c: Set thr_client_alarm depending on which thread library we are using sql/mysqld.cc: Move get_thread_lib to mysys/my_pthread.c	19 years ago
unknown	8ef50277fc	For Linux systems running RHEL 4 (which includes SE-Linux), we need to provide additional files that specify some actions which are allowed to the MySQL binaries. Create a new subdirectory "supportfiles/RHEL4-SElinux" for them, and process it. This fixes bug#12676. configure.in: New "support-files/RHEL4-SElinux/Makefile.am" must be processed by "automake" etc. support-files/Makefile.am: For Linux systems running RHEL 4 (which includes SE-Linux), we need to provide additional files that specify some actions which are allowed to the MySQL binaries. Create a new subdirectory "supportfiles/RHEL4-SElinux" for them, and process it. support-files/RHEL4-SElinux/Makefile.am: BitKeeper file /MySQL/M50/bug12676-5.0/support-files/RHEL4-SElinux/Makefile.am support-files/RHEL4-SElinux/mysql.fc: BitKeeper file /MySQL/M50/bug12676-5.0/support-files/RHEL4-SElinux/mysql.fc support-files/RHEL4-SElinux/mysql.te: BitKeeper file /MySQL/M50/bug12676-5.0/support-files/RHEL4-SElinux/mysql.te	19 years ago
unknown	8da25f3abc	Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint into polly.local:/home/kaa/src/maint/mysql-5.0-maint	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	6cfffb5005	BUG#25530 --with-readline fails with commercial source packages BUILD/SETUP.sh: BUG#25530 --with-readline fails with commercial source packages The compile-* scripts should not use --with-readline explicitly when no readline is present. configure.in: BUG#25530 --with-readline fails with commercial source packages Configuring --with-readline should fail when libreadline is not bundled. A system libreadline is only used when there is a bundled libreadline too, so the commercial source code isn't linked with GPL libreadline by accident.	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	5c8f3d0769	Merge polly.local:/tmp/maint/bug6774/my50-bug6774 into polly.local:/home/kaa/src/maint/mysql-5.0-maint	19 years ago
unknown	aac1ec2f5e	Merge recycle.(none):/src/bug24496/my50-bug24496 into recycle.(none):/src/mysql-5.0-maint scripts/mysql_create_system_tables.sh: Auto merged	19 years ago
unknown	7d4477f866	Added a test case for bug #6774 "Replication fails with Wrong usage of DB GRANT and GLOBAL PRIVILEGES"	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	2e1a889512	Merge bk://localhost:5556 into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50	19 years ago
unknown	df5030c49a	Makefile.am: Fix bad merge: add 'cd mysql-test' to test-ps: target Makefile.am: Fix bad merge: add 'cd mysql-test' to test-ps: target	19 years ago
unknown	b60c146a89	Bug#24496:Fresh install of mysql on windows has anonymous user with root access. - Add anonymous user with no rights.	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

... 3 4 5 6 7 ...

34875 Commits (2f863451b5c5fe848d26f5f87ae27f13415805b3) All Branches Search

34875 Commits (2f863451b5c5fe848d26f5f87ae27f13415805b3)

All Branches