mariadb

Tree: 8becfb5fdb

Author	SHA1	Message	Date
unknown	8becfb5fdb	item_cmpfunc.cc, field.cc, sql_insert.cc, sql_class.h, sql_yacc.yy: Post merge fix. sql/sql_yacc.yy: Post merge fix. sql/sql_insert.cc: Post merge fix. sql/sql_class.h: Post merge fix. sql/item_cmpfunc.cc: Post merge fix. sql/field.cc: Post merge fix.	19 years ago
unknown	237a1d22f1	Merge moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql into moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql mysql-test/r/gis.result: Auto merged mysql-test/r/subselect.result: Auto merged mysql-test/t/gis.test: Auto merged mysql-test/t/subselect.test: Auto merged sql/field.cc: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/item_cmpfunc.cc: Auto merged sql/sql_insert.cc: Auto merged mysql-test/include/mix1.inc: Manually merged mysql-test/r/innodb_mysql.result: Manually merged mysql-test/r/type_datetime.result: Manually merged mysql-test/t/type_datetime.test: Manually merged sql/field.h: Manually merged sql/sql_select.cc: Manually merged sql/sql_yacc.yy: Manually merged tests/mysql_client_test.c: Manually merged	19 years ago
unknown	a7f5132591	Merge bk@192.168.21.1:mysql-5.1-opt into mysql.com:/home/hf/work/28333/my51-28333	19 years ago
unknown	f65930a9e2	compilation error fix mysql-test/include/have_archive.inc: test fix(according to new 'support' column values) mysql-test/include/have_blackhole.inc: test fix(according to new 'support' column values) mysql-test/include/have_csv.inc: test fix(according to new 'support' column values) mysql-test/include/have_exampledb.inc: test fix(according to new 'support' column values) mysql-test/include/have_federated_db.inc: test fix(according to new 'support' column values) mysql-test/include/have_innodb.inc: test fix(according to new 'support' column values) mysql-test/include/have_multi_ndb.inc: test fix(according to new 'support' column values) mysql-test/include/have_ndb.inc: test fix(according to new 'support' column values) mysql-test/r/information_schema.result: result fix	19 years ago
unknown	c3684150a2	Merge mysql.com:/home/hf/work/28333/my50-28333 into mysql.com:/home/hf/work/28333/my51-28333 client/mysqltest.c: Auto merged	19 years ago
unknown	99b4321ac5	Bug #28333 Test "flush" tries to create a new thread - on only one platform on PPC/Debian Linux default stack size for a thread is too big. As we use default thread settings in mysqltest, the thread creation fails if we create lots of threads (as it happens in flush.test). So now stack size is explicitly specified for the mysqltest client/mysqltest.c: Bug #28333 Test "flush" tries to create a new thread - on only one platform specify appropriate stack size for the 'query' thread	19 years ago
unknown	4c2f2ac5e7	Bug#27684 undocumented difference between SHOW ENGINES and I_S.ENGINES Changed SHOW ENGINES to work in the same way as I_S.ENGINES. For this: removed the functions mysqld_show_storage_engines and show_handlerton, and made SHOW ENGINES work via the common function iter_schema_engines. There in no test case because an engine (except of MyISAM) may be not compiled or disabled which may affect the test result. sql/sql_parse.cc: Changed SHOW ENGINES to work in the same way as I_S.ENGINES. sql/sql_show.cc: Changed SHOW ENGINES to work in the same way as I_S.ENGINES. For this: removed the functions mysqld_show_storage_engines and show_handlerton, and made SHOW ENGINES work via the common function iter_schema_engines.	19 years ago
unknown	88d5c0146b	Correction to remove compilee warnings and compiler errors on Windows.	19 years ago
unknown	5a148ba5fa	Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into moonbone.local:/mnt/gentoo64/work/28763-bug-5.0-opt-mysql	19 years ago
unknown	18310fabf4	Bug#28763: Selecting geometry fields in UNION caused server crash. This bug was introduced by the fix for the bug#27300. In this fix a section of code was added to the Item::tmp_table_field_from_field_type method. This section intended to create Field_geom fields for the Item_geometry_func class and its descendants. In order to get the geometry type of the current item it casted "this" to the Item_geometry_func* type. But the Item::tmp_table_field_from_field_type method is also used for creation of fields for UNION and in this case this method is called for an object of the Item_type_holder class and the cast to the Item_geometry_func* type causes a server crash. Now the Item::tmp_table_field_from_field_type method correctly works when it's called for both the Item_type_holder and the Item_geometry_func classes. The new geometry_type variable is added to the Item_type_holder class. The new method called get_geometry_type is added to the Item_field and the Field classes. It returns geometry type from the field for the Item_field and the Field_geom classes and fails an assert for other Field descendants. sql/field.h: Bug#28763: Selecting geometry fields in UNION caused server crash. The new method called get_geometry_type is added to the Field class. It returns geometry type of the field for the Field_geom class and fails an assert for other Field descendants. sql/item.cc: Bug#28763: Selecting geometry fields in UNION caused server crash. Now the Item::tmp_table_field_from_field_type method correctly works when it's called for both the Item_type_holder and the Item_geometry_func classes. mysql-test/r/gis.result: Added a test case for the bug#28763: Selecting geometry fields in UNION caused server crash. mysql-test/t/gis.test: Added a test case for the bug#28763: Selecting geometry fields in UNION caused server crash. sql/item.h: Bug#28763: Selecting geometry fields in UNION caused server crash. The new method called get_geometry_type is added to the Item_field class. It returns geometry type from the field. The new geometry_type variable is added to the Item_type_holder class.	19 years ago
unknown	2ad832032b	Merge olga.mysql.com:/home/igor/mysql-5.0-opt into olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug28449	19 years ago
unknown	a42a97774f	bug #28309 First insert violates UNIQUE constraint - was "memory" table empty? If we have lower_case_table_names == 2 (usually on case insensitive file systems) we sometimes make 'homedir' part of the path sent to the handler into lowercase. So in this case HEAP engine couldn't properly find and remove HP_SHARE, what caused the bug. sql/handler.cc: bug #28309 First insert violates UNIQUE constraint - was "memory" table empty? we don't turn homedirectory part of the path into lowercase sql/mysql_priv.h: bug #28309 First insert violates UNIQUE constraint - was "memory" table empty? mysql_data_home_len introduced sql/mysqld.cc: bug #28309 First insert violates UNIQUE constraint - was "memory" table empty? mysql_data_home_len value is set with the mysql_data_home	19 years ago
unknown	89d96dd48e	Fixed bug #28449 : a crash may happen at some rare conditions when a temporary table has grown out of heap memory reserved for it and the remaining disk space is not big enough to store the table as a MyISAM table. The crash happens because the function create_myisam_from_heap does not handle safely the mem_root structure associated with the converted table in the case when an error has occurred. sql/sql_select.cc: Fixed bug #28449: a crash may happen at some rare conditions when a temporary table has grown out of heap memory reserved for it and the remaining disk space is not big enough to store the table as a MyISAM table. The crash happens because the function create_myisam_from_heap does not handle safely the mem_root structure associated with the converted table in the case when an error has occurred. As it's hard to create a sitiation that would throw an error a special code has been added that raises an error for a newly created test called error_simulation. mysql-test/r/error_simulation.result: New BitKeeper file ``mysql-test/r/error_simulation.result'' Added a test case for bug #28449. mysql-test/t/error_simulation-master.opt: New BitKeeper file ``mysql-test/t/error_simulation-master.opt'' mysql-test/t/error_simulation.test: New BitKeeper file ``mysql-test/t/error_simulation.test'' Added a test case for bug #28449.	19 years ago
unknown	81d32d9a87	Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into magare.gmz:/home/kgeorge/mysql/autopush/B28878-5.0-opt	19 years ago
unknown	970b26e679	Bug#28878: InnoDB tables with UTF8 character set and indexes cause wrong result for DML When making key reference buffers over CHAR fields whitespace (0x20) must be used to fill in the remaining space in the field's buffer. This is what Field_string::store() does. Fixed Field_string::get_key_image() to do the same. mysql-test/r/innodb_mysql.result: Bug#28878: test case mysql-test/t/innodb_mysql.test: Bug#28878: test case sql/field.cc: Bug#28878: Fill with space instead of binary zeros.	19 years ago
unknown	8d0d27b5a4	Bug#28505: mysql_affected_rows() may return wrong result if CLIENT_FOUND_ROWS flag is set. When the CLIENT_FOUND_ROWS flag is set then the server should return found number of rows independently whether they were updated or not. But this wasn't the case for the INSERT statement which always returned number of rows that were actually changed thus providing wrong info to the user. Now the select_insert::send_eof method and the mysql_insert function are sending the number of touched rows if the CLIENT_FOUND_ROWS flag is set. tests/mysql_client_test.c: Added a test case for the bug#28505: mysql_affected_rows() may return wrong result if CLIENT_FOUND_ROWS flag is set. sql/sql_insert.cc: Bug#28505: mysql_affected_rows() may return wrong result if CLIENT_FOUND_ROWS flag is set. Now the select_insert::send_eof method and the mysql_insert function are sending the number of touched rows if the CLIENT_FOUND_ROWS flag is set.	19 years ago
unknown	64c6a91d40	after merge fix	19 years ago
unknown	98c7c87e45	Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt into mysql.com:/home/gluh/MySQL/Merge/5.0-opt mysql-test/r/subselect.result: Auto merged sql/sql_yacc.yy: Auto merged mysql-test/t/subselect.test: manual merge	19 years ago
unknown	593afb6a73	Bug#28553 mysqld crash in "purge master log before(select time from information_schema)" forbid the use of subselect in PURGE LOGS BEFORE command mysql-test/r/subselect.result: test result mysql-test/t/subselect.test: test case sql/sql_yacc.yy: forbid the use of subselect in PURGE LOGS BEFORE command	19 years ago
unknown	62e88b779c	Bug#28007 Wrong default value for I_S.PARTITIONS.PARTITION_COMMENT The value of the PARTITION_COMMENT column is an empty string if there is no partition comment. mysql-test/r/information_schema_part.result: result fix mysql-test/r/ndb_dd_alter.result: result fix mysql-test/r/ndb_dd_backuprestore.result: result fix mysql-test/r/ndb_partition_range.result: result fix sql/sql_show.cc: The value of the PARTITION_COMMENT column is an empty string if there is no partition comment.	19 years ago
unknown	64255a3787	Bug#28580 Repeatation of status variables removed duplicated variable declarations mysql-test/r/variables.result: test result mysql-test/t/variables.test: test case sql/set_var.cc: removed duplicated variable declarations	19 years ago
unknown	a6f7f8a4fd	merging fix	19 years ago
unknown	0304a13ee7	Bug#28778: Wrong result of BETWEEN when comparing a DATETIME field with an integer constants. This bug is introduced by the fix for bug#16377. Before the fix the Item_func_between::fix_length_and_dec method converted the second and third arguments to the type of the first argument if they were constant and the first argument is of the DATE/DATETIME type. That approach worked well for integer constants and sometimes produced bad result for string constants. The fix for the bug#16377 wrongly removed that code at all and as a result of this the comparison of a DATETIME field and an integer constant was carried out in a wrong way and sometimes led to wrong result sets. Now the Item_func_between::fix_length_and_dec method converts the second and third arguments to the type of the first argument if they are constant, the first argument is of the DATE/DATETIME type and the DATETIME comparator isn't applicable. sql/item_cmpfunc.cc: Bug#28778: Wrong result of BETWEEN when comparing a DATETIME field with an integer constants. Now the Item_func_between::fix_length_and_dec method converts the second and third arguments to the type of the first argument if they are constant, the first argument is of the DATE/DATETIME type and the DATETIME comparator isn't applicable. mysql-test/r/type_datetime.result: Added a test case for the bug#28778: Wrong result of BETWEEN when comparing a DATETIME field with an integer constants. mysql-test/t/type_datetime.test: Added a test case for the bug#28778: Wrong result of BETWEEN when comparing a DATETIME field with an integer constants.	19 years ago
unknown	2c3f615738	Merge bk@192.168.21.1:mysql-5.1-opt into mysql.com:/home/hf/work/28477/my51-28477 sql/sql_table.cc: Auto merged sql/table.cc: Auto merged sql/table.h: Auto merged	19 years ago
unknown	467d3669cf	Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt into magare.gmz:/home/kgeorge/mysql/autopush/B28488-5.1-opt sql/mysql_priv.h: Auto merged sql/sql_partition.cc: Auto merged sql/sql_table.cc: Auto merged	19 years ago
unknown	fce63f8f3f	Bug #28488 : Incorrect information in file: './test/t1_test#.frm' While executing ALTER TABLE ... PARTITION the server uses a temporary "shadow" table to create the updated table. This shadow table then gets renamed as the original table. The shadow table was not prefixed with the special prefix that marks temporary tables so it was picked up by SHOW TABLE STATUS. Fixed by isolating the code to create the shadow table name in a separate function and prefixing the shadow table name with the special prefix to exclude it from the list of user tables. See bug 18775 and WL1324 for details. mysql-test/r/partition.result: Bug #28488: test case mysql-test/t/partition.test: Bug #28488: test case sql/mysql_priv.h: Bug #28488: prefix shadow file with the temp prefix sql/sql_partition.cc: Bug #28488: prefix shadow file with the temp prefix sql/sql_table.cc: Bug #28488: prefix shadow file with the temp prefix	19 years ago
unknown	ddf48bed99	Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-opt into olga.mysql.com:/home/igor/mysql-5.1-opt mysql-test/mysql-test-run.pl: Auto merged sql/udf_example.c: Auto merged	19 years ago
unknown	4be1d7869d	Post-merge fix.	19 years ago
unknown	5a19274ea8	Merge olga.mysql.com:/home/igor/mysql-5.0-opt into olga.mysql.com:/home/igor/mysql-5.1-opt-merge include/thr_lock.h: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/sp.result: Auto merged mysql-test/r/trigger.result: Auto merged mysql-test/t/sp.test: Auto merged mysql-test/t/strict.test: Auto merged mysql-test/t/subselect3.test: Auto merged mysql-test/t/trigger.test: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/sp_head.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_select.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_update.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/udf_example.c: Auto merged mysql-test/r/subselect.result: Manual merge. mysql-test/t/subselect.test: Manual merge. sql/sql_view.cc: Manual merge.	19 years ago
unknown	e65eb0e447	Post-merge fix.	19 years ago
unknown	e409a8a5c0	Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into dl145s.mysql.com:/dev/shm/mhansson/my50-bug27741 mysql-test/mysql-test-run.pl: Auto merged	19 years ago
unknown	f4caa3025a	Merge olga.mysql.com:/home/igor/mysql-5.1 into olga.mysql.com:/home/igor/mysql-5.1-opt-merge mysql-test/r/alter_table.result: Auto merged mysql-test/r/create.result: Auto merged mysql-test/r/innodb_mysql.result: Auto merged mysql-test/r/sp.result: Auto merged mysql-test/r/user_var.result: Auto merged mysql-test/t/alter_table.test: Auto merged mysql-test/t/sp.test: Auto merged mysql-test/t/strict.test: Auto merged mysql-test/t/subselect3.test: Auto merged sql/field.h: Auto merged sql/handler.h: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged sql/mysqld.cc: Auto merged sql/sp_head.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_select.cc: Auto merged sql/sql_update.cc: Auto merged mysql-test/r/ps_2myisam.result: Manual merge. mysql-test/r/ps_3innodb.result: Manual merge. mysql-test/r/ps_4heap.result: Manual merge. mysql-test/r/ps_5merge.result: Manual merge. mysql-test/r/ps_7ndb.result: Manual merge. sql/sql_table.cc: Manual merge. sql/sql_view.cc: Manual merge.	19 years ago
unknown	272a54568e	Merge bk-internal:/home/bk/mysql-5.1-opt into dl145s.mysql.com:/dev/shm/mhansson/my51-bug27741-mpush	19 years ago
unknown	92fb5da372	item_func.h, item_func.cc: Post merge fix for the bug#28494. sql/item_func.h: Post merge fix for the bug#28494. sql/item_func.cc: Post merge fix for the bug#28494.	19 years ago
unknown	7b8af0f555	Merge olga.mysql.com:/home/igor/mysql-5.0-opt into olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug28728	19 years ago
unknown	687191a078	Merge moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql into moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql mysql-test/r/user_var.result: Auto merged mysql-test/t/user_var.test: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged	19 years ago
unknown	eb958affe3	Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql	19 years ago
unknown	e19dcfa91f	user_var.result: Corrected test case result for the bug#28494. item_func.h, item_func.cc: Corrected function names after fix for the bug#28494. mysql-test/r/user_var.result: Corrected test case result for the bug#28494. sql/item_func.h: Corrected function names after fix for the bug#28494. sql/item_func.cc: Corrected function names after fix for the bug#28494.	19 years ago
unknown	a6f1d558f1	Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql	19 years ago
unknown	4ef028600a	user_var.result, user_var.test: Extended test case for the bug#28494. mysql-test/t/user_var.test: Extended test case for the bug#28494. mysql-test/r/user_var.result: Extended test case for the bug#28494.	19 years ago
unknown	6c403ec920	Merge olga.mysql.com:/home/igor/mysql-5.0-opt into olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug28728	19 years ago
unknown	b313fe1352	Merge bk-internal:/home/bk/mysql-5.0-opt into macbook.gmz:/Users/kgeorge/mysql/work/B26162-5.0-opt mysql-test/r/trigger.result: Auto merged mysql-test/t/trigger.test: Auto merged sql/sql_base.cc: Auto merged sql/sql_yacc.yy: Auto merged	19 years ago
unknown	f9a41f9f35	Bug #26162 : Trigger DML ignores low_priority_updates setting The value of "low-priority-updates" option and the LOW PRIORITY prefix was taken into account at parse time. This caused triggers (among others) to ignore this flag (if supplied for the DML statement). Moved reading of the LOW_PRIORITY flag at run time. Fixed an incosistency when handling SET GLOBAL LOW_PRIORITY_UPDATES : now it is in effect for delayed INSERTs. Tested by checking the effect of LOW_PRIORITY flag via a trigger. include/thr_lock.h: Bug #26162: moved reading of the LOW PRIORITY flag at run time mysql-test/r/trigger.result: Bug #26162: test case mysql-test/t/trigger.test: Bug #26162: test case sql/set_var.cc: Bug #26162: fixed the handling of the "low-priority-updates" option sql/sql_base.cc: Bug #26162: moved reading of the LOW PRIORITY flag at run time sql/sql_yacc.yy: Bug #26162: moved reading of the LOW PRIORITY flag at run time	19 years ago
unknown	8b0afa63fb	Merge moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql into moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql sql/item_func.cc: Manually merged	19 years ago
unknown	04e2d15257	Merge olga.mysql.com:/home/igor/mysql-5.0-opt into olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug28728	19 years ago
unknown	8ded1e817b	Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql	19 years ago
unknown	684653b89e	item_func.cc: Post fix for bug#28494. The Item_func_set_user_var::check method now silently doesn't use result_field if it isn't defined. sql/item_func.cc: Post fix for bug#28494. The Item_func_set_user_var::check method now silently doesn't use result_field if it isn't defined.	19 years ago
unknown	45714d35ad	Merge moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql into moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql sql/item_func.cc: Auto merged sql/item_func.h: Auto merged mysql-test/r/user_var.result: Manual merge mysql-test/t/user_var.test: Manual merge	19 years ago
unknown	5c23a1c7f8	Merge olga.mysql.com:/home/igor/mysql-5.0-opt into olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug28728	19 years ago
unknown	bce9860dcb	Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql	19 years ago

1 2 3 4 5 ...

46968 Commits (8becfb5fdba82271a65d1f7f4fdb8cb7cc2bc842) All Branches Search

46968 Commits (8becfb5fdba82271a65d1f7f4fdb8cb7cc2bc842)

All Branches