Skip to content

M
MariaDB
Switch branch/tag
  1. 02 Dec, 2005 17 commits
    • unknown's avatar
      disabled.def: · e4ace6de
      unknown authored 
        Failing tests func_group func_math group_min_max are disabled


mysql-test/t/disabled.def:
  Failing tests func_group func_math group_min_max are disabled
      e4ace6de
    • unknown's avatar
      Merge moonbone.local:/work/15028-bug-5.0-mysql · ef7154ed
      unknown authored 
      into moonbone.local:/work/15028-bug-5.1-new-mysql


configure.in:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
      ef7154ed
    • unknown's avatar
      sql_cache.cc: · a1e0125a
      unknown authored 
        After merge fix


sql/sql_cache.cc:
  After merge fix
      a1e0125a
    • unknown's avatar
      query_cache.result: · 8e06e969
      unknown authored 
        After merge fix


mysql-test/r/query_cache.result:
  After merge fix
      8e06e969
    • unknown's avatar
      Merge mysql.com:/usr/local/bk/mysql-5.0 · 487f5536
      unknown authored 
      into  mysql.com:/usr/home/pem/mysql-5.1-new


mysql-test/r/sp.result:
  Auto merged
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
      487f5536
    • unknown's avatar
      Manually merged · 2a5e527e
      unknown authored 
      
mysql-test/r/update.result:
  Auto merged
mysql-test/t/update.test:
  Auto merged
ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
sql/sql_update.cc:
  Auto merged
      2a5e527e
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 7368605c
      unknown authored 
      into moonbone.local:/work/15028-bug-4.1-mysql
      7368605c
    • unknown's avatar
      Merge mysql.com:/usr/local/bk/mysql-5.0 · 3b94510a
      unknown authored 
      into  mysql.com:/usr/home/pem/bug14376/mysql-5.0


sql/sp_pcontext.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/sp.result:
  SCCS merged
mysql-test/t/sp.test:
  SCCS merged
sql/sp_pcontext.h:
  SCCS merged
      3b94510a
    • unknown's avatar
      Post-review fixes for BUG#14376: MySQL crash on scoped variable (re)initialization · 4cf50da6
      unknown authored 
      
sql/sp_pcontext.cc:
  Count boundary for variable visibility from the frame end instead.
sql/sp_pcontext.h:
  Count boundary for variable visibility from the frame end instead.
  Updated comments.
sql/sql_yacc.yy:
  Changed tabs to spaces.
      4cf50da6
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-new · de74f787
      unknown authored 
      into quadxeon.mysql.com:/benchmarks/ext3/BUILDS/mysql-5.1-new
      de74f787
    • unknown's avatar
      Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE · 05b9e4fc
      unknown authored 
        -issue more correct message for incorrect date|datetime|time values
  -ER_WARN_DATA_OUT_OF_RANGE message is changed
  -added new error message


mysql-test/r/auto_increment.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/bigint.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/ctype_ucs.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/date_formats.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/func_sapdb.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/func_str.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/func_time.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/insert.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/loaddata.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/mysqldump.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/ps_2myisam.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/ps_3innodb.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/ps_4heap.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/ps_5merge.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/ps_6bdb.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/ps_7ndb.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/rpl_rewrite_db.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/sp.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/strict.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/timezone2.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/timezone_grant.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/type_bit.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/type_bit_innodb.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/type_date.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/type_datetime.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/type_decimal.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/type_float.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/type_newdecimal.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/type_ranges.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/type_time.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/type_uint.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/view.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/warnings.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
sql/share/errmsg.txt:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    -ER_WARN_DATA_OUT_OF_RANGE message is changed
    -added new error message
sql/time.cc:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    issue more correct message for incorrect date|datetime|time values
      05b9e4fc
    • unknown's avatar
      Merge · b6afba40
      unknown authored
      b6afba40
    • unknown's avatar
      BUG#15425 Small window for NF during backup failing without error · 109b0665
      unknown authored 
      
