mariadb

Tree: ad7a4ebbe3

Author	SHA1	Message	Date
unknown	eb179ebefc	Cset exclude: msvensson@pilot.mysql.com\|ChangeSet\|20070117102733\|42618 mysql-test/r/myisam.result: Exclude mysql-test/t/myisam.test: Exclude	19 years ago
unknown	e53f3aac02	Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0 into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint mysys/my_read.c: Auto merged scripts/make_binary_distribution.sh: Auto merged sql/field.h: Auto merged sql/mysqld.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_parse.cc: Auto merged	19 years ago
unknown	b95f107371	Bug#25505 Myisam library compiler error on Windows myisam/mi_packrec.c: Combine the declaration of variable and assignment into one line since that is allowed befgore declaring another variable in C.	19 years ago
unknown	1ce535c6ab	Cset exclude: msvensson@neptunus.(none)\|ChangeSet\|20060825084614\|09755 mysql-test/r/myisam.result: Exclude mysql-test/t/myisam.test: Exclude	19 years ago
unknown	4743deeba0	Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1 into pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint mysql-test/t/mysqladmin.test: Auto merged mysys/mf_iocache.c: Auto merged mysys/my_read.c: Auto merged mysys/my_seek.c: Auto merged sql/sql_parse.cc: Auto merged	19 years ago
unknown	4828be9ed6	Merge mysql.com:/data0/mysqldev/users/tomas/mysql-5.0-release into mysql.com:/data0/mysqldev/users/tomas/mysql-5.0-build	19 years ago
unknown	15eebdc0a1	ha_ndbcluster.cc: Bug #25668 - corrected patch after test failures sql/ha_ndbcluster.cc: Bug #25668 - corrected patch after test failures	19 years ago
unknown	05527cfcad	Merge mysql.com:/data0/mysqldev/users/tomas/mysql-5.0-release into mysql.com:/data0/mysqldev/users/tomas/mysql-5.0-build configure.in: Auto merged	19 years ago
unknown	1c24fc3163	ha_ndbcluster.cc: Bug #25668 ndb: mysqld may core if cluster disconnected -- pTrans may be NULL, remove not needed usage of handler::ndb_err sql/ha_ndbcluster.cc: Bug #25668 ndb: mysqld may core if cluster disconnected -- pTrans may be NULL, remove not needed usage of handler::ndb_err	19 years ago
unknown	c7fb31ca10	Merge mysql.com:/home/svoj/devel/mysql/BUG24855/mysql-4.1-engines into mysql.com:/home/svoj/devel/mysql/BUG24855/mysql-5.0-engines myisam/mi_open.c: Auto merged	19 years ago
unknown	03df5c1c5b	Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1-build into kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build	19 years ago
unknown	5383f48796	Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build	19 years ago
unknown	dbf4dc3da0	myisam/mi_packrec.c Fix a compile error: Macro "DBUG_ENTER" must not follow an executable statement. myisam/mi_packrec.c: Fix a compile error: Macro "DBUG_ENTER" must not follow an executable statement.	19 years ago
unknown	329f6ba1cb	Merge bodhi.local:/opt/local/work/mysql-4.1-runtime into bodhi.local:/opt/local/work/mysql-5.0-runtime mysql-test/t/backup.test: Auto merged mysql-test/t/ps.test: Manual merge.	19 years ago
unknown	9cff68bb3b	A fix for the broken 4.1-runtime tree. mysql-test/t/backup.test: Backport a patch for sporadically failing myisam.test (and now ps.test) from 5.0. The cause was in backup.test not cleaning up tables in mysqltest-vardir/tmp after itself. mysql-test/t/ps.test: Add additional protection against possible failure in the middle of backup.test	19 years ago
unknown	d3cb7a68ea	Merge neptunus.(none):/home/msvensson/mysql/bug15518/my50-bug15518 into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint client/mysqltest.c: Auto merged	19 years ago
unknown	b461810d63	Update xid's as an effect of not closing the prepared statements all the time	19 years ago
unknown	adff49d95c	Don't reuse prepared statements if running with reconnect enabled	19 years ago
unknown	61a2861973	BUG#24855 - Crash mysqld 4.1.21 with corrupted tables Accessing fixed record format table with crashed key definition results in server/myisamchk segmentation fault. 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 fixed record format table with key segment that includes BLOB part (which is true only for tables with crashed key definition).	19 years ago
unknown	c5a168cfdf	Merge neptunus.(none):/home/msvensson/mysql/bug15518/my50-bug15518 into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint client/mysqltest.c: Auto merged libmysql/libmysql.c: Auto merged tests/mysql_client_test.c: SCCS merged	19 years ago
unknown	7b96503041	Bug#15518 Reusing a stmt that has failed during prepare does not clear error - Always reset error when calling mysql_stmt_prepare a second time - Set stmt->state to MYSQL_STMT_INIT_DONE before closing prepared stmt in server. - Add test to mysql_client_test - Remove mysql_stmt_close in mysqltest after each query - Close all open statements in mysqltest if disable_ps_protocol is called. client/mysqltest.c: Don't close the statement after each query - reprepare it in next query. When "disable_ps_protocol" is issued make sure to close all open statements. Otherwise the test for @@max_prepared_statements fails. But we also get a test that the statements that are open can be closed and reopened in the middle of the tests. libmysql/libmysql.c: Reset the last error every time mysql_stmt_prepare is called. Set state to MYSQL_STMT_INIT_DONE befoe closing it in the server. That way we will always have right status regardless of wheter close fails or not. tests/mysql_client_test.c: Add testcase for bug15518, re-prepare a previously prepare statement that has failed to prepare. Test also when connection to server has been lost inbetween. Change all assert to DIE_UNLESS so we get printout of line and an error message if it fails.	19 years ago
unknown	3b7d9850fa	configure.in : Fix a dependency problem for "extra/" which shows up only in RPM builds. configure.in: Some files in "extra/", notably "comp_err", depend on "dbug/libdbug.a", so "dbug/" must be a target before "extra/" is attempted. Fix this.	19 years ago
unknown	a05e735488	Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint mysql-test/lib/mtr_cases.pl: Auto merged	19 years ago
unknown	80818def47	Always use two masters for ndb tests	19 years ago
unknown	22f62e8a2f	Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime into mockturtle.local:/home/dlenev/src/mysql-5.0-bg20390-2	19 years ago
unknown	f71b6a8485	Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime into weblab.(none):/home/marcsql/TREE/mysql-5.0-6298	19 years ago
unknown	759a028c20	Adjusted results after merge 4.1 -> 5.0 for the patch fixing bug 24776.	19 years ago
unknown	095e25277e	Merge bk-internal.mysql.com:/home/bk/mysql-5.0 into bodhi.local:/opt/local/work/mysql-5.0-runtime	19 years ago
unknown	2ba119c658	Merge bodhi.local:/opt/local/work/mysql-4.1-runtime into bodhi.local:/opt/local/work/mysql-5.0-runtime sql/sql_parse.cc: Auto merged	19 years ago
unknown	15c834256d	A post-merge fix. sql/sql_parse.cc: A post-merge fix (broken alter_table.test): restore Svoj's fix for Bug#23404 lost during merge.	19 years ago
unknown	2c88731e62	Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into olga.mysql.com:/home/igor/mysql-5.0-opt	19 years ago
unknown	8c4acf37bb	Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into olga.mysql.com:/home/igor/mysql-5.0-opt	19 years ago
unknown	c797abae21	sql_select.cc: Fix for crashes on 64bit platforms after fixing bug#23417. sql/sql_select.cc: Fix for crashes on 64bit platforms after fixing bug#23417.	19 years ago
unknown	8db06e6921	Merge olga.mysql.com:/home/igor/mysql-4.1-opt into olga.mysql.com:/home/igor/mysql-5.0-opt mysql-test/r/range.result: Auto merged mysql-test/t/range.test: Auto merged sql/opt_range.h: Manual merge.	19 years ago
unknown	c0fd054645	Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into rakia.gmz:/home/kgeorge/mysql/autopush/B20420-5.0-opt sql/item_cmpfunc.h: Auto merged	19 years ago
unknown	a2ae17b1e1	BUG#20420: optimizer reports wrong keys on left join with IN The optimizer needs to evaluate whether predicates are better evaluated using an index. IN is one such predicate. To qualify an IN predicate must involve a field of the index on the left and constant arguments on the right. However whether an expression is a constant can be determined only by knowing the preceding tables in the join order. Assuming that only IN predicates with expressions on the right that are constant for the whole query qualify limits the scope of possible optimizations of the IN predicate (more specifically it doesn't allow the "Range checked for each record" optimization for such an IN predicate. Fixed by not pre-determining the optimizability of the IN predicate in the case when all right IN operands are not SQL constant expressions mysql-test/r/func_in.result: BUG#20420: optimizer reports wrong keys on left join with IN - test case mysql-test/t/func_in.test: BUG#20420: optimizer reports wrong keys on left join with IN - test case sql/item_cmpfunc.h: BUG#20420: optimizer reports wrong keys on left join with IN - cannot decide on the optimizability of a function without knowing the tables before it in the join order	19 years ago
unknown	7118b2c333	Raise version number after cloning 5.0.34	19 years ago
unknown	e4fefc40cf	Merge recycle.(none):/src/bug19424/my50-bug19424 into recycle.(none):/src/mysql-5.0-maint innobase/CMakeLists.txt: Auto merged	19 years ago
unknown	6f65e1bc5d	Bug#19424 InnoDB: Possibly a memory overrun of the buffer being freed (Win64) - Re-enabling optimization on all except innodb/mem/*.	19 years ago
unknown	6034857481	Merge trift2.:/MySQL/M50/mysql-5.0 into trift2.:/MySQL/M50/push-5.0 VC++Files/libmysqld/libmysqld.dsp: Auto merged VC++Files/mysql.dsw: Auto merged VC++Files/mysqldemb/mysqldemb.dsp: Auto merged VC++Files/sql/mysqld.dsp: Auto merged VC++Files/sql/mysqldmax.dsp: Auto merged innobase/buf/buf0buf.c: Auto merged innobase/dict/dict0dict.c: Auto merged innobase/fil/fil0fil.c: Auto merged innobase/ha/ha0ha.c: Auto merged innobase/include/hash0hash.h: Auto merged innobase/lock/lock0lock.c: Auto merged innobase/log/log0recv.c: Auto merged mysys/my_read.c: Auto merged scripts/make_binary_distribution.sh: Auto merged support-files/MySQL-shared-compat.spec.sh: Auto merged	19 years ago
unknown	96e5be8ce2	Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime into mockturtle.local:/home/dlenev/src/mysql-5.0-bg20390-2 sql/sql_select.cc: Auto merged	19 years ago
unknown	30393ec4cf	Merge bodhi.local:/opt/local/work/mysql-4.1-4968-to-push into bodhi.local:/opt/local/work/mysql-5.0-4968-to-push sql/mysql_priv.h: Auto merged sql/sql_class.h: Auto merged sql/sql_insert.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_table.cc: Use local	19 years ago
unknown	408d775249	Manual merge. mysql-test/r/sp.result: Auto merged mysql-test/t/sp.test: Auto merged sql/mysql_priv.h: 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_list.h: Auto merged sql/sql_show.cc: Auto merged sql/sql_yacc.yy: Auto merged	19 years ago
unknown	d470c233f7	Merge bk-internal.mysql.com:/home/bk/mysql-4.1-runtime into bodhi.local:/opt/local/work/mysql-4.1-4968-to-push sql/mysql_priv.h: Auto merged sql/sql_class.h: Auto merged sql/sql_insert.cc: Auto merged sql/sql_parse.cc: Manual merge. sql/sql_table.cc: Manual merge.	19 years ago
unknown	c6a8ce2dee	Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1-build into kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build	19 years ago
unknown	f7bba6e99d	Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build	19 years ago
unknown	810fc001d9	Fix for bug#20390 "SELECT FOR UPDATE does not release locks of untouched rows in full table scans". SELECT ... FOR UPDATE/LOCK IN SHARE MODE statements as well as UPDATE/DELETE statements which were executed using full table scan were not releasing locks on rows which didn't satisfy WHERE condition. This bug surfaced in 5.0 and affected NDB tables. (InnoDB tables intentionally don't support such unlocking in default mode). This problem occured because code implementing join didn't call handler::unlock_row() for rows which didn't satisfy part of condition attached to this particular table/level of nested loop. So we solve the problem adding this call. Note that we already had this call in place in 4.1 but it was lost (actually not quite correctly placed) when we have introduced nested joins. Also note that additional QA should be requested once this patch is pushed as interaction between handler::unlock_row() and many recent MySQL features such as subqueries, unions, views is not tested enough. mysql-test/r/ndb_lock.result: Enabled back part of the test that covers bug #20390 "SELECT FOR UPDATE does not release locks of untouched rows in full table scans". Adjusted test in such way that it now covers both execution paths in which we unlock non-matching rows inspected during table scan. mysql-test/t/ndb_lock.test: Enabled back part of the test that covers bug #20390 "SELECT FOR UPDATE does not release locks of untouched rows in full table scans". Adjusted test in such way that it now covers both execution paths in which we unlock non-matching rows inspected during table scan. sql/sql_select.cc: evaluate_join_record() should call handler::unlock_row() for records which don't satisfy condition which was pushed-down to this table/level of nested loop. We just put back the thing that we already have in 4.1 and which was lost when we have introduced nested joins.	19 years ago
unknown	b9dc0243a8	Fixed bug #24776 : an assertion abort in handler::ha_index_init for queries using 'range checked for each record'. The problem was fixed in 5.0 by the patch for bug 12291. This patch down-ported the corresponding code from 5.0 into QUICK_SELECT::init() and added a new test case. mysql-test/r/range.result: Added a test case for bug #24776. mysql-test/t/range.test: Added a test case for bug #24776. sql/opt_range.h: Fixed bug #24776: an assertion abort in handler::ha_index_init for queries using 'range checked for each record'. The problem was fixed in 5.0 by the patch for bug 12291. The patch for 4.1 down-ported the corresponding code from 5.0 into QUICK_SELECT::init().	19 years ago
unknown	fd4db68cc5	Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into olga.mysql.com:/home/igor/mysql-5.0-opt	19 years ago
unknown	35e363932c	Fixed bug #25398 : crash in a trigger when using trigger fields in a select list. The objects of the Item_trigger_field class inherited the implementations of the methods copy_or_same, get_tmp_table_item and get_tmp_table_field from the class Item_field while they rather should have used the default implementations defined for the base class Item. It could cause catastrophic problems for triggers that used SELECTs with select list containing trigger fields such as NEW.<table column> under DISTINCT. mysql-test/r/trigger.result: Added a test case for bug #25398. mysql-test/t/trigger.test: Added a test case for bug #25398.	19 years ago

... 2 3 4 5 6 ...

34623 Commits (ad7a4ebbe31d3bd6113e5f26107db6fffaddea1c) All Branches Search

34623 Commits (ad7a4ebbe31d3bd6113e5f26107db6fffaddea1c)

All Branches