1
0
mirror of https://github.com/MariaDB/server.git synced 2025-05-28 13:01:41 +03:00

6758 Commits

Author SHA1 Message Date
unknown
648b072da2 do not try to use equal field from outer query as field of local join (BUG#6384)
mysql-test/r/subselect.result:
  changes in plans
  test for bug#6384
mysql-test/t/subselect.test:
  test for bug#6384
sql/sql_select.cc:
  do not set equal field from outer query
2005-05-20 16:01:41 +03:00
unknown
4c3d3bb2f4 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-05-20 00:05:24 +02:00
unknown
f210d1ddf1 Merge mysqldev@production.mysql.com:my/mysql-5.0-build
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-build


sql/item_func.cc:
  Auto merged
2005-05-19 22:23:59 +02:00
unknown
4482604ec6 hf's fix for bug #9060 (FORMAT returns incorrect result)
we need proper rounding there


mysql-test/r/func_math.result:
  test result fixed
mysql-test/t/func_math.test:
  test case added
sql/item_func.cc:
  my_double_round implementation added
sql/item_strfunc.cc:
  my_double_round used
sql/mysql_priv.h:
  my_double_round interface
2005-05-20 01:04:08 +05:00
unknown
0100b28de8 after merge 2005-05-19 20:54:37 +02:00
unknown
384456fc10 BUG#9626 valgrind warnings
- after review fixes


mysql-test/r/ndb_basic.result:
  Test using table with long name
mysql-test/t/ndb_basic.test:
  Test using table with long name
ndb/include/transporter/TransporterDefinitions.hpp:
  Define constant for max section size
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Add check for not sending too long table name to ndb kernel
2005-05-19 20:38:48 +02:00
unknown
185b5e4067 merged
sql/sql_udf.cc:
  Auto merged
sql/unireg.cc:
  Auto merged
2005-05-19 15:20:10 +02:00
unknown
4387f4d967 a fix (bug #10599: Numeric function 'abs' make server crash).
sql/item_func.cc:
  a fix (bug #10599: Numeric function 'abs' make server crash).
  Item_func_abs::decimal_op() now returns 0 if NULL.                              
  trivial optimization - get rid of an extra jump for common situations.          
  fixed Item_func_neg::decimal_op() return value if NULL.
2005-05-19 17:59:14 +05:00
unknown
2525722245 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/ram/work/5.0.b6961
2005-05-19 14:03:41 +05:00
unknown
c1ed128f66 a fix (bug #10599: Numeric function 'abs' make server crash).
sql/item_func.cc:
  a fix (bug #10599: Numeric function 'abs' make server crash).
  Item_func_abs::decimal_op() and Item_func_neg::decimal_op()
  now return 0 if NULL.
  Trivial optimization - get rid of an extra jump for common situations.
2005-05-19 13:35:13 +05:00
unknown
27378545f9 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-05-19 09:50:43 +02:00
unknown
275aa24740 after merge fix 2005-05-19 09:47:13 +02:00
unknown
7f4e45ef03 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/ram/work/5.0.b6961
2005-05-19 12:06:40 +05:00
unknown
44819149ad portablity fix 2005-05-19 05:54:31 +03:00
unknown
3e2988d00f Fixes to merge from 4.1
client/mysqldump.c:
  Temporarily disable unused (and broken) code.
mysql-test/r/group_min_max.result:
  Update results
mysql-test/r/mysqldump.result:
  Update results
mysql-test/r/subselect.result:
  Update results
mysql-test/t/group_min_max.test:
  Ignore number of rows in output of most explain results
sql/sql_insert.cc:
  Fix reference to max_unique_length
2005-05-18 15:40:34 -07:00
unknown
2de8a4bc8c Resolve merge from 4.1
mysql-test/r/grant_cache.result:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
mysql-test/t/grant_cache.test:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
sql/ha_myisammrg.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/handler.h:
  Resolve merge
sql/table.cc:
  Resolve merge
2005-05-18 13:54:36 -07:00
unknown
7e507270b8 merged
sql/unireg.cc:
  Auto merged
2005-05-18 22:14:08 +02:00
unknown
9e8cad1d5a Merge book.sanja.is.com.ua:/Users/bell/mysql/bk/mysql-4.1
into book.sanja.is.com.ua:/Users/bell/mysql/bk/work-4.1
2005-05-18 22:58:48 +03:00
unknown
f8a20dbeb6 Resolve merge from 4.1
BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
myisam/mi_check.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
client/mysqldump.c:
  Resolve merge
mysql-test/r/myisam.result:
  Resolve merge
mysql-test/r/mysqldump.result:
  Resolve merge
mysql-test/r/olap.result:
  Resolve merge
mysql-test/r/subselect.result:
  Resolve merge
mysql-test/t/myisam.test:
  Resolve merge
mysql-test/t/mysqldump.test:
  Resolve merge
mysql-test/t/olap.test:
  Resolve merge
mysql-test/t/range.test:
  Resolve merge
mysql-test/t/subselect.test:
  Resolve merge
ndb/src/common/util/version.c:
  Resolve merge
ndb/src/ndbapi/ndberror.c:
  Resolve merge
sql/item.cc:
  Resolve merge
sql/item_strfunc.h:
  Resolve merge
sql/sql_select.cc:
  Resolve merge
sql/sql_yacc.yy:
  Resolve merge
2005-05-18 11:06:34 -07:00
unknown
7a223fe8c9 Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-4100
2005-05-18 19:45:59 +02:00
unknown
0461b482cb Bug#10400 - Improperly-defined MERGE table crashes with INSERT ... ON DUPLICATE KEY UPDATE
After review version.
Added a condition for MERGE tables. These do not have unique
indexes. But every key could be a unique key on the underlying
MyISAM table. So get the maximum key length for MERGE tables
instead of the maximum unique key length. This is used for
buffer allocation in write_record().


mysql-test/r/merge.result:
  Bug#10400 - Improperly-defined MERGE table crashes with INSERT ... ON DUPLICATE KEY UPDATE
  The test result.
mysql-test/t/merge.test:
  Bug#10400 - Improperly-defined MERGE table crashes with INSERT ... ON DUPLICATE KEY UPDATE
  The test case does not in all cases show the problem
  without the bugfix. The improper memory allocation
  might get through undetected in many cases.
sql/ha_myisammrg.h:
  Bug#10400 - Improperly-defined MERGE table crashes with INSERT ... ON DUPLICATE KEY UPDATE
  Set a table_flag for the MERGE engine telling that any index
  might be unique without being specified as such.
sql/handler.h:
  Bug#10400 - Improperly-defined MERGE table crashes with INSERT ... ON DUPLICATE KEY UPDATE
  Added a new table_flag telling that any index
  might be unique without being specified as such.
sql/sql_insert.cc:
  Bug#10400 - Improperly-defined MERGE table crashes with INSERT ... ON DUPLICATE KEY UPDATE
  Changed the freeing of the memory to be symmetric to its
  allocation (my_safe_alloc -> my_safe_afree).
  This is not directly related to the bug.
sql/table.cc:
  Bug#10400 - Improperly-defined MERGE table crashes with INSERT ... ON DUPLICATE KEY UPDATE
  Added a condition for MERGE tables. These do not have unique
  indexes. But every key could be a unique key on the underlying
  MyISAM table. So get the maximum key length for MERGE tables
  instead of the maximum unique key length. This is used for
  buffer allocation in write_record().
2005-05-18 19:40:39 +02:00
unknown
53af474ba0 Update mysqldump test and results
mysql-test/r/mysqldump.result:
  Update results
mysql-test/t/mysqldump.test:
  Fix test to not include version number in results
2005-05-18 09:40:12 -07:00
unknown
0f02da9f4e Resolve bugfix merge
client/mysqldump.c:
  Merge bug fix
mysql-test/r/mysqldump.result:
  Update results
mysql-test/t/mysqldump.test:
  Merge bug fix
2005-05-18 09:25:06 -07:00
unknown
57ba8d3ed1 Merge book.sanja.is.com.ua:/Users/bell/mysql/bk/mysql-4.1
into book.sanja.is.com.ua:/Users/bell/mysql/bk/work-4.1
2005-05-18 16:58:37 +03:00
unknown
8c4e286064 reduced 1 server reloding during test
BitKeeper/deleted/.del-grant_cache-master.opt~1b04b4b1116a7a2:
  Delete: mysql-test/t/grant_cache-master.opt
mysql-test/r/grant_cache.result:
  query cache management moved inside test
mysql-test/t/grant_cache.test:
  query cache management moved inside test to privent server reloading during test
2005-05-18 16:41:32 +03:00
unknown
89eeff659f Merge mysql.com:/usr/home/ram/work/mysql-5.0-build
into mysql.com:/usr/home/ram/work/mysql-5.0
2005-05-18 18:15:14 +05:00
unknown
0a2b07254f olap.result, olap.test:
Added test cases for bug #7914.
sql_select.cc:
  Fixed bug #7914: rollup over expresssions such as sum(a)+1.


sql/sql_select.cc:
  Fixed bug #7914: rollup over expresssions such as sum(a)+1.
mysql-test/t/olap.test:
  Added test cases for bug #7914.
mysql-test/r/olap.result:
  Added test cases for bug #7914.
2005-05-18 05:15:48 -07:00
unknown
b842158263 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/ram/work/5.0.b10339
2005-05-18 16:06:01 +05:00
unknown
32ce862f20 mysqldump.c: disabling --delayed-insert until BUG#7815 is fixed (need table def cache for that,
to easily check the storage engine supports DELAYED).



client/mysqldump.c:
  disabling --delayed-insert until BUG#7815 is fixed (need table def cae)
mysql-test/r/mysqldump.result:
  as we disable --delayed-insert, result changes
2005-05-18 13:02:09 +02:00
unknown
93e8f1824a A fix (bug #10703: rpl_variables.test failure).
mysql-test/r/rpl_variables.result:
  A fix (bug #10703: rpl_variables.test failure).
  "$SLAVE_LOAD_TMPDIR" may differ from the "$MYSQL_TEST_DIR/var/tmp".
mysql-test/t/rpl_variables.test:
  A fix (bug #10703: rpl_variables.test failure).
  "$SLAVE_LOAD_TMPDIR" may differ from the "$MYSQL_TEST_DIR/var/tmp".
2005-05-18 15:10:43 +05:00
unknown
efc254bc92 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/ram/work/5.0.b10339


sql/set_var.h:
  Auto merged
2005-05-18 14:50:57 +05:00
unknown
3814661dc4 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/gluh/MySQL/Bugs/5.0.9286
2005-05-18 14:48:04 +05:00
unknown
9971175072 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/ram/work/5.0.b10339


mysql-test/r/variables.result:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/set_var.cc:
  Auto merged
2005-05-18 14:46:05 +05:00
unknown
afc94dfbb6 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


mysql-test/t/range.test:
  Auto merged
2005-05-18 11:03:05 +02:00
unknown
0a21bf0c5a test result change: now "enum... not null" doesn't print default value. 2005-05-18 14:02:03 +05:00
unknown
afe6779385 test fixes
mysql-test/mysql-test-run.sh:
  always use --no-defaults
mysql-test/t/range.test:
  range.test does not requires innodb
2005-05-18 10:57:07 +02:00
unknown
e8f272e206 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/gluh/MySQL/Bugs/5.0.9286


sql/sql_yacc.yy:
  Auto merged
2005-05-18 12:52:02 +05:00
unknown
74b93e57b5 Fix for bug #9286: SESSION/GLOBAL should be disallowed for user variables(for 5.0) 2005-05-18 12:47:45 +05:00
unknown
c0dca5f45b Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/ram/work/5.0.b6267


mysql-test/r/system_mysql_db.result:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2005-05-18 12:41:36 +05:00
unknown
c4df3abb71 Merge mysql.com:/home/jimw/my/mysql-5.0-10251
into mysql.com:/home/jimw/my/mysql-5.0-clean


client/mysqltest.c:
  Auto merged
2005-05-17 16:59:39 -07:00
unknown
cdba1d562d Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-05-17 22:58:13 +02:00
unknown
89039f7475 Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0
into xiphis.org:/usr/home/antony/work2/p1-bug10246.1


sql/sp_head.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2005-05-17 19:57:27 +01:00
unknown
55171821d2 Bug#10246 - Parser: bad syntax for GRANT EXECUTE
Rename some functions
  more fine-grained sp privileges
  make grant/revoke sp grammar less ambigious


mysql-test/r/sp-security.result:
  change test for new syntax
mysql-test/r/system_mysql_db.result:
  change test for new syntax
mysql-test/t/sp-security.test:
  change test for new syntax
scripts/mysql_create_system_tables.sh:
  now store routine_type for procs_priv
scripts/mysql_fix_privilege_tables.sql:
  now store routine_type for procs_priv
sql/item_func.cc:
  rename of function
sql/mysql_priv.h:
  rename of function
sql/sp_head.cc:
  extra arg for check_some_routine_access
sql/sql_acl.cc:
  rename of function. now handle func/proc acls seperately
sql/sql_acl.h:
  rename of function
sql/sql_parse.cc:
  rename of function
  grants for procs handled distinctly from funcs
sql/sql_show.cc:
  check_some_routine_access extra arg
sql/sql_base.cc:
  fix for build
sql/sql_yacc.yy:
  fix for build
2005-05-17 19:54:20 +01:00
unknown
7d740ed61c Merge neptunus.(none):/home/msvensson/mysql/bug9535
into neptunus.(none):/home/msvensson/mysql/mysql-5.0


sql/item_strfunc.h:
  Auto merged
2005-05-17 20:32:00 +02:00
unknown
804ce01a31 BUG#9535 Warning for "create table t as select uuid();"
- Set max_length of Item_func_uuid to max_length*system_charset_info->mbmaxlen
  Note! Item_func_uuid should be set to use 'ascii' charset when hex(), format(), md5() etc will use 'ascii'


mysql-test/r/func_misc.result:
  Test results
mysql-test/t/func_misc.test:
  Test case
sql/item_strfunc.h:
  Multiply max_length of Item_func_uuid with system_charset_info->mbmaxlen
2005-05-17 20:31:26 +02:00
unknown
159aac8015 Merge book.sanja.is.com.ua:/Users/bell/mysql/bk/mysql-4.1
into book.sanja.is.com.ua:/Users/bell/mysql/bk/work-4.1
2005-05-17 19:10:53 +03:00
unknown
afaa3c8923 sql_yacc.yy:
missing semicolon added
sql_base.cc:
  bad merge fixed
sp_head.cc, view.test, view.result:
  Correct restoring view name in SP table locking BUG#9758
configure.in:
  restore -fno-implicit-templates -fno-exceptions -fno-rtti in configure


configure.in:
  restore -fno-implicit-templates -fno-exceptions -fno-rtti in configure
mysql-test/r/view.result:
  Correct restoring view name in SP table locking BUG#9758
mysql-test/t/view.test:
  Correct restoring view name in SP table locking BUG#9758
sql/sp_head.cc:
  Correct restoring view name in SP table locking BUG#9758
sql/sql_base.cc:
  bad merge fixed
sql/sql_yacc.yy:
  missing semicolon added
2005-05-17 17:08:43 +02:00
unknown
9b07cafe1e Merge mysql.com:/home/jimw/my/mysql-5.0-7800
into mysql.com:/home/jimw/my/mysql-5.0-clean


sql/set_var.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
2005-05-16 14:33:46 -07:00
unknown
2598faafd7 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/psergey/mysql-4.1-bug10095
2005-05-16 22:21:19 +02:00
unknown
4d3d703200 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0


BitKeeper/etc/logging_ok:
  auto-union
2005-05-16 15:26:40 +03:00