Skip to content

M
MariaDB
Switch branch/tag
  1. 16 May, 2007 6 commits
    • unknown's avatar
      Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 8804a287
      unknown authored 
      into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint


client/mysqldump.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/mysqldump.result:
  Use local
      8804a287
    • unknown's avatar
      Merge pilot.blaudden:/home/msvensson/mysql/bk_fix/mysql-5.0-maint-patch3 · e4983a70
      unknown authored 
      into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
      e4983a70
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0-maint · 7703b676
      unknown authored 
      into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
      7703b676
    • unknown's avatar
      Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · f15ff35f
      unknown authored 
      into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint


configure.in:
  Auto merged
include/my_global.h:
  Auto merged
sql/item_func.cc:
  Auto merged
strings/strtod.c:
  Auto merged
      f15ff35f
    • unknown's avatar
      Bug#28223: mysqldump --compact --routines restores from @OLD_SQL_MODE w/o ever setting it · e675d257
      unknown authored 
        - mysqldump generated output that set OLD_SQL_MODE twice, to different values
    (for triggers), or not at all (for routines) in some cases.


client/mysqldump.c:
  Only save SQL_MODE in dump_triggers if in --compact mode. Otherwise,
  it's already been saved in write_header(). Likewise for dumpe_routines,
  where it was never saved.
mysql-test/r/mysqldump.result:
  mysqldump output has subtly changed. Adjust test-results. This also shows
  OLD_SQL_MODE is always set exactly once now
      e675d257
    • unknown's avatar
      Fix for bug #28240: "isinf()" cannot be used in C++ for lack of prototype · 9e1585ab
      unknown authored 
      - Since isinf() portability across various platforms and
  compilers is a complicated question, we should not use
  it directly. Instead, the my_isinf() macro should be used,
  which is defined as an alias to the system-defined isinf()
  if it is safe to use, or a workaround implementation otherwise


configure.in:
  Added a check to define HAVE_ISINF only if it can be used
  in C++ code as well.
include/my_global.h:
  Define my_isinf() as an alias to isinf(), if it is available
  in both C and C++ code. Otherwise, define it to a workaround
  implementation.
sql/item_func.cc:
  Replaced isinf() with my_isinf().
strings/strtod.c:
  Replaced isinf() with my_isinf().
      9e1585ab
  3. 15 May, 2007 10 commits
  5. 14 May, 2007 6 commits
    • unknown's avatar
      Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · dc49ca35
      unknown authored 
      into  maint1.mysql.com:/data/localhome/tnurnberg/51-monty
      dc49ca35
    • unknown's avatar
      Merge blasphemy.mysql.com:/home/tnurnberg/monty/50-monty · 1a3915e1
      unknown authored 
      into  blasphemy.mysql.com:/home/tnurnberg/monty/51-monty


include/my_time.h:
  mm
mysql-test/r/date_formats.result:
  mm
mysql-test/r/func_sapdb.result:
  mm
mysql-test/r/ps_2myisam.result:
  mm
mysql-test/r/ps_3innodb.result:
  mm
mysql-test/r/ps_4heap.result:
  mm
mysql-test/r/ps_5merge.result:
  mm
mysql-test/r/ps_7ndb.result:
  mm
mysql-test/r/strict.result:
  mm
mysql-test/r/type_date.result:
  mm
mysql-test/r/type_datetime.result:
  mm
mysql-test/t/date_formats.test:
  mm
mysql-test/t/func_sapdb.test:
  Auto merged
mysql-test/t/type_date.test:
  Auto merged
mysql-test/t/type_datetime.test:
  mm
sql/field.cc:
  mm
sql/field.h:
  mm
sql/item.cc:
  mm
sql/item.h:
  mm
sql/item_cmpfunc.cc:
  mm
sql/item_func.h:
  mm
sql/item_timefunc.cc:
  mm
sql/item_timefunc.h:
  mm
sql/my_decimal.cc:
  mm
sql/my_decimal.h:
  mm
sql/mysql_priv.h:
  mm
sql/protocol.cc:
  mm
sql/protocol.h:
  mm
sql/sp.cc:
  mm
sql/sql_base.cc:
  mm
sql/sql_class.h:
  mm
sql/sql_show.cc:
  mm
sql/structs.h:
  mm
sql/time.cc:
  mm
sql/tztime.cc:
  mm
sql-common/my_time.c:
  mm
sql/tztime.h:
  mm
sql/unireg.cc:
  mm
      1a3915e1
    • unknown's avatar
      Backport of TIME->MYSQL_TIME / Y2K fixset · 21bfc2f2
      unknown authored 
      Made year 2000 handling more uniform