ndb/src/kernel/blocks/backup/Backup.cpp:
  If crash 10018 is inserted on a 2 node cluster with fast CPU and slower disk,
  all nodes can respond with BACKUP_FRAGMENT_CONF for all fragments before the
  error in FSAPPENDCONF is hit.
  
  This would mean that no error code was set for the backup and that it would
  be incomplete as not all IO had been written to disk before the node crash.
  This would not be reported to the user.
  
  So the backup would appear to succeed but it really didn't.
  
  The window for this is rather small though.
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Assert is incorrect for testBackup NFSlave test (causes crash insert 10015 to fail)
      109b0665
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 16580191
      unknown authored 
      into  mysql.com:/usr/home/ram/work/5.0.b12956


mysql-test/r/ps.result:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
      16580191
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · b8b67f66
      unknown authored 
      into  mysql.com:/users/emurphy/src/mysql-5.1-new
      b8b67f66
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · 563fd8b9
      unknown authored 
      into  mysql.com:/users/emurphy/src/mysql-5.1-new
      563fd8b9
    • unknown's avatar
      BUG#15406: Adding support for transactions to blackhole. · 758d000f
      unknown authored 
      Now when rolling back a transaction on a blackhole table,
the transaction will not be written to the binlog.


sql/ha_blackhole.h:
  Added support for transactions
mysql-test/t/blackhole.test:
  Added a test for transaction support
mysql-test/r/blackhole.result:
  updated test results for transaction support
      758d000f
  3. 01 Dec, 2005 20 commits
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-5.0-clean · e49348e8
      unknown authored 
      into  mysql.com:/home/jimw/my/mysql-5.1-clean


client/mysqldump.c:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/unireg.h:
  Auto merged
mysql-test/r/mysqldump.result:
  Fix conflict
mysql-test/t/mysqldump.test:
  Fix conflict
      e49348e8
    • unknown's avatar
      Post-merge result file cleanup · acc875f9
      unknown authored 
      
mysql-test/r/mysqldump.result:
  Fix results
      acc875f9
    • unknown's avatar
      Merge selena.:H:/MYSQL/bkt/mysql-5.0 · 1976d814
      unknown authored 
      into  selena.:H:/MYSQL/bkt/mysql-5.1


sql/sp_head.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
      1976d814
    • unknown's avatar
      Fix bug#15028 Multitable update returns different numbers of matched rows · e811c864
      unknown authored 
      depending on table order

multi_update::send_data() was counting updates, not updated rows. Thus if one 
record have several updates it will be counted several times in 'rows matched'
but updated only once.

multi_update::send_data() now counts only unique rows.


sql/sql_update.cc:
  Fix bug#15028  Multitable update returns different numbers of matched rows
  depending on table order
  multi_update::send_data() now counts only unique rows.
mysql-test/t/update.test:
  Test case for bug#15028 Multitable update returns different numbers of matched rows depending on table order
mysql-test/r/update.result:
  Test case for bug#15028 Multitable update returns different numbers of matched rows depending on table order
      e811c864
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-13318 · 049767dc
      unknown authored 
      into  mysql.com:/home/jimw/my/mysql-5.0-clean


client/mysqldump.c:
  Auto merged
mysql-test/r/mysqldump.result:
  Resolve conflicts
mysql-test/t/mysqldump.test:
  Resolve conflicts
      049767dc
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-12612 · f7e7eede
      unknown authored 
      into  mysql.com:/home/jimw/my/mysql-5.0-clean


mysql-test/r/func_equal.result:
  Auto merged
mysql-test/t/func_equal.test:
  Auto merged
sql/item_cmpfunc.cc:
  SCCS merged
      f7e7eede
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-5.0-keysize · 9c57c510
      unknown authored 
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      9c57c510
    • unknown's avatar
      Enable key lengths of up to 3K on 32-bit platforms. · 9a6107ff
      unknown authored 
      
mysql-test/r/bdb.result:
  Add new results
mysql-test/r/innodb.result:
  Add new results
mysql-test/t/bdb.test:
  Add simple test that large keys are allowed
mysql-test/t/innodb.test:
  Add simple test that large keys are allowed
sql/unireg.h:
  Allow key length of 3K even on 32-bit platforms
      9a6107ff
    • unknown's avatar
      Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0 · 7d99d362
      unknown authored 
      into  selena.:H:/MYSQL/src/#14902-mysql-5.0


mysql-test/r/analyze.result:
  SCCS merged
