1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-21 06:21:35 +03:00
Commit Graph

19274 Commits

Author SHA1 Message Date
unknown
090bc713a4 olap.test, olap.result:
Added test case for bug #4767.
item_sum.cc:
  Added a correct setting of the maybe_null flag for a copy of 
  an Item_sum object where the argument was a field of an inner table
  in an outer join read from a temporary table.
  It's part of the fix for bug #4767.
sql_select.cc:
  Made change_refs_to_tmp_fields work correctly
  for test case of bug #4767 where Item_sum::get_tmp_table_item
  failed to build a correct copy of an Item_sum object referring
  to a field in a temporary table.
  It looks like a hack yet.


sql/sql_select.cc:
  Made change_refs_to_tmp_fields work correctly
  for test case of bug #4767 where Item_sum::get_tmp_table_item
  failed to build a copy of an Item_sum object referring
  to a field in  a temporary table.
  It looks like a hack yet.
sql/item_sum.cc:
  Added a correct setting of maybe_null flag for copy of a
  Item_sum object where there argument is a field of nullable table
  read from the temporary table.
  It's part of the fix for bug #4767.
mysql-test/r/olap.result:
  Added test case for bug #4767.
mysql-test/t/olap.test:
  Added test case for bug #4767.
2004-08-12 00:02:29 -07:00
unknown
00c547d3ab Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1-ndb
2004-08-12 08:57:15 +02:00
unknown
a7d2c573f1 A fix (Bug #4878: Service crashes on query execution) 2004-08-12 11:28:39 +05:00
unknown
0ce3a41e71 Bug#5005 collation cp852_bin makes server crash
ctype-simple.c:
  Check that unicode map was loaded
cp852.xml:
  Missing cp852_bin was added.


sql/share/charsets/cp852.xml:
  Missing cp852_bin was added.
strings/ctype-simple.c:
  Check that unicode map was loaded
2004-08-12 10:46:16 +05:00
unknown
bb10ca26ec A fix (Bug#4898: User privileges depending on ORDER BY Settings of table db) 2004-08-12 09:41:35 +05:00
unknown
acf5df3a6d Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into pcgem.rdg.cyberkinetica.com:/usr/home/acurtis/work/bug4411


BitKeeper/etc/logging_ok:
  auto-union
2004-08-11 23:26:44 +01:00
unknown
4f08c4b726 Bug#4411
Fix for server hang bug


mysql-test/r/heap.result:
  Bug#4411
    Test for server hang bug
mysql-test/t/heap.test:
  Bug#4411
    Test for server hang bug
sql/opt_sum.cc:
  Bug#4411
    Allow code to exit the loop.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-08-11 23:24:36 +01:00
unknown
ab64eb64af Bug #4797 - 32 bit and 64 bit builds behave differently on int32 overflow
include/my_global.h:
  uint_max constants moved from sql_analyse.cc
sql/sql_analyse.cc:
  cleanup
2004-08-11 23:43:41 +02:00
unknown
b37a736110 Fix for BUG#4488: first portion: sign aware '<' and '>' comparisons. 2004-08-11 23:08:20 +04:00
unknown
b0fcf80b23 fixed Bug #4973 Memory is not released when HEAP table is dropped
sql/ha_heap.cc:
  added calling fn_format(name,..) for name before heap_delete_table
  as it's done before heap_create
  
  fixed Bug #4973 Memory is not released when HEAP table is dropped
2004-08-11 18:55:12 +05:00
unknown
732ccc5ccc Fix for bug#4730 2004-08-11 15:06:17 +02:00
unknown
dde591f203 Fix and testcase for BUG#4984
The crash is eliminated but still it is weird/inefficent that ROR-intersection is used when performing updates in empty table.


mysql-test/r/index_merge_ror_cpk.result:
  Fix and testcase for BUG#4984
mysql-test/t/index_merge_ror_cpk.test:
  Fix and testcase for BUG#4984
sql/opt_range.cc:
  Don't call index_end() for CPK quick select inside of a ROR-intersection.
sql/opt_range.h:
  Fix and testcase for BUG#4984
2004-08-11 16:40:46 +04:00
unknown
9ae2a1bd01 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-08-11 12:38:11 +02:00
unknown
4254ab9d1f Merge mysql.com:/home/wax/mysql/mysql-4.1
into mysql.com:/home/wax/mysql/mysql-4.1group_concat
2004-08-11 15:17:20 +06:00
unknown
02b810d238 BUG#4315
BUG#4535
BUG#4686


sql/item_sum.cc:
  Changed code of fix_fields
  Fixed wrong order of parameters in create_tmp_table
  Changed value set_sum_field in create_tmp_table
2004-08-11 15:15:37 +06:00
unknown
cffa34d9fb ctype_recoding.result, ctype_recoding.test, sql_show.cc:
Bug#4417: SHOW CREATE TABLE and SHOW COLUMNS now return consistent results when "SET NAMES BINARY", i.e. everything is sent in UTF8: column names, enum values, default values.


sql/sql_show.cc:
  Bug#4417: SHOW CREATE TABLE and SHOW COLUMNS now return consistent results when "SET NAMES BINARY", i.e. everything is sent in UTF8: column names, enum values, default values.
mysql-test/t/ctype_recoding.test:
  Bug#4417: SHOW CREATE TABLE and SHOW COLUMNS now return consistent results when "SET NAMES BINARY", i.e. everything is sent in UTF8: column names, enum values, default values.
mysql-test/r/ctype_recoding.result:
  Bug#4417: SHOW CREATE TABLE and SHOW COLUMNS now return consistent results when "SET NAMES BINARY", i.e. everything is sent in UTF8: column names, enum values, default values.
2004-08-11 14:03:24 +05:00
unknown
8746d743a5 allow get_format(TIMESTAMP, ...) syntax 2004-08-11 10:27:19 +02:00
unknown
4aa20acc87 Merge rurik.mysql.com:/home/igor/mysql-5.0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-1
2004-08-10 17:37:33 -07:00
unknown
a2a9481891 join.result, select.result:
Fixed bug #4976.
join_nested.result, join_nested.test:
  Added a test case for bug #4976.
sql_select.cc:
  Applied conversion from an outer join to an inner join 
  when the on expression does not depend on the outer table.
  It fixed bug #4976.


sql/sql_select.cc:
  Applied conversion from an outer join to an inner join 
  when the on expression does not depend on the outer table.
  It fixed bug #4976.
mysql-test/t/join_nested.test:
  Added a case test for bug #4976.
mysql-test/r/join_nested.result:
  Added a case test for bug #4976.
mysql-test/r/select.result:
  Fixed bug #4976.
mysql-test/r/join.result:
  Fixed bug #4976.
2004-08-10 17:32:15 -07:00
unknown
de78ba8756 errmsg.txt:
fix error message


sql/share/czech/errmsg.txt:
  fix error message
sql/share/danish/errmsg.txt:
  fix error message
sql/share/dutch/errmsg.txt:
  fix error message
sql/share/english/errmsg.txt:
  fix error message
sql/share/estonian/errmsg.txt:
  fix error message
sql/share/french/errmsg.txt:
  fix error message
sql/share/german/errmsg.txt:
  fix error message
sql/share/greek/errmsg.txt:
  fix error message
sql/share/hungarian/errmsg.txt:
  fix error message
sql/share/italian/errmsg.txt:
  fix error message
sql/share/japanese/errmsg.txt:
  fix error message
sql/share/korean/errmsg.txt:
  fix error message
sql/share/norwegian-ny/errmsg.txt:
  fix error message
sql/share/norwegian/errmsg.txt:
  fix error message
sql/share/polish/errmsg.txt:
  fix error message
sql/share/portuguese/errmsg.txt:
  fix error message
sql/share/romanian/errmsg.txt:
  fix error message
sql/share/serbian/errmsg.txt:
  fix error message
sql/share/slovak/errmsg.txt:
  fix error message
sql/share/spanish/errmsg.txt:
  fix error message
sql/share/swedish/errmsg.txt:
  fix error message
2004-08-10 14:23:19 -05:00
unknown
e9a4ea902a Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb


ndb/src/common/transporter/Transporter.cpp:
  Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
2004-08-10 17:42:51 +02:00
unknown
d6dabde216 Merge marko@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/k/mysql-4.0
2004-08-10 16:16:21 +03:00
unknown
89017ca5b0 Bug fix for bug#3912 2004-08-10 14:38:24 +02:00
unknown
2c900be0ef InnoDB: Use create_temp_file() when available
innobase/include/os0file.h:
  Improve the comment of os_file_create_tmpfile()
innobase/os/os0file.c:
  os_file_create_tmpfile(): Use create_temp_file()
  via innobase_mysql_tmpfile() unless UNIV_HOTBACKUP is defined
sql/ha_innodb.cc:
  Added innobase_mysql_tmpfile(), a wrapper around create_temp_file()
2004-08-10 14:17:32 +03:00
unknown
4d3c575a0c Merge mysql.com:/home/wax/mysql/mysql-4.1
into mysql.com:/home/wax/mysql/mysql-4.1group_concat
2004-08-10 15:49:58 +06:00
unknown
04cc2cc4d1 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1-ndb


mysql-test/r/ndb_alter_table.result:
  Auto merged
mysql-test/r/ndb_basic.result:
  Auto merged
mysql-test/r/ndb_lock.result:
  Auto merged
mysql-test/t/ndb_alter_table.test:
  Auto merged
mysql-test/t/ndb_basic.test:
  Auto merged
mysql-test/t/ndb_lock.test:
  Auto merged
ndb/src/ndbapi/Ndb.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
2004-08-10 11:48:43 +02:00
unknown
700c2d621d BUG#4315
BUG#4535
BUG#4686


mysql-test/r/func_gconcat.result:
  add testes of blobs and null values
mysql-test/t/func_gconcat.test:
  add testes of blobs and null values
sql/item_sum.cc:
  replace code with maybe_null and change store mode of fields
2004-08-10 15:48:22 +06:00
unknown
68d7b26698 Fix for bug #4508 "CONVERT_TZ() function with new time zone as param crashes server".
Instead of trying to open time zone tables during calculation of CONVERT_TZ() function
or setting of @@time_zone variable we should open and lock them with the rest of 
statement's table (so we should add them to global table list) and after that use such 
pre-opened tables for loading info about time zones.


mysql-test/r/timezone2.result:
  Added test for bug #4508
mysql-test/t/timezone2.test:
  Added test for bug #4508
scripts/mysql_create_system_tables.sh:
  Added one more test time zone to time zone tables which is needed for test for bug #4508.
sql/item_create.cc:
  CONVERT_TZ() now is treated as special function.
sql/item_create.h:
  CONVERT_TZ() now is treated as special function.
sql/item_timefunc.cc:
  Item_func_convert_tz now uses list of pre-opened time zone tables instead of trying to
  open them ad-hoc. Also it avoid calling of current_thd.
sql/item_timefunc.h:
  Added comment describing special nature of CONVERT_TZ() function.
  Optimization: Added own fix_fields() method and tz_tables member for caching pointer
  to list of open time zone tables to Item_func_convert_tz class.
sql/lex.h:
  CONVERT_TZ() now is treated as special function.
sql/mysql_priv.h:
  Removed function which is no longer used.
sql/set_var.cc:
  Now my_tz_find() accepts list of pre-opened time zone tables as last argument 
  and no longer needs pointer to current THD.
sql/set_var.h:
  Exported sys_time_zone, which is now used in sql_yacc.yy for quick finding out if we are
  setting @@time_zone variable.
sql/sql_base.cc:
  Moved propagation of pointers to open tables from global list to local select lists to
  open_and_lock_tables(), also added implicit usage of time zone tables as condition for
  such propagation.
sql/sql_lex.cc:
  Added fake_time_zone_tables_list which is used to indicate that time zone tables are
  implicitly used in statement.
  st_select_lex_unit::create_total_list(): if time zone tables are implicitly used in
  statement add them to global tables list.
sql/sql_lex.h:
  Added LEX::time_zone_tables_used member which is used to indicate that time zone tables 
  are implicitly used in this statement (by pointing to fake_time_zone_table_list) and 
  for holding pointer to those tables after they've been opened.
sql/sql_parse.cc:
  We should also create global table list if statement uses time zone tables implicitly.
  Added initialization of LEX::time_zone_tables_used to mysql_query_init().
sql/sql_prepare.cc:
  We should also create global table list if statement uses time zone tables implicitly.
sql/sql_select.cc:
  Removed functions which are no longer used.
sql/sql_yacc.yy:
  CONVERT_TZ() and @@time_zone variable are handled in special way since they implicitly 
  use time zone tables.
sql/tztime.cc:
  Fix for bug #4508 "CONVERT_TZ() function with new time zone as param crashes server".
  If statement uses CONVERT_TZ() function or @@time_zone variable is set then it implicitly
  uses time zone tables. We need to open and lock such tables with all other tables of 
  such statement.
  
  All code responsible for opening table was removed from tz_load_from_db() and function was 
  renamed to tz_load_from_open_tables() (which uses list of pre-opened tables).
  We also have new functions for construction and initialization of table list of time
  zone tables.
  my_tz_find() now always require list of pre-opened time zone tables and no longer needs
  current THD. So we have to pre-open them in my_tz_init().
  Also now we try to open time zone tables only if they were found during startup.
sql/tztime.h:
  New function for construction of table list of time zone tables my_tz_get_table_list().
  Now my_tz_find() requires list of pre-pened time zone tables instead of current thread.
2004-08-10 12:42:31 +04:00
unknown
e74007fb7c Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-bg4756
2004-08-10 03:07:07 +04:00
unknown
c17bc7a7ff Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.0-bg4491
2004-08-10 02:57:32 +04:00
unknown
201f86ef62 Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-4100
2004-08-09 19:10:54 +02:00
unknown
17f95c28da mysqld.cc:
minor option description change.


sql/mysqld.cc:
  minor option description change.
2004-08-09 10:34:36 -05:00
unknown
e077f17558 mysqld.cc:
Typos/grammar.


sql/mysqld.cc:
  Typos/grammar.
2004-08-09 10:20:43 -05:00
unknown
3603196b19 Merge mysql.com:/home/mydev/mysql-4.0
into mysql.com:/home/mydev/mysql-4.0-4000
2004-08-09 11:41:50 +02:00
unknown
63ae5d0b4d bug#4497 - Serious regression if disk based TMP table is used.
Solved performance problems by enabling write buffer.



sql/sql_select.cc:
  bug#4497 - Serious regression if disk based TMP table is used.
  Solved performance problems by enabling write buffer.
  Supplied no test case, as it required too much data to see the performance regression.
2004-08-09 11:39:26 +02:00
unknown
499a71bcb5 Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-4100
2004-08-09 11:28:59 +02:00
unknown
9694a1f9dd bug#4369 - MySQL 4.1 regression in Alter table/tmp table from hash.
Solved performance problems by fixing a typo, which prevented enabling of write buffer.


sql/ha_myisam.cc:
  bug#4369 - MySQL 4.1 regression in Alter table/tmp table from hash.
  Solved performance problems by fixing a typo, which prevented enabling of write buffer.
  Supplied no test case, as it required too much data to see the performance regression.
2004-08-09 11:02:09 +02:00
unknown
caaa692ca6 mysqld.cc:
Put --help first, reorder other options so that they are
  alphabetical. (shouldn't have to use grep to find an option.)
  Move group_concat_max_len to variable part of list.
  Rename character_set_server, collation_server,
  shared_memory_base_name to character-set-server,
  collation-server, shared-memory-base-name.
  Make default-collation message refer to collation-server
  rather than character-set-server.


sql/mysqld.cc:
  Put --help first, reorder other options so that they are
  alphabetical. (shouldn't have to use grep to find an option.)
  Move group_concat_max_len to variable part of list.
  Rename character_set_server, collation_server,
  shared_memory_base_name to character-set-server,
  collation-server, shared-memory-base-name.
  Make default-collation message refer to collation-server
  rather than character-set-server.
2004-08-08 21:23:03 -05:00
unknown
82d9b4a8a0 mysqld.cc:
get_options() did an exit(0) after reporting "Too many arguments"


sql/mysqld.cc:
  get_options() did a exit(0) when reporting "Too many arguments"
2004-08-08 15:46:57 +02:00
unknown
91f20a16b8 cleanup
mysql-test/r/select_found.result:
  explain added
mysql-test/t/select_found.test:
  cleanup. 5000-char long line removed :)
sql/sql_select.cc:
  reverted
2004-08-07 23:18:13 +02:00
unknown
03fc7a08b7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-08-07 18:28:10 +02:00
unknown
978e1ba084 bug#4881 - crash in ALTER .. RENAME if rename fails
sql/sql_select.cc:
  typos in comments
  harmless (hopefully) bug in optimizer fixed
2004-08-07 18:26:59 +02:00
unknown
578b0f57de Merge rurik.mysql.com:/home/igor/mysql-5.0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-1


sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2004-08-06 10:31:45 -07:00
unknown
3478d656d0 join_nested.result, join_nested.test:
Added a test case for bug #4922.
sql_select.cc:
  Blocked an optimization performed by join_read_const_table when
  applied to an inner table of a nested outer join.
  It was done to fix bug #4922.
sql_yacc.yy:
  Fixed a typo bug in the rule for join_table.


sql/sql_yacc.yy:
  Fixed a typo bug in the rule for join_table.
sql/sql_select.cc:
  Blocked an optimization performed by join_read_const_table when
  applied to an inner table of a nested outer join.
  It was done to fix bug #4922.
mysql-test/t/join_nested.test:
  Added a test case for bug #4922.
mysql-test/r/join_nested.result:
  Added a test case for bug #4922.
2004-08-06 10:22:20 -07:00
unknown
98f85188cc Fixed BUG#4934: Caching issue with stored procedures.
...and added new test file, sp-threads, for multiple connection tests
  (apart from the security tests that are in sp-security).


sql/sp.cc:
  When removing an SP, invalidate the caches even if the
  removing thread doesn't have one.
2004-08-06 18:11:14 +02:00
unknown
ba7c743983 Fixed BUG#4904: Stored procedure crash if continue handler for HY000 errors.
The description is not entirerly correct. The issue was follow-up errors
  where the first error is not caught - in which case it's often a system
  error with errcode < 1000 (which are mapped by default to 'HY000'). In this
  case the error state is different from what was assumed in the execution
  loop.


mysql-test/r/sp.result:
  New test case for BUG#4902.
mysql-test/t/sp.test:
  New test case for BUG#4902.
sql/sp_head.cc:
  Don't test the net.report_error flag in the execution loop. (Don't know
  why this was done in the first place, as it seems to serve no purpose.)
2004-08-06 15:21:28 +02:00
unknown
fc4364e350 InnoDB: Add option for disabling innodb_status.<pid> files.
InnoDB: Implement tmpfile() differently on Windows (Bug #3998)


innobase/dict/dict0dict.c:
  Check the return value of os_file_create_tmpfile(),
  as it can now return NULL
innobase/include/os0file.h:
  Note that os_file_create_tmpfile() can now return NULL
innobase/include/srv0srv.h:
  Add a new server flag (srv_innodb_status) to disable
  the creation of innodb_status.<pid> files
innobase/lock/lock0lock.c:
  Check the return value of os_file_create_tmpfile(),
  as it can now return NULL
innobase/os/os0file.c:
  os_file_create_tmpfile(): separate implementation for Win32;
  errors will be reported but will not cause assertion failure
innobase/srv/srv0srv.c:
  Add a new server flag (srv_innodb_status) to disable
  the creation of innodb_status.<pid> files
innobase/srv/srv0start.c:
  innobase_start_or_create_for_mysql(): create srv_monitor_file
  with tmpfile() or with a visible name "innodb_status.<pid>",
  depending on the setting of the flag srv_innodb_status.
sql/ha_innodb.cc:
  innobase_init(): initialize srv_innodb_status
  update_table_comment(), get_foreign_key_create_info(): replace
  tmpfile() with os_file_create_tmpfile()
sql/ha_innodb.h:
  Add new Boolean flag, innobase_create_status_file.
sql/mysqld.cc:
  Add new Boolean flag, innodb_status_file
2004-08-06 15:55:50 +03:00
unknown
177ef90b57 Fixed BUG#4902: Stored procedure with SHOW WARNINGS leads to packet error,
and tried to do it properly this time, digging out all show commands that
  need the multi results flag set.


mysql-test/r/sp.result:
  New test case for BUG#4902, with lots of other show commands as well.
mysql-test/t/sp.test:
  New test case for BUG#4902, with lots of other show commands as well.
sql/sp_head.cc:
  The check for possible multiple result commands was becomming unwieldly,
  so we moved it to a separate function, and added loads of new command codes
  to the test.
sql/sp_head.h:
  The check for possible multiple result commands was becomming unwieldly,
  so we moved it to a separate function.
sql/sql_yacc.yy:
  The check for possible multiple result commands was becomming unwieldly,
  so we moved it to a separate function.
2004-08-06 13:47:01 +02:00
unknown
3a00469e4a Fix for bug #4491 "timestamp(19) doesn't work".
We should allow 19 as length of newly created TIMESTAMP fields.


mysql-test/r/type_timestamp.result:
  Added test of TIMESTAMP(19) support.
mysql-test/t/type_timestamp.test:
  Added test of TIMESTAMP(19) support.
sql/sql_parse.cc:
  add_field_to_list(): TIMESTAMP columns should also support 19 as length since it is
  length of 4.1 compatible representation.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-08-06 12:15:40 +04:00
unknown
1b0f0b0afc Fix for bug #4756 "STR_TO_DATE() returning bad results with AM/PM".
Added support of converion specifiers mentioned in manual but missing in code.


mysql-test/r/date_formats.result:
  Added tests of str_to_date() with new %T, %r and %V, %v conversion specifiers, and also 
  some other specifiers for which tests were missing previously.
mysql-test/t/date_formats.test:
  Added tests of str_to_date() and new %T, %r and %V, %v conversion specifiers, and also 
  some other specifiers for which tests were missing previously.
sql/item_timefunc.cc:
  Added support for %T, %r, %V, %v, %X, %x conversion specifiers to extract_date_time()
  function. Also simplified a bit calculation of dates from week number.
2004-08-06 10:01:29 +04:00