Removed year 2000 handling out from calc_days()
The above removes some bugs in date/datetimes with year between 0 and 200
Now we get a note when we insert a datetime value into a date column
For default values to CREATE, don't give errors for warning level NOTE
Fixed some compiler failures
Added library ws2_32 for windows compilation (needed if we want to compile with IOCP support)
Removed duplicate typedef TIME and replaced it with MYSQL_TIME

Better (more complete) fix for: Bug#21103 "DATE column not compared as DATE"
Fixed properly Bug#18997 "DATE_ADD and DATE_SUB perform year2K autoconversion magic on 4-digit year value"
Fixed Bug#23093 "Implicit conversion of 9912101 to date does not match cast(9912101 as date)"


include/my_time.h:
  Removed not used define YY_MAGIC_BELOW
  Added prototype for year_2000_handling()
mysql-test/r/date_formats.result:
  Updated results (fixed bug in date_format() with year < 99)
mysql-test/r/func_sapdb.result:
  Added more testing of make_date()
mysql-test/r/ps_2myisam.result:
  Now we get a note when we insert a datetime value into a date column
mysql-test/r/ps_3innodb.result:
  Now we get a note when we insert a datetime value into a date column
mysql-test/r/ps_4heap.result:
  Now we get a note when we insert a datetime value into a date column
mysql-test/r/ps_5merge.result:
  Now we get a note when we insert a datetime value into a date column
mysql-test/r/ps_7ndb.result:
  Now we get a note when we insert a datetime value into a date column
mysql-test/r/strict.result:
  zero-year in str_to_date() throws warning in strict
mysql-test/r/type_date.result:
  Added test for date conversions
mysql-test/r/type_datetime.result:
  Added testcase for datetime to date conversion.
mysql-test/t/date_formats.test:
  Added testing of dates < 200
mysql-test/t/func_sapdb.test:
  More testing of makedate()
mysql-test/t/type_date.test:
  Added test for date conversions
mysql-test/t/type_datetime.test:
  Added testcase for datetime to date conversion.
sql/field.cc:
  Give note if we insert a datetime value in a date field
  Don't give notes if we are doing internal test conversions (like from convert_constant_item())
  More documentation (store functions can now return '3' to inform that the function did return a NOTE (not warning or error))
  Revert some changes in Field_newdate::store() to get more optimal code
  Field::set_warning() will now ignore notes if CHECK_FIELD_IGNORE is set.
  New parameters to make_truncated_value_warning()
sql/field.h:
  Give note if we insert a datetime value in a date field
  Don't give notes if we are doing internal test conversions (like from convert_constant_item())
  More documentation (store functions can now return '3' to inform that the function did return a NOTE (not warning or error))
  Revert some changes in Field_newdate::store() to get more optimal code
  Field::set_warning() will now ignore notes if CHECK_FIELD_IGNORE is set.
  New parameters to make_truncated_value_warning()
sql/item.cc:
  Give note if we insert a datetime value in a date field
  Don't give notes if we are doing internal test conversions (like from convert_constant_item())
  More documentation (store functions can now return '3' to inform that the function did return a NOTE (not warning or error))
  Revert some changes in Field_newdate::store() to get more optimal code
  Field::set_warning() will now ignore notes if CHECK_FIELD_IGNORE is set.
  New parameters to make_truncated_value_warning()
sql/item.h:
  TIME -> MYSQL_TIME
sql/item_cmpfunc.cc:
  Don't print notes in convert_constant_item()
sql/item_func.h:
  TIME -> MYSQL_TIME
sql/item_timefunc.cc:
  New parameters to make_truncated_value_warning()
  Moved year 2000 handling out from calc_days()
sql/item_timefunc.h:
  TIME -> MYSQL_TIME
sql/my_decimal.cc:
  TIME -> MYSQL_TIME
sql/my_decimal.h:
  TIME -> MYSQL_TIME
sql/mysql_priv.h:
  Added error level to make_truncated_value_warning()
sql/protocol.cc:
  TIME -> MYSQL_TIME
sql/protocol.h:
  TIME -> MYSQL_TIME
sql/sp.cc:
  TIME -> MYSQL_TIME
sql/sql_base.cc:
  Make testing of result value of save_in_field() uniform
sql/sql_class.h:
  TIME -> MYSQL_TIME
sql/sql_show.cc:
  TIME -> MYSQL_TIME
sql/structs.h:
  TIME -> MYSQL_TIME
sql/time.cc:
  Added error level to make_truncated_value_warning()
sql/tztime.cc:
  TIME -> MYSQL_TIME
sql/tztime.h:
  TIME -> MYSQL_TIME
sql/unireg.cc:
  For default values to CREATE, don't give errors for warning level NOTE
  (Fixed failed CREATE when we give a datetime value to a date field)