mysql-test/t/analyze.test:
  SCCS merged
      7d99d362
    • unknown's avatar
      Merge mysql.com:/home/timka/mysql/src/5.1-virgin · b1fca2c5
      unknown authored 
      into  mysql.com:/home/timka/mysql/src/5.1-dbg
      b1fca2c5
    • unknown's avatar
      Many files: · 000ae475
      unknown authored 
        Added mmap support for MyISAM engine


configure.in:
  Added mmap support for MyISAM engine
include/my_base.h:
  Added mmap support for MyISAM engine
include/my_sys.h:
  Added mmap support for MyISAM engine
sql/ha_myisam.cc:
  Added mmap support for MyISAM engine
sql/mysql_priv.h:
  Added mmap support for MyISAM engine
sql/mysqld.cc:
  Added mmap support for MyISAM engine
sql/records.cc:
  Added mmap support for MyISAM engine
sql/set_var.cc:
  Added mmap support for MyISAM engine
storage/myisam/mi_close.c:
  Added mmap support for MyISAM engine
storage/myisam/mi_delete_all.c:
  Added mmap support for MyISAM engine
storage/myisam/mi_dynrec.c:
  Added mmap support for MyISAM engine
storage/myisam/mi_extra.c:
  Added mmap support for MyISAM engine
storage/myisam/mi_locking.c:
  Added mmap support for MyISAM engine
storage/myisam/mi_open.c:
  Added mmap support for MyISAM engine
storage/myisam/mi_packrec.c:
  Added mmap support for MyISAM engine
storage/myisam/mi_statrec.c:
  Added mmap support for MyISAM engine
