mariadb

Tree: 54ad7d88d0

Author	SHA1	Message	Date
unknown	54ad7d88d0	Merge mysql.com:/misc/mysql/31177/50-31177 into mysql.com:/misc/mysql/31177/51-31177 include/m_string.h: Auto merged include/my_getopt.h: Auto merged mysql-test/r/delayed.result: Auto merged mysql-test/r/innodb.result: Auto merged mysql-test/r/innodb_mysql.result: Auto merged mysql-test/r/key_cache.result: Auto merged mysql-test/r/ps.result: Auto merged mysql-test/r/type_bit.result: Auto merged mysql-test/r/type_bit_innodb.result: Auto merged mysql-test/t/variables.test: Auto merged sql/mysql_priv.h: Auto merged BitKeeper/deleted/.del-index_merge.result: Auto merged sql/set_var.cc: Auto merged mysql-test/r/variables.result: manual merge client/mysql.cc: manual merge client/mysqltest.c: manual merge mysql-test/r/subselect.result: manual merge mysys/my_getopt.c: manual merge sql/mysqld.cc: manual merge	18 years ago
unknown	89a208850a	Bug#31177: Server variables can't be set to their current values Default values of variables were not subject to upper/lower bounds and step, while setting variables was. Bounds and step are also applied to defaults now; defaults are corrected quietly, values given by the user are corrected, and a correction-warning is thrown as needed. Lastly, very large values could wrap around, starting from 0 again. They are bounded at the maximum value for the respective data-type now if no lower maximum is specified in the variable's definition. client/mysql.cc: correct maxima in options array client/mysqltest.c: adjust minimum for "sleep" option so default value is no longer out of bounds. include/m_string.h: ullstr() - the unsigned brother of llstr() include/my_getopt.h: Flag if we bounded the value (that is, correct anything aside from making value a multiple of block-size) mysql-test/r/delayed.result: We throw a warning now when we adjust out of range parameters. mysql-test/r/index_merge.result: We throw a warning now when we adjust out of range parameters. mysql-test/r/innodb.result: We throw a warning now when we adjust out of range parameters. mysql-test/r/innodb_mysql.result: We throw a warning now when we adjust out of range parameters. mysql-test/r/key_cache.result: We throw a warning now when we adjust out of range parameters. mysql-test/r/packet.result: We throw a warning now when we adjust out of range parameters. mysql-test/r/ps.result: We throw a warning now when we adjust out of range parameters. mysql-test/r/subselect.result: We throw a warning now when we adjust out of range parameters. mysql-test/r/type_bit.result: We throw a warning now when we adjust out of range parameters. mysql-test/r/type_bit_innodb.result: We throw a warning now when we adjust out of range parameters. mysql-test/r/variables.result: correct results: bounds and step apply to variables' default values, too mysql-test/t/variables.test: correct results: bounds and step apply to variables' default values, too mysys/my_getopt.c: - apply bounds/step to default values of variables (based on work by serg) - print complaints about incorrect values for variables (truncation etc., by requestion of consulting) - if no lower maximum is specified in variable definition, bound unsigned values at their maximum to prevent wrap-around - some calls to error_reporter had a \n, some didn't. remove \n from calls, let reporter-function handle it, so the default reporter behaves like that in mysqld sql/mysql_priv.h: correct RANGE_ALLOC_BLOCK_SIZE (cleared with monty) sql/mysqld.cc: correct maxima to correct data-type. correct minima where higher than default. correct range-alloc-block-size. correct inno variables so GET_* corresponds to actual variable's type. sql/set_var.cc: When the new value for a variable is out of bounds, we'll send the client a warning (but not if the value was simply not a multiple of 'blocksize'). sys_var_thd_ulong had this, sys_var_long_ptr_global didn't; broken out and streamlined to avoid duplication of code. strings/llstr.c: ullstr() - the unsigned brother of llstr()	18 years ago
unknown	f97b8e48b8	after merge fix	18 years ago
unknown	2b3e560622	Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt into mysql.com:/home/gluh/MySQL/Merge/5.1-opt mysql-test/r/type_decimal.result: Auto merged mysql-test/t/type_decimal.test: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged	18 years ago
unknown	9e6bb07d38	Bug#30889: filesort and order by with float/numeric crashes server There are two problems with ROUND(X, D) on an exact numeric (DECIMAL, NUMERIC type) field of a table: 1) The implementation of the ROUND function would change the number of decimal places regardless of the value decided upon in fix_length_and_dec. When the number of decimal places is not constant, this would cause an inconsistent state where the number of digits was less than the number of decimal places, which crashes filesort. Fixed by not allowing the ROUND operation to add any more decimal places than was decided in fix_length_and_dec. 2) fix_length_and_dec would allow the number of decimals to be greater than the maximium configured value for constant values of D. This led to the same crash as in (1). Fixed by not allowing the above in fix_length_and_dec. mysql-test/r/type_decimal.result: Bug#30889: Test result mysql-test/t/type_decimal.test: Bug#30889: Test case sql/item_func.cc: Bug#30889: - Avoid setting number of digits after decimal point (scale) higher than its maximum value. - Avoid increasing the number of decimal places in ::decimal_op sql/item_func.h: Bug#30889: Added comments to the declarations of Item_func_numhybrid::<type>_op family of methods.	18 years ago
unknown	91ca02ad8a	Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt into mysql.com:/home/gluh/MySQL/Merge/5.1-opt mysql-test/r/func_gconcat.result: Auto merged mysql-test/t/func_gconcat.test: Auto merged sql/item_sum.cc: Auto merged	18 years ago
unknown	d5b1d6205b	Bug#30897 GROUP_CONCAT returns extra comma on empty fields The fix is a copy of Martin Friebe's suggestion. added testing for no_appended which will be false if anything, including the empty string is in result mysql-test/r/func_gconcat.result: test result mysql-test/t/func_gconcat.test: test case sql/item_sum.cc: added testing for no_appended which will be False if anything, including the empty string is in result	18 years ago
unknown	6b75031242	Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt into mysql.com:/home/gluh/MySQL/Merge/5.1-opt mysql-test/r/information_schema.result: manual merge mysql-test/t/information_schema.test: manual merge	18 years ago
unknown	95e66de205	backported test case from 5.1	18 years ago
unknown	a056854ed5	Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt into mysql.com:/home/gluh/MySQL/Merge/5.1-opt	18 years ago
unknown	04eb31c6a7	Merge polly.(none):/home/kaa/src/opt/mysql-5.0-opt into polly.(none):/home/kaa/src/opt/mysql-5.1-opt sql/mysqld.cc: Null merge.	18 years ago
unknown	25939026a7	Fixed compile warnings introduced by the patch for bug #29131 .	18 years ago
unknown	7d9c59b7be	Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1 into mysql.com:/home/gluh/MySQL/Merge/5.1-opt	18 years ago
unknown	8a5f350ffb	Merge polly.(none):/home/kaa/src/opt/mysql-5.0-opt into polly.(none):/home/kaa/src/opt/mysql-5.1-opt mysql-test/r/variables.result: Auto merged mysql-test/t/variables.test: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_base.cc: Auto merged	18 years ago
unknown	33a8fdea12	Merge polly.(none):/home/kaa/src/opt/bug29131/my51-bug29131 into polly.(none):/home/kaa/src/opt/mysql-5.1-opt mysql-test/r/variables.result: Auto merged mysql-test/t/variables.test: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged	18 years ago
unknown	b52ab3bda5	Merge polly.(none):/home/kaa/src/opt/bug29131/my50-bug29131 into polly.(none):/home/kaa/src/opt/mysql-5.0-opt mysql-test/r/variables.result: Auto merged mysql-test/t/variables.test: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged	18 years ago
unknown	849dec4452	Many files: Error message numbers. mysql-test/suite/rpl/r/rpl_extraCol_innodb.result: Error message numbers. mysql-test/suite/rpl/r/rpl_extraCol_myisam.result: Error message numbers. mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result: Error message numbers.	18 years ago
unknown	f87732eae9	rpl_row_tabledefs_2myisam.result, sp.result, rpl_row_colSize.result: Error message numbers. mysql-test/suite/rpl/r/rpl_row_colSize.result: Error message numbers. mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result: Error message numbers. mysql-test/r/sp.result: Error message numbers.	18 years ago
unknown	38aa6e15c4	ha_archive.cc: Post-merge fix. storage/archive/ha_archive.cc: Post-merge fix.	18 years ago
unknown	639e35d031	Merge gleb.loc:/home/uchum/work/bk/PA/5.1-opt-31036-v into gleb.loc:/home/uchum/work/bk/5.1-opt mysql-test/r/archive.result: Auto merged mysql-test/t/archive.test: Auto merged storage/archive/azio.c: Auto merged	18 years ago
unknown	e2bd6c6b12	Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.1-opt into gleb.loc:/home/uchum/work/bk/5.1-opt mysql-test/r/type_decimal.result: Auto merged mysql-test/t/type_decimal.test: Auto merged sql/item.cc: Auto merged	18 years ago
unknown	5568084835	Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into gleb.loc:/home/uchum/work/bk/5.0-opt	18 years ago
unknown	321b1b6105	Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt into magare.gmz:/home/kgeorge/mysql/autopush/B30715-merged-5.1-opt	18 years ago
unknown	d8f35d1dc7	Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into magare.gmz:/home/kgeorge/mysql/autopush/B30715-merged-5.0-opt	18 years ago
unknown	130f9b9f50	Many files: Error message numbers. mysql-test/r/binlog_unsafe.result: Error message numbers. mysql-test/r/events_bugs.result: Error message numbers. mysql-test/r/events_trans.result: Error message numbers. mysql-test/r/sp_gis.result: Error message numbers. mysql-test/r/xml.result: Error message numbers. mysql-test/suite/rpl/r/rpl_incident.result: Error message numbers. mysql-test/suite/rpl/r/rpl_loaddata_fatal.result: Error message numbers. mysql-test/suite/rpl/r/rpl_udf.result: Error message numbers. mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result: Error message numbers. mysql-test/suite/ndb/r/ndb_dd_basic.result: Error message numbers. mysql-test/suite/ndb/r/ndb_dd_ddl.result: Error message numbers. mysql-test/suite/ndb/r/ndb_gis.result: Error message numbers. mysql-test/suite/ndb/r/ndb_row_format.result: Error message numbers. mysql-test/suite/ndb/r/ndb_single_user.result: Error message numbers.	18 years ago
unknown	b9ecbb7e5c	Fixed bug #31036 : Using order by with archive table crashes server. 1. Memory overrun have been fixed. 2. Server failure on assertion has been fixed. storage/archive/azio.c: Fixed bug #31036. The ha_archive::rnd_pos function has been modified to take into account the result of the azseek function and to return HA_ERR_CRASHED_ON_USAGE in case of seek error. storage/archive/ha_archive.cc: Fixed bug #31036. 1. Memory overrun has been fixed: maximal sizes of azio_stream::inbuf and azio_stream::outbuf was mixed. 2. Zero value of the output parameter of the azread function was incorrectly interpreted by the azseek function: after the first successful read attempt the execution of the azseek loop was interrupted and negative value was returned. (See ha_archive::rnd_pos: that negative value was silently ignored, and an incomplete data was used, for example, as a size of a packed record, and server failed with the assertion: "row_len <= record_buffer->length".) mysql-test/t/archive.test: Added test case for bug #31036. mysql-test/r/archive.result: Added test case for bug #31036.	18 years ago
unknown	0e076d4bb9	Merge gleb.loc:/home/uchum/work/bk/5.0-opt into gleb.loc:/home/uchum/work/bk/5.1-opt mysql-test/r/select.result: Auto merged mysql-test/r/type_decimal.result: Auto merged mysql-test/t/select.test: Auto merged mysql-test/t/type_decimal.test: Auto merged sql/item.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_yacc.yy: Auto merged sql/share/errmsg.txt: Merge with 5.0-opt	18 years ago
unknown	46b03c598d	Merge gleb.loc:/home/uchum/work/bk/PA/5.0-opt-31663 into gleb.loc:/home/uchum/work/bk/5.0-opt sql/sql_class.cc: Auto merged	18 years ago
unknown	07219e4d44	Merge polly.(none):/home/kaa/src/opt/bug29131/my50-bug29131 into polly.(none):/home/kaa/src/opt/bug29131/my51-bug29131 mysql-test/r/variables.result: Null merge. mysql-test/t/variables.test: Null merge. sql/mysql_priv.h: Null merge. sql/mysqld.cc: Null merge. sql/set_var.cc: Null merge. sql/set_var.h: Null merge.	18 years ago
unknown	efbc310af6	Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt into mysql.com:/scratch/tnurnberg/31662/51-31662 sql/sql_base.cc: Auto merged	18 years ago
unknown	ca126a9990	Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into mysql.com:/misc/mysql/31662/50-31662 sql/sql_base.cc: Auto merged	18 years ago
unknown	be4d062614	Merge mysql.com:/scratch/tnurnberg/31662/50-31662 into mysql.com:/scratch/tnurnberg/31662/51-31662 mysql-test/r/information_schema_db.result: Auto merged sql/sql_base.cc: Auto merged	18 years ago
unknown	0e700e1eeb	Bug#31662: 'null' is shown as type of fields for view with bad definer, breaks mysqldump SHOW FIELDS FROM a view with no valid definer was possible (since fix for Bug#26817), but gave NULL as a field-type. This led to mysqldump-ing of such views being successful, but loading such a dump with the client failing. Patch allows SHOW FIELDS to give data-type of field in underlying table. mysql-test/r/information_schema_db.result: Fix test results: SHOW FIELDS FROM a view with no valid DEFINER gives us the field-type of the underlying table now rather than NULL. sql/sql_base.cc: In the case of SHOW FIELDS FROM <view>, do not require a valid DEFINER for determining underlying data-type like we usually do. This is needed for mysqldump.	18 years ago
unknown	a71a829a72	Mimic a rename which Daniel already did in 6.0, to get rid of a name clash among deleted files on case-insignificant file systems. BitKeeper/deleted/.del-changelog-bleh: Rename: BitKeeper/deleted/.del-changelog -> BitKeeper/deleted/.del-changelog-bleh	18 years ago
unknown	974201c7e0	Fix for bug #29131 : SHOW VARIABLES reports variable 'log' but SET doesn't recognize it This is a 5.1 version of the patch. Problem: 'log' and 'log_slow_queries' were "fixed" variables, i.e. they showed up in SHOW VARIABLES, but could not be used in expressions like "select @@log". Also, using them in the SET statement produced an incorrect "unknown system variable" error. Solution: Since as of MySQL 5.1.12 one can enable or disable the general query log or the slow query log at runtime by changing values of general_log/slow_query_log, make 'log' and 'log_slow_queries" to be synonyms for 'general_log' and 'slow_query_log' respectively. This makes expressions using the '@@var' syntax backward compatible with 5.0 and SHOW VARIABLES output to be consistent with the SET statement. mysql-test/r/log_state.result: Added a test case for bug #29131. mysql-test/t/log_state.test: Added a test case for bug #29131. sql/set_var.cc: Made the 'log' and 'log_slow_queries' system variables to be synonyms for 'general_log' and 'slow_query_log'.	18 years ago
unknown	6eced1b857	Fix for bug #29131 : SHOW VARIABLES reports variable 'log' but SET doesn't recognize it This is a 5.0 version of the patch, it will be null-merged to 5.1 Problem: 'log' and 'log_slow_queries' were "fixed" variables, i.e. they showed up in SHOW VARIABLES, but could not be used in expressions like "select @@log". Also, using them in the SET statement produced an incorrect "unknown system variable" error. Solution: Make 'log' and 'log_slow_queries' read-only dynamic variables to make them available for use in expressions, and produce a correct error about the variable being read-only when used in the SET statement. mysql-test/r/variables.result: Added a test case for bug #29131. mysql-test/t/variables.test: Added a test case for bug #29131. sql/mysql_priv.h: Changed the type of opt_log and opt_slow_log to my_bool to align with the interfaces in set_var.cc sql/mysqld.cc: Changed the type of opt_log and opt_slow_log to my_bool to align with the interfaces in set_var.cc sql/set_var.cc: Made 'log' and 'log_slow_queries' to be read-only dynamic system variable, i.e. available for use in expressions with the @@var syntax. sql/set_var.h: Added a new system variable class representing a read-only boolean variable.	18 years ago
unknown	04ff9d4da0	Fixed bug #27695 : View should not be allowed to have empty or all space column names. The parser has been modified to check VIEW column names with the check_column_name function and to report an error on empty and all space column names (same as for TABLE column names). sql/sql_yacc.yy: Fixed bug #27695. The parser has been modified to check VIEW column aliases with the check_column_name function and to report an error on empty columns and all space columns (same as for TABLE column names). mysql-test/t/select.test: Updated test case for bug #27695. mysql-test/r/select.result: Updated test case for bug #27695.	18 years ago
unknown	ee8ab6d9e6	Merge magare.gmz:/home/kgeorge/mysql/work/B30715-merged-5.0-opt into magare.gmz:/home/kgeorge/mysql/work/B30715-merged-5.1-opt mysql-test/r/func_group.result: Auto merged mysql-test/r/type_decimal.result: Auto merged mysql-test/t/func_group.test: Auto merged mysql-test/t/type_decimal.test: Auto merged sql/item.cc: Auto merged sql/opt_sum.cc: merge bug 30715 to 5.1-opt	18 years ago
unknown	e66f7e1d36	Merge magare.gmz:/home/kgeorge/mysql/work/B30715-5.0-opt into magare.gmz:/home/kgeorge/mysql/work/B30715-merged-5.0-opt	18 years ago
unknown	e2433cbcaa	Bug #30715 : Assertion failed: item_field->field->real_maybe_null(), file .\opt_sum.cc, line The optimizer pre-calculates the MIN/MAX values for queries like SELECT MIN(kp_k) WHERE kp_1 = const AND ... AND kp_k-1 = const when there is a key over kp_1...kp_k In doing so it was not checking correctly nullability and there was a superfluous assert(). Fixed by making sure that the field can be null before checking and taking out the wrong assert(). . Introduced a correct check for nullability The MIN(field) can return NULL when all the row values in the group are NULL-able or if there were no rows. Fixed the assertion to reflect the case when there are no rows. mysql-test/r/func_group.result: Bug #30715: test case mysql-test/t/func_group.test: Bug #30715: test case sql/opt_sum.cc: Bug #30715: correct nullability check for MIN/MAX pre-calculation over index.	18 years ago
unknown	f78be6c8e9	result fix	18 years ago
unknown	6a8e10d2ce	Post-merge fixes	18 years ago
unknown	4ea9a3d5cd	Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into mysql.com:/home/psergey/mysql-5.0-bug31450 sql/item.cc: Auto merged mysql-test/r/type_decimal.result: Post-merge fixes mysql-test/t/type_decimal.test: Post-merge fixes	18 years ago
unknown	53dac1ee1a	BUG#31450: Query causes error 1048 - Let Item::save_in_field() call set_field_to_null_with_conversions() for decimal type, like this is done for the other item result types. mysql-test/r/type_decimal.result: BUG#31450: Query causes error 1048: testcase mysql-test/t/type_decimal.test: BUG#31450: Query causes error 1048: testcase	18 years ago
unknown	b987945db6	result fix	18 years ago
unknown	e085211d4d	Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt into mysql.com:/home/gluh/MySQL/Merge/5.1-opt client/mysqldump.c: Auto merged include/config-win.h: Auto merged libmysql/libmysql.c: Auto merged mysql-test/r/func_sapdb.result: Auto merged mysql-test/r/type_decimal.result: Auto merged mysql-test/r/variables.result: Auto merged mysql-test/t/type_datetime.test: Auto merged mysql-test/t/type_decimal.test: Auto merged mysql-test/t/variables.test: Auto merged sql/field.cc: Auto merged sql/item.cc: Auto merged sql/item_func.cc: Auto merged sql/item_sum.cc: Auto merged sql/item_timefunc.h: Auto merged sql/mysql_priv.h: Auto merged sql/set_var.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_yacc.yy: Auto merged storage/innobase/handler/ha_innodb.cc: Auto merged storage/myisam/sort.c: Auto merged tests/mysql_client_test.c: Auto merged mysql-test/r/type_datetime.result: after merge fix	18 years ago
unknown	fa0e1d6b6b	Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt into mysql.com:/home/gluh/MySQL/Merge/5.0-opt	18 years ago
unknown	985e4a6437	after merge fix	18 years ago
unknown	95a8bb20fb	Merge mysql.com:/home/gluh/MySQL/Merge/5.1 into mysql.com:/home/gluh/MySQL/Merge/5.1-opt client/client_priv.h: Auto merged client/mysqldump.c: Auto merged include/config-win.h: Auto merged libmysql/libmysql.c: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/create.result: Auto merged mysql-test/r/func_sapdb.result: Auto merged mysql-test/r/information_schema.result: Auto merged mysql-test/r/variables.result: Auto merged mysql-test/t/information_schema.test: Auto merged mysql-test/t/variables.test: Auto merged sql/field.cc: Auto merged sql/ha_partition.cc: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged sql/item_sum.cc: Auto merged sql/item_timefunc.h: Auto merged sql/mysql_priv.h: Auto merged sql/protocol.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_insert.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/table.cc: Auto merged storage/innobase/handler/ha_innodb.cc: Auto merged storage/myisam/sort.c: Auto merged tests/mysql_client_test.c: Auto merged mysql-test/r/query_cache.result: manual merge mysql-test/include/mix1.inc: manual merge mysql-test/r/innodb_mysql.result: manual merge mysql-test/r/type_datetime.result: manual merge mysql-test/r/type_decimal.result: manual merge mysql-test/t/query_cache.test: manual merge mysql-test/t/type_datetime.test: manual merge mysql-test/t/type_decimal.test: manual merge sql/item.cc: manual merge	18 years ago
unknown	8479eb1db7	Merge mysql.com:/home/gluh/MySQL/Merge/5.0 into mysql.com:/home/gluh/MySQL/Merge/5.0-opt client/mysqldump.c: Auto merged include/config-win.h: Auto merged libmysql/libmysql.c: Auto merged myisam/sort.c: Auto merged mysql-test/r/func_sapdb.result: Auto merged mysql-test/r/variables.result: Auto merged mysql-test/t/variables.test: Auto merged sql/field.cc: Auto merged sql/ha_innodb.cc: Auto merged sql/item_func.cc: Auto merged sql/item_sum.cc: Auto merged sql/item_timefunc.h: Auto merged sql/mysql_priv.h: Auto merged sql/set_var.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_yacc.yy: Auto merged tests/mysql_client_test.c: Auto merged mysql-test/r/type_datetime.result: manual merge mysql-test/r/type_decimal.result: manual merge mysql-test/t/type_datetime.test: manual merge mysql-test/t/type_decimal.test: manual merge sql/item.cc: manual merge	18 years ago

1 2 3 4 5 ...

50580 Commits (54ad7d88d03c940330510e0870e4bce17327a952) All Branches Search

50580 Commits (54ad7d88d03c940330510e0870e4bce17327a952)

All Branches