sql-common/my_time.c:
  Added year_2000_handling()
  Removed year 2000 handling from calc_daynr()
      21bfc2f2
    • unknown's avatar
      Merge blasphemy.mysql.com:/home/tnurnberg/monty/50-monty · 5e572d49
      unknown authored 
      into  blasphemy.mysql.com:/home/tnurnberg/monty/51-monty


include/my_time.h:
  mm
mysql-test/r/date_formats.result:
  mm
mysql-test/r/func_sapdb.result:
  mm
mysql-test/r/ps_2myisam.result:
  mm
mysql-test/r/ps_3innodb.result:
  mm
mysql-test/r/ps_4heap.result:
  mm
mysql-test/r/ps_5merge.result:
  mm
mysql-test/r/ps_7ndb.result:
  mm
mysql-test/r/type_date.result:
  mm
mysql-test/r/type_datetime.result:
  mm
mysql-test/t/date_formats.test:
  mm
mysql-test/t/func_sapdb.test:
  Auto merged
mysql-test/t/type_date.test:
  Auto merged
mysql-test/t/type_datetime.test:
  mm
sql/field.cc:
  mm
sql/field.h:
  mm
sql/item.cc:
  mm
sql/item.h:
  mm
sql/item_cmpfunc.cc:
  mm
sql/item_func.h:
  mm
sql/item_timefunc.cc:
  mm
sql/item_timefunc.h:
  mm
sql/my_decimal.cc:
  mm
sql/my_decimal.h:
  mm
sql/mysql_priv.h:
  mm
sql/protocol.cc:
  mm
sql/protocol.h:
  mm
sql/sp.cc:
  mm
sql/sql_base.cc:
  mm
sql/sql_class.h:
  mm
sql/sql_show.cc:
  mm
sql/structs.h:
  mm
sql/time.cc:
  mm
sql/tztime.cc:
  mm
sql/tztime.h:
  mm
sql/unireg.cc:
  mm
sql-common/my_time.c:
  mm
      5e572d49
    • unknown's avatar
      Backport of TIME->MYSQL_TIME / Y2K fixset · a2a49ced
      unknown authored 
      Made year 2000 handling more uniform
Removed year 2000 handling out from calc_days()
The above removes some bugs in date/datetimes with year between 0 and 200
Now we get a note when we insert a datetime value into a date column
For default values to CREATE, don't give errors for warning level NOTE
Fixed some compiler failures
Added library ws2_32 for windows compilation (needed if we want to compile with IOCP support)
Removed duplicate typedef TIME and replaced it with MYSQL_TIME

Better (more complete) fix for: Bug#21103 "DATE column not compared as DATE"
Fixed properly Bug#18997 "DATE_ADD and DATE_SUB perform year2K autoconversion magic on 4-digit year value"
Fixed Bug#23093 "Implicit conversion of 9912101 to date does not match cast(9912101 as date)"


include/my_time.h:
  Removed not used define YY_MAGIC_BELOW
  Added prototype for year_2000_handling()
mysql-test/r/date_formats.result:
  Updated results (fixed bug in date_format() with year < 99)
mysql-test/r/func_sapdb.result:
  Added more testing of make_date()
mysql-test/r/ps_2myisam.result:
  Now we get a note when we insert a datetime value into a date column
mysql-test/r/ps_3innodb.result:
  Now we get a note when we insert a datetime value into a date column
mysql-test/r/ps_4heap.result:
  Now we get a note when we insert a datetime value into a date column
mysql-test/r/ps_5merge.result:
  Now we get a note when we insert a datetime value into a date column
mysql-test/r/ps_7ndb.result:
  Now we get a note when we insert a datetime value into a date column
mysql-test/r/type_date.result:
  Added test for date conversions
mysql-test/r/type_datetime.result:
  Added testcase for datetime to date conversion.
mysql-test/t/date_formats.test:
  Added testing of dates < 200
mysql-test/t/func_sapdb.test:
  More testing of makedate()
mysql-test/t/type_date.test:
  Added test for date conversions
mysql-test/t/type_datetime.test:
  Added testcase for datetime to date conversion.
sql/field.cc:
  Give note if we insert a datetime value in a date field
  Don't give notes if we are doing internal test conversions (like from convert_constant_item())
  More documentation (store functions can now return '3' to inform that the function did return a NOTE (not warning or error))
  Revert some changes in Field_newdate::store() to get more optimal code
  Field::set_warning() will now ignore notes if CHECK_FIELD_IGNORE is set.
  New parameters to make_truncated_value_warning()
sql/field.h:
  Give note if we insert a datetime value in a date field
  Don't give notes if we are doing internal test conversions (like from convert_constant_item())
  More documentation (store functions can now return '3' to inform that the function did return a NOTE (not warning or error))
  Revert some changes in Field_newdate::store() to get more optimal code
  Field::set_warning() will now ignore notes if CHECK_FIELD_IGNORE is set.
  New parameters to make_truncated_value_warning()
sql/item.cc:
  Give note if we insert a datetime value in a date field
  Don't give notes if we are doing internal test conversions (like from convert_constant_item())
  More documentation (store functions can now return '3' to inform that the function did return a NOTE (not warning or error))
  Revert some changes in Field_newdate::store() to get more optimal code
  Field::set_warning() will now ignore notes if CHECK_FIELD_IGNORE is set.
  New parameters to make_truncated_value_warning()
sql/item.h:
  TIME -> MYSQL_TIME
sql/item_cmpfunc.cc:
  Don't print notes in convert_constant_item()
sql/item_func.h:
  TIME -> MYSQL_TIME
sql/item_timefunc.cc:
  New parameters to make_truncated_value_warning()
  Moved year 2000 handling out from calc_days()
sql/item_timefunc.h:
  TIME -> MYSQL_TIME
sql/my_decimal.cc:
  TIME -> MYSQL_TIME
sql/my_decimal.h:
  TIME -> MYSQL_TIME
sql/mysql_priv.h:
  Added error level to make_truncated_value_warning()
sql/protocol.cc:
  TIME -> MYSQL_TIME
sql/protocol.h:
  TIME -> MYSQL_TIME
sql/sp.cc:
  TIME -> MYSQL_TIME
sql/sql_base.cc:
  Make testing of result value of save_in_field() uniform
sql/sql_class.h:
  TIME -> MYSQL_TIME
sql/sql_show.cc:
  TIME -> MYSQL_TIME
sql/structs.h:
  TIME -> MYSQL_TIME
sql/time.cc:
  Added error level to make_truncated_value_warning()
sql/tztime.cc:
  TIME -> MYSQL_TIME
sql/tztime.h:
  TIME -> MYSQL_TIME
sql/unireg.cc:
  For default values to CREATE, don't give errors for warning level NOTE
  (Fixed failed CREATE when we give a datetime value to a date field)
sql-common/my_time.c:
  Added year_2000_handling()
  Removed year 2000 handling from calc_daynr()
      a2a49ced
    • unknown's avatar
      Bug#28223: mysqldump --compact --routines restores from @OLD_SQL_MODE w/o ever setting it · 434eeb50
      unknown authored 
      mysqldump generated output that set OLD_SQL_MODE twice, to different values
(for triggers), or not at all (for routines) in some cases.
---
Merge blasphemy.mysql.com:/home/tnurnberg/28223/50-28223
into  blasphemy.mysql.com:/home/tnurnberg/28223/51-28223


client/mysqldump.c:
  Bug#28223: mysqldump --compact --routines restores from @OLD_SQL_MODE w/o ever setting it
  
  Only save SQL_MODE in dump_triggers if in --compact mode. Otherwise,
  it's already been saved in write_header(). Likewise for dumpe_routines,
  where it was never saved.
mysql-test/r/mysqldump.result:
  Bug#28223: mysqldump --compact --routines restores from @OLD_SQL_MODE w/o ever setting it
  
  mysqldump output has subtly changed. Adjust test-results. This also shows
  OLD_SQL_MODE is always set exactly once now.
  ---
  manual merge
      434eeb50
  7. 10 May, 2007 5 commits
  9. 09 May, 2007 9 commits
  11. 08 May, 2007 4 commits
    • unknown's avatar
      Fix for bug #28240: "isinf()" cannot be used in C++ for lack of prototype · 8931efa7
      unknown authored 
      Since isinf() portability across various platforms and compilers is a complicated question, we should not use it directly. Instead, the my_isinf() macro should be used, which is defined as an alias to the system-defined isinf() if it is safe to use, or a workaround implementation otherwise.


configure.in:
  Added a check to define HAVE_ISINF only if it can be used in C++ code as well.
include/my_global.h:
  Define my_isinf() as an alias to isinf(), if it is available in both C and C++ code. Otherwise, define it to a workaround implementation.
sql/item_func.cc:
  Replaced isinf() with my_isinf().
strings/strtod.c:
  Replaced isinf() with my_isinf().
      8931efa7
    • unknown's avatar
      Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · bde43f9c
      unknown authored 
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


configure.in:
  Auto merged
      bde43f9c
    • unknown's avatar
      Bug #23294: Detection of sem_xxx functions on NetBSD broken and \ · 2013f17e
      unknown authored 
      	DragonflyBSD misc patches

Add the original intended test, since our current test for sched_yield
is insufficient to copy.


configure.in:
  We can't check for sched_yield, as that is in libc on FBSD.
  
  Re-add the check for sem_init in librt.
      2013f17e
    • unknown's avatar
      Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-community--bug23294 · cd43057b
      unknown authored 
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint


configure.in:
  SCCS merged
      cd43057b
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7