storage/myisam/myisamdef.h:
  Added mmap support for MyISAM engine
      000ae475
    • unknown's avatar
      We should skip beggining '(' characters when test query on possibility · 134fe714
      unknown authored 
      to be in the query cache. (BUG#14652)


mysql-test/r/query_cache.result:
  BUG#14652 test suite.
mysql-test/t/query_cache.test:
  BUG#14652 test suite.
sql/sql_cache.cc:
  We should skip beggining '(' characters when test query on possibility
  to be in the query cache.
      134fe714
    • unknown's avatar
      Fix for bug#11491 Misleading error message if not NULL column set to NULL, · d8647be1
      unknown authored 
                        SQL mode TRADITIONAL
  Message is chenged from 'ER_WARN_NULL_TO_NOTNULL' to 'ER_BAD_NULL_ERROR'


mysql-test/r/auto_increment.result:
  Fix for bug#11491 Misleading error message if not NULL column set to NULL,
                    SQL mode TRADITIONAL
    result change
mysql-test/r/create.result:
  Fix for bug#11491 Misleading error message if not NULL column set to NULL,
                    SQL mode TRADITIONAL
    result change
mysql-test/r/insert.result:
  Fix for bug#11491 Misleading error message if not NULL column set to NULL,
                    SQL mode TRADITIONAL
    result change
mysql-test/r/insert_select.result:
  Fix for bug#11491 Misleading error message if not NULL column set to NULL,
                    SQL mode TRADITIONAL
    result change
mysql-test/r/key.result:
  Fix for bug#11491 Misleading error message if not NULL column set to NULL,
                    SQL mode TRADITIONAL
    result change
mysql-test/r/null.result:
  Fix for bug#11491 Misleading error message if not NULL column set to NULL,
                    SQL mode TRADITIONAL
    result change
mysql-test/r/null_key.result:
  Fix for bug#11491 Misleading error message if not NULL column set to NULL,
                    SQL mode TRADITIONAL
    result change
mysql-test/r/ps_2myisam.result:
  Fix for bug#11491 Misleading error message if not NULL column set to NULL,
                    SQL mode TRADITIONAL
    result change
mysql-test/r/ps_3innodb.result:
  Fix for bug#11491 Misleading error message if not NULL column set to NULL,
                    SQL mode TRADITIONAL
    result change
mysql-test/r/ps_4heap.result:
  Fix for bug#11491 Misleading error message if not NULL column set to NULL,
                    SQL mode TRADITIONAL
    result change
mysql-test/r/ps_5merge.result:
  Fix for bug#11491 Misleading error message if not NULL column set to NULL,
                    SQL mode TRADITIONAL
    result change
mysql-test/r/ps_6bdb.result:
  Fix for bug#11491 Misleading error message if not NULL column set to NULL,
                    SQL mode TRADITIONAL
    result change
mysql-test/r/ps_7ndb.result:
  Fix for bug#11491 Misleading error message if not NULL column set to NULL,
                    SQL mode TRADITIONAL
    result change
mysql-test/r/strict.result:
  Fix for bug#11491 Misleading error message if not NULL column set to NULL,
                    SQL mode TRADITIONAL
    result change
mysql-test/r/view.result:
  Fix for bug#11491 Misleading error message if not NULL column set to NULL,
                    SQL mode TRADITIONAL
    result change
mysql-test/r/warnings.result:
  Fix for bug#11491 Misleading error message if not NULL column set to NULL,
                    SQL mode TRADITIONAL
    result change
mysql-test/t/strict.test:
  Fix for bug#11491 Misleading error message if not NULL column set to NULL,
                    SQL mode TRADITIONAL
    test change
      d8647be1
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 7ceeb05e
      unknown authored 
      into  mysql.com:/usr/home/ram/work/mysql-5.0


sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
      7ceeb05e
    • unknown's avatar
      Fix for bug #14304: auto_increment field incorrect set from within stored... · 506a2b6b
      unknown authored 
      Fix for bug #14304: auto_increment field incorrect set from within stored procedure (insert select).


sql/sp_head.cc:
  Fix for bug #14304: auto_increment field incorrect set from within stored procedure (insert select).
  - call thd->cleanup_after_query() to clean next_insert_id.
sql/sql_class.cc:
  Fix for bug #14304: auto_increment field incorrect set from within stored procedure (insert select).
  - save/restore clear_next_insert_id
sql/sql_class.h:
  Fix for bug #14304: auto_increment field incorrect set from within stored procedure (insert select).
  - clear_next_insert_id added
      506a2b6b
    • unknown's avatar
      Merge mysql.com:/home/timka/mysql/src/5.0-virgin · e1135c4d
      unknown authored 
      into  mysql.com:/home/timka/mysql/src/5.1-dbg


sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
      e1135c4d
    • unknown's avatar
      Fix for bug#9785 SELECT privilege for the whole database · e1973fd2
      unknown authored 
                       is needed to do SHOW CREATE DATABASE
  To allow SHOW CREATE DATABASE when the user can use the database


mysql-test/r/show_check.result:
  Fix for bug#9785 SELECT privilege for the whole database 
                   is needed to do SHOW CREATE DATABASE
    test result
mysql-test/t/show_check.test:
  Fix for bug#9785 SELECT privilege for the whole database 
                   is needed to do SHOW CREATE DATABASE
    test case
sql/sql_show.cc:
  Fix for bug#9785 SELECT privilege for the whole database 
                   is needed to do SHOW CREATE DATABASE
    removed unnecessary code
      e1973fd2
    • unknown's avatar
      Merge mysql.com:/home/timka/mysql/src/5.0-virgin · c1a05438
      unknown authored 
      into  mysql.com:/home/timka/mysql/src/5.0-bug-14920


sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/r/group_min_max.result:
  Manually merged test cases.
mysql-test/t/group_min_max.test:
  Manually merged test cases.
      c1a05438
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/5.0 · 8784b014
      unknown authored 
      into mysql.com:/home/gluh/MySQL/Merge/5.1-new


mysql-test/r/information_schema.result:
  Auto merged
sql/sql_show.cc:
  Auto merged
      8784b014
    • unknown's avatar
      Fix for bug#14476 `information_schema`.`TABLES`.`TABLE_TYPE` with empty value · 65f8e2ab
      unknown authored 
        store TABLES.TABLE_TYPE in case of error during table opening


mysql-test/r/information_schema.result:
  Fix for bug#14476 `information_schema`.`TABLES`.`TABLE_TYPE` with empty value
    test case
mysql-test/t/information_schema.test:
  Fix for bug#14476 `information_schema`.`TABLES`.`TABLE_TYPE` with empty value
    test case
      65f8e2ab
  5. 30 Nov, 2005 3 commits
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7