mariadb

Tree: 2f863451b5

Author	SHA1	Message	Date
unknown	2f863451b5	Merge chilla.local:/home/mydev/mysql-4.1-bug26464 into chilla.local:/home/mydev/mysql-5.0-bug26464 mysql-test/t/merge.test: Auto merged mysql-test/r/merge.result: Bug#26464 - insert delayed + update + merge = corruption Manual merge from 4.1 sql/ha_myisammrg.h: Bug#26464 - insert delayed + update + merge = corruption Manual merge from 4.1	19 years ago
unknown	da9c659c81	Bug#26464 - insert delayed + update + merge = corruption Using INSERT DELAYED on MERGE tables could lead to table corruptions. The manual lists a couple of storage engines, which can be used with INSERT DELAYED. MERGE is not in this list. The attempt to try it anyway has not been rejected yet. This bug was not detected earlier as it can work under special circumstances. Most notable is low concurrency. To be safe, this patch rejects any attempt to use INSERT DELAYED on MERGE tables. mysql-test/r/merge.result: Bug#26464 - insert delayed + update + merge = corruption Added test result. mysql-test/t/merge.test: Bug#26464 - insert delayed + update + merge = corruption Added test. sql/ha_myisammrg.h: Bug#26464 - insert delayed + update + merge = corruption Removed HA_CAN_INSERT_DELAYED flag from table_flags(). The insert delayed thread upgrades the lock from the first entry in MYSQL_LOCK::locks only. Hence it is incapable to handle MERGE tables, which have as many entries in this array as they have MyISAM sub-tables.	19 years ago
unknown	af44be2d25	BUG#26238 - inserted delayed always inserts 0 for BIT columns INSERT DELAYED inserts garbage for BIT columns. When delayed thread clones TABLE object, it didn't adjusted bit_ptr to newly created record (though it correctly adjusts ptr and null_ptr). This is fixed by correctly adjusting bit_ptr when performing a clone. With this fix BIT values are stored correctly by INSERT DELAYED. mysql-test/r/delayed.result: A test case for BUG#26238. mysql-test/t/delayed.test: A test case for BUG#26238. sql/field.h: Added move_field() to Field_bit class. When moving a field, adjust bit_ptr also, which is specific to Field_bit class.	19 years ago
unknown	c5beed0346	Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 into bk-internal.mysql.com:/data0/bk/mysql-5.0-engines	19 years ago
unknown	da39e1d848	Raise version number after cloning 5.0.36	19 years ago
unknown	446672d42f	Fixed a bad merge. Got a duplicate symbol on OSX.	19 years ago
unknown	ba1de16601	Merge bk-internal.mysql.com:/home/bk/mysql-5.0 into chilla.local:/home/mydev/mysql-5.0-axmrg	19 years ago
unknown	9d66be72b0	Merge bk-internal.mysql.com:/home/bk/mysql-5.0 into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint sql/mysql_priv.h: Auto merged	19 years ago
unknown	daf7790c19	Merge chilla.local:/home/mydev/mysql-4.1-axmrg into chilla.local:/home/mydev/mysql-5.0-axmrg sql/item.cc: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_cmpfunc.h: Auto merged sql/sql_select.cc: Auto merged	19 years ago
unknown	4036bd9e03	Merge bk-internal.mysql.com:/home/bk/mysql-5.0 into chilla.local:/home/mydev/mysql-5.0-axmrg mysys/my_pthread.c: SCCS merged	19 years ago
unknown	c039eed82c	Post-merge fix	19 years ago
unknown	579c926de0	Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 into bk-internal.mysql.com:/data0/bk/mysql-5.0-opt BitKeeper/etc/gone: auto-union mysys/my_getopt.c: Auto merged sql/field.h: Auto merged sql/item.cc: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_cmpfunc.h: Auto merged sql/mysql_priv.h: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_select.cc: Auto merged sql/table.cc: Auto merged mysql-test/r/select.result: Manual merge mysql-test/t/select.test: Manual merge	19 years ago
unknown	035062b2a7	Bug#25807: LOAD DATA INFILE does not work with Pipes Showstopper and regression against 5.0.24. Previously, we ignored seek() errors (see Bug#22828) and let seek()s against pipes fail. Now, since we check that a seek didn't fail, and return without reading, this bug popped up. This restores the behavior for file-ish objects that could never be seek()ed. mysys/mf_iocache.c: If we detect early that the file is not tell()able, then we should assume that it's also not seek()able and therefore we should never set the (poorly named) "seek_not_done" flag so that we don't immedi- ately try to seek() when reading later. The problem was that tell() was returning -1, so when we read later, we needlessly tried to seek to position (unsigned long) -1 . Also, if we think we're supposed to seek to a position in a file and the file is un-tell()able, then abort.	19 years ago
unknown	af1f49b77e	Merge bk-internal.mysql.com:/data0/bk/mysql-4.1 into bk-internal.mysql.com:/data0/bk/mysql-4.1-opt	19 years ago
unknown	82e677b947	Merge bk-internal.mysql.com:/home/bk/mysql-4.1 into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint sql/item.cc: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_cmpfunc.h: Auto merged sql/sql_select.cc: Auto merged	19 years ago
unknown	6f628013e8	Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint sql/mysql_priv.h: Auto merged	19 years ago
unknown	e5c1656e97	Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0 into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint BitKeeper/etc/ignore: auto-union	19 years ago
unknown	faacf58091	Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint BitKeeper/etc/gone: auto-union mysys/my_getopt.c: Auto merged sql/sql_prepare.cc: Auto merged sql/table.cc: Auto merged	19 years ago
unknown	e656c582bc	Merge olga.mysql.com:/home/igor/mysql-5.0-opt into olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug26209 sql/sql_select.cc: Auto merged	19 years ago
unknown	4c2bc81ae7	Merge mysql.com:/home/hf/work/20691/my50-20691 into mysql.com:/home/hf/work/25492/my50-25492 sql/item.cc: Auto merged	19 years ago
unknown	e7e2550610	Merge bk@192.168.21.1:mysql-5.0-opt into mysql.com:/home/hf/work/25492/my50-25492	19 years ago
unknown	38fa86a12e	Merge bk@192.168.21.1:mysql-4.1-opt into mysql.com:/home/hf/work/25492/my41-25492	19 years ago
unknown	04b64f0034	Merge mysql.com:/home/hf/work/25492/my41-25492 into mysql.com:/home/hf/work/25492/my50-25492 libmysqld/lib_sql.cc: merging	19 years ago
unknown	fd76e14893	bug #25492 (Invalid deallocation in mysql_stmt_fetch) libmysqld/lib_sql.cc: code modified to prevent freeing of memory that wasn't malloc-ed. Now we check if MYSQL_STMT::result was used.	19 years ago
unknown	dfe66b93c8	Merge mysql.com:/home/gluh/MySQL/Merge/5.0 into mysql.com:/home/gluh/MySQL/Merge/5.0-opt	19 years ago
unknown	5e84eb5652	Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into mysql.com:/home/gluh/MySQL/Merge/5.0-opt	19 years ago
unknown	7ca34a798f	valgrind error fix	19 years ago
unknown	e307a46caf	Fixed MacOSX/Intel linking problem Common symbols with and without initialization cause the apple linker to exclude then from the list of global symbols.	19 years ago
unknown	1c28548966	Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint into mysql.com:/home/tnurnberg/24660/50-24660 sql/table.cc: Auto merged sql/unireg.cc: Auto merged	19 years ago
unknown	8a34c4bb78	Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-4.1-maint into mysql.com:/home/tnurnberg/24660/41-24660 sql/table.cc: Auto merged	19 years ago
unknown	91f684a5ad	Merge mysql.com:/home/tnurnberg/24660/41-24660 into mysql.com:/home/tnurnberg/24660/50-24660 mysql-test/r/type_enum.result: Auto merged sql/table.cc: Auto merged sql/unireg.cc: Auto merged	19 years ago
unknown	4dc7c1aa46	Bug#24660: "enum" field type definition problem ENUMs weren't allowed to have character 0xff, a perfectly good character in some locales. This was circumvented by mapping 0xff in ENUMs to ',', thereby prevent actual commas from being used. Now if 0xff makes an appearance, we find a character not used in the enum and use that as a separator. If no such character exists, we throw an error. Any solution would have broken some sort of existing behaviour. This solution should serve both fractions (those with 0xff and those with ',' in their enums), but WILL REQUIRE A DUMP/RESTORE CYCLE FROM THOSE WITH 0xff IN THEIR ENUMS. :-/ That is, mysqldump with their current server, and restore when upgrading to one with this patch. mysql-test/r/type_enum.result: Bug#24660: "enum" field type definition problem Show that enums can now contain NAMES_SEP_CHAR (0xff, which is a perfectly respectable char in some locales), or ',', or both. mysql-test/t/type_enum.test: Bug#24660: "enum" field type definition problem Show that enums can now contain NAMES_SEP_CHAR (0xff, which is a perfectly respectable char in some locales), or ',', or both. sql/table.cc: Bug#24660: "enum" field type definition problem Revert fix for Bug#20922. sql/unireg.cc: Bug#24660: "enum" field type definition problem Use a field-separator for ENUM-values that is not part of those values. If impossible, throw error.	19 years ago
unknown	2572c82621	Bug#24630 Subselect query crashes mysqld The crash happens because second filling of the same I_S table happens in case of subselect with order by. table->sort.io_cache previously allocated in create_sort_index() is deleted during second filling (function get_schema_tables_result). There are two places where I_S table can be filled: JOIN::exec and create_sort_index(). To fix the bug we should check if the table was already filled in one of these places and skip processing of the table in second. mysql-test/r/information_schema.result: test case mysql-test/t/information_schema.test: test case sql/mysql_priv.h: added new parameter 'executed_place' to function get_schema_tables_result() sql/sql_select.cc: added new parameter 'executed_place' to function get_schema_tables_result() sql/sql_show.cc: added more accurate check for cases when we need to refresh I_S table sql/table.cc: added more accurate check for cases when we need to refresh I_S table sql/table.h: added more accurate check for cases when we need to refresh I_S table	19 years ago
unknown	07f36668ae	bug #20691 (INSERT (DEFAULT) may insert garbage with NO DEFAULT NOT NULL field) Some fields (GEOMETRY first of all) can't be handled properly in this case at all. So we return an error in this case mysql-test/r/default.result: result fixed mysql-test/r/gis.result: result fixed mysql-test/t/default.test: VIEW test added mysql-test/t/gis.test: testcase added sql/item.cc: set_defaults() changed with the 'reset()'	19 years ago
unknown	1932ac9aae	Merge olga.mysql.com:/home/igor/mysql-5.0-opt into olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug26159	19 years ago
unknown	ac8e029357	Fixed bug #26209 . The function make_unireg_sortorder ignored the fact that any view field is represented by a 'ref' object. This could lead to wrong results for the queries containing both GROUP BY and ORDER BY clauses. mysql-test/r/view.result: Added a test case for bug #26209. mysql-test/t/view.test: Added a test case for bug #26209.	19 years ago
unknown	5e42c0de8d	sql_view.cc: Post fix for bug#12122. information_schema.result: Corrected test case after fixing bug#12122. sql/sql_view.cc: Post fix for bug#12122. mysql-test/r/information_schema.result: Corrected test case after fixing bug#12122.	19 years ago
unknown	a544b64f8d	Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into moonbone.local:/mnt/gentoo64/work/12122-bug-5.0-opt-mysql	19 years ago
unknown	3e4f834dfb	Fixed bug #26159 . A wrong order of statements in QUICK_GROUP_MIN_MAX_SELECT::reset caused a crash when a query with DISTINCT was executed by a loose scan for an InnoDB table that had been emptied. mysql-test/r/innodb_mysql.result: Added a test case for bug #26159. mysql-test/t/innodb_mysql.test: Added a test case for bug #26159. sql/opt_range.cc: Fixed bug #26159. A wrong order of statements in QUICK_GROUP_MIN_MAX_SELECT::reset caused a crash when a query with DISTINCT was executed by a loose scan for an InnoDB table that had been emptied. For an empty table quick_prefix_select->reset() was not called at all and thus some important initialization steps were missing.	19 years ago
unknown	308da65162	Bug#12122: The MERGE algorithm isn't applicable if the ORDER BY clause is present. A view created with CREATE VIEW ... ORDER BY ... cannot be resolved with the MERGE algorithm, even when no other part of the CREATE VIEW statement would require the view to be resolved using the TEMPTABLE algorithm. The check for presence of the ORDER BY clause in the underlying select is removed from the st_lex::can_be_merged() function. The ORDER BY list of the underlying select is appended to the ORDER BY list mysql-test/t/view.test: Added a test case for bug#12122: Views with ORDER BY can't be resolved using MERGE algorithm. mysql-test/r/view.result: Added a test case for bug#12122: Views with ORDER BY can't be resolved using MERGE algorithm. sql/sql_lex.cc: Bug#12122: Views with ORDER BY can't be resolved using MERGE algorithm. The st_lex::can_be_merged() function now allows views with the ORDER BY clause to be resolved using MERGE algorithm. The ORDER BY list of the view is appended to the ORDER BY list of the embedding select.	19 years ago
unknown	ce8c0ec29b	Merge olga.mysql.com:/home/igor/mysql-5.0-opt into olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug26017	19 years ago
unknown	7ab33d5070	Fixed bug #26017 . Objects of the class Item_equal contain an auxiliary member eval_item of the type cmp_item that is used only for direct evaluation of multiple equalities. Currently a multiple equality is evaluated directly only in the cases when the equality holds at most for one row in the result set. The compare collation of eval_item was determined incorectly. It could lead to returning incorrect results for some queries. mysql-test/r/join_outer.result: Added a test case for bug #26017. mysql-test/t/join_outer.test: Added a test case for bug #26017. sql/item_cmpfunc.cc: Fixed bug #26017. Objects of the class Item_equal contain an auxiliary member eval_item of the type cmp_item that is used only for direct evaluation of multiple equalities. Currently a multiple equality is evaluated directly only in the cases when the equality holds at most for one row in the result set. The compare collation of eval_item was determined incorrectly. It could lead to returning incorrect results for some queries. sql/item_cmpfunc.h: Fixed bug #26017. Removed the cmp_collation member from the Item_equal class as useless for the current implementation of the class.	19 years ago
unknown	dd6feec4f4	Bug#23170: LAST_INSERT_ID isn't reset to 0 in INSERT .. SELECT when no rows were inserted. The select_insert::send_eof() function now resets LAST_INSERT_ID variable if no rows were inserted. mysql-test/t/insert_select.test: Added a test case for bug#23170: LAST_INSERT_ID isn't reset to 0 in INSERT .. SELECT when no rows were inserted. mysql-test/r/insert_select.result: Added a test case for bug#23170: LAST_INSERT_ID isn't reset to 0 in INSERT .. SELECT when no rows were inserted. sql/sql_insert.cc: Bug#23170: LAST_INSERT_ID isn't reset to 0 in INSERT .. SELECT when no rows were inserted.The select_insert::send_eof() function now resets LAST_INSERT_ID variable if no rows were inserted.	19 years ago
unknown	2abc977de9	Merge trift2.:/MySQL/M50/mysql-5.0 into trift2.:/MySQL/M50/push-5.0	19 years ago
unknown	d4b4952f8b	Merge bk-internal:/home/bk/mysql-5.0-opt into macbook.gmz:/Users/kgeorge/mysql/work/B22344-5.0-opt	19 years ago
unknown	79c51f21cb	Addendum to fix of bug #22344 : removed dead code.	19 years ago
unknown	906a4842d5	make_binary_distribution.sh: Copy "ndb_size.tmpl" into binary distribution (Bug#24191) scripts/make_binary_distribution.sh: Copy "ndb_size.tmpl" into binary distribution (Bug#24191)	19 years ago
unknown	686be32eca	Merge siva.hindu.god:/home/tsmith/m/bk/50 into siva.hindu.god:/home/tsmith/m/bk/maint/50	19 years ago
unknown	43ada21fe1	Merge siva.hindu.god:/home/tsmith/m/bk/41 into siva.hindu.god:/home/tsmith/m/bk/maint/41 sql/sql_prepare.cc: Manual merge	19 years ago
unknown	762aa1c0bd	Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt into mysql.com:/home/gluh/MySQL/Merge/5.0-opt BitKeeper/etc/gone: auto-union mysys/my_getopt.c: Auto merged sql/item_func.cc: Auto merged sql/sql_prepare.cc: Auto merged	19 years ago

1 2 3 4 5 ...

34875 Commits (2f863451b5c5fe848d26f5f87ae27f13415805b3) All Branches Search

34875 Commits (2f863451b5c5fe848d26f5f87ae27f13415805b3)

All Branches