Commit graph

28989 commits

Author SHA1 Message Date
unknown
38d63b68dd Merge mysql.com:/usr/local/mysql/mysql-5.0-XOPEN_SOURCE
into  mysql.com:/usr/local/mysql/mysql-5.1-new
2005-12-08 21:00:29 +01:00
unknown
698b4937f1 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-12-08 17:58:17 +01:00
unknown
51fd81acf4 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release


mysql-test/t/symlink.test:
  Auto merged
sql/mysqld.cc:
  Auto merged
2005-12-08 16:15:27 +01:00
unknown
eea6e15d11 mysqld.cc:
Bug#14960, reverted code to make symdir work on Windows
symlink.test:
  Disabled test case on Windows


mysql-test/t/symlink.test:
  Disabled test case on Windows
sql/mysqld.cc:
  Bug#14960, reverted code to make symdir work on Windows
2005-12-08 16:13:53 +01:00
unknown
fc4c198ef0 bug#15587 - ndb
Fix typo in autotest script


ndb/test/run-test/daily-basic-tests.txt:
  Fix typo in autotest script
2005-12-08 15:29:39 +01:00
unknown
e5269eed60 bug#15587 - ndb
Fix error in NF during NR


ndb/include/kernel/signaldata/DumpStateOrd.hpp:
  Add dump for ERROR 5002 with specified table
ndb/src/kernel/blocks/ERROR_codes.txt:
  Add dump for ERROR 5002 with specified table
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Run updateNodeInfo if failed node is not in list of storedReplicas
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Add dump for ERROR 5002 with specified table
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Add dump for ERROR 5002 with specified table
ndb/test/ndbapi/testNodeRestart.cpp:
  Add testcase for bug#15587
ndb/test/run-test/daily-basic-tests.txt:
  Add testcase for bug#15587
2005-12-08 15:28:15 +01:00
unknown
16f9daf16d Fix QNX and IRIX compilation
extra/innochecksum.c:
  Fix _XOPEN_SOURCE define to not break compile on QNX and IRIX
2005-12-08 15:13:25 +01:00
unknown
2309be62e5 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/alexi/innodb-ss/mysql-5.1-new
2005-12-08 15:06:26 +03:00
unknown
f8d6d13781 The innodb-5.0-ss52 snapshot changes were erroneously auto-merged
to 5.1. Undoing the merge.


mysql-test/r/innodb.result:
  Undoing erroneous auto-merge 5.0 -> 5.1
mysql-test/t/innodb.test:
  Undoing erroneous auto-merge 5.0 -> 5.1
sql/ha_innodb.cc:
  Undoing erroneous auto-merge 5.0 -> 5.1
sql/ha_innodb.h:
  Undoing erroneous auto-merge 5.0 -> 5.1
storage/innobase/btr/btr0sea.c:
  Undoing erroneous auto-merge 5.0 -> 5.1
storage/innobase/dict/dict0dict.c:
  Undoing erroneous auto-merge 5.0 -> 5.1
storage/innobase/dict/dict0load.c:
  Undoing erroneous auto-merge 5.0 -> 5.1
storage/innobase/include/buf0buf.h:
  Undoing erroneous auto-merge 5.0 -> 5.1
storage/innobase/include/dict0dict.h:
  Undoing erroneous auto-merge 5.0 -> 5.1
storage/innobase/include/dict0load.h:
  Undoing erroneous auto-merge 5.0 -> 5.1
storage/innobase/include/rem0cmp.h:
  Undoing erroneous auto-merge 5.0 -> 5.1
storage/innobase/rem/rem0cmp.c:
  Undoing erroneous auto-merge 5.0 -> 5.1
storage/innobase/row/row0mysql.c:
  Undoing erroneous auto-merge 5.0 -> 5.1
2005-12-08 15:00:18 +03:00
unknown
20fb487711 Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/hartmut/projects/mysql/dev/5.1
2005-12-08 10:24:30 +01:00
unknown
2fd0be5669 Merge mysql.com:/home/mydev/mysql-5.0
into  mysql.com:/home/mydev/mysql-5.0-bug10932


tests/mysql_client_test.c:
  Auto merged
2005-12-08 07:56:07 +01:00
unknown
750671be8d Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  krsna.patg.net:/home/patg/mysql-build/mysql-5.1-new2
2005-12-07 15:10:26 -08:00
unknown
871cc84cae Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0
into  devsrv-b.mysql.com:/space/magnus/my50-bug9535
2005-12-07 22:30:09 +01:00
unknown
4d87cf984d Merge mysql.com:/home/dlenev/src/mysql-5.0-relfix
into  mysql.com:/home/dlenev/src/mysql-5.0-merges


sql/sql_parse.cc:
  Auto merged
2005-12-08 00:18:37 +03:00
unknown
978cf70b6d BUG #15559
Fixed logic in handler to make handler now show up as enabled.


sql/ha_federated.cc:
  BUG# 15559
  
  Fixed logic in federated_db_init. Also, the query length was being chopped 
  too much breaking the initial select query.
2005-12-07 12:58:04 -08:00
unknown
3b3034edc3 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/dlenev/src/mysql-5.0-merges
2005-12-07 23:07:06 +03:00
unknown
e30b5c7852 Fix -ansi -pedantic compilation failure. Fix coding style. 2005-12-07 22:36:13 +03:00
unknown
06e9966396 Fix commit error: sp-vars.test should belong to mysql-test/t directory.
mysql-test/t/sp-vars.test:
  Rename: mysql-test/sp-vars.test -> mysql-test/t/sp-vars.test
2005-12-07 22:06:30 +03:00
unknown
fe774266f1 Merge neptunus.(none):/home/msvensson/mysql/bug9535/my50-bug9535
into  neptunus.(none):/home/msvensson/mysql/bug9535/my51-bug9535


sql/item_strfunc.h:
  Auto merged
2005-12-07 19:56:22 +01:00
unknown
a7c98d2366 Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/bug9535/my50-bug9535
into  devsrv-b.mysql.com:/space/magnus/my50-bug9535
2005-12-07 19:56:03 +01:00
unknown
3f618dafbb Merge neptunus.(none):/home/msvensson/mysql/bug9535/my41-bug9535
into  neptunus.(none):/home/msvensson/mysql/bug9535/my50-bug9535


mysql-test/r/func_misc.result:
  Already in 5.0
mysql-test/t/func_misc.test:
  Already in 5.0
sql/item_strfunc.h:
  Already in 5.0
2005-12-07 19:53:45 +01:00
unknown
e2bf3b211b Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/mydev/mysql-5.0-bug10932


configure.in:
  Auto merged
sql/mysql_priv.h:
  Auto merged
2005-12-07 19:47:55 +01:00
unknown
ae2377c407 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/dlenev/src/mysql-5.0-merges


sql/sp_head.cc:
  Auto merged
2005-12-07 21:21:54 +03:00
unknown
5213f5894a Fix a compilation failure. 2005-12-07 21:16:04 +03:00
unknown
4da61404a6 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/dlenev/src/mysql-5.0-merges


sql/sp.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
2005-12-07 20:31:10 +03:00
unknown
5aeb69296a Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1
into  devsrv-b.mysql.com:/space/magnus/my41-bug9535
2005-12-07 17:42:13 +01:00
unknown
09e75b98a5 Updated sp.result.
mysql-test/r/sp.result:
  Updated result.
2005-12-07 16:58:11 +01:00
unknown
a3f4ec45e1 Merge mysql.com:/home/jimw/my/mysql-5.0-15510
into  mysql.com:/home/jimw/my/mysql-5.0-release
2005-12-07 07:37:43 -08:00
unknown
0f9a907830 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/opt/local/work/mysql-5.0-root


sql/sql_parse.cc:
  Auto merged
2005-12-07 18:29:48 +03:00
unknown
17d5f37b90 Fix -ansi -pedantic compilation failure. Fix coding style. 2005-12-07 18:15:02 +03:00
unknown
d85d70303d Merge mysql.com:/home/dlenev/src/mysql-5.0-bg11555-2
into  mysql.com:/home/dlenev/src/mysql-5.0-merges
2005-12-07 18:05:31 +03:00
unknown
72b328b988 Bug#13421 problem with sorting turkish
latin5.xml:
  - Fixing order thee Turkish letters to conform Turkish rules.
  - All non-Turkish accented letters are mappend
    to their non-accented counterparts.


sql/share/charsets/latin5.xml:
  Bug#13421 problem with sorting turkish
  Fixing order to conform the Turkish rules.
  All non-Turkish accented letters are mappend to
  the non-accented counterparts.
2005-12-07 18:48:46 +04:00
unknown
ce039c5ed6 Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/bug9535/my41-bug9535
into  devsrv-b.mysql.com:/space/magnus/my41-bug9535
2005-12-07 15:46:57 +01:00
unknown
6b6eb1aba4 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'
    - Comitting again, the old patch seems to have been lost.


mysql-test/r/func_misc.result:
  Test results updated
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-12-07 15:45:31 +01:00
unknown
6a0bf1d4fd Post-merge fix of sql/share/errmsg.txt
sql/share/errmsg.txt:
  Post-merge fix.
2005-12-07 15:22:01 +01:00
unknown
943edab9a5 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-sp-vars-merge-2


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/sp_head.cc:
  Merge.
2005-12-07 17:17:42 +03:00
unknown
2dbeedd504 Merge mysql.com:/usr/home/pem/bug14834/mysql-5.0
into  mysql.com:/usr/home/pem/mysql-5.1-new


BitKeeper/triggers/post-commit:
  Merge.
configure.in:
  Manual merge.
mysql-test/r/sp.result:
  Merge.
mysql-test/r/view.result:
  Merge.
sql/share/errmsg.txt:
  Manual merge.
sql/sp_head.cc:
  Merge.
sql/sql_parse.cc:
  Merge.
sql/sql_table.cc:
  Merge.
sql/sql_yacc.yy:
  Merge.
2005-12-07 15:17:18 +01:00
unknown
6b2f13098a Patch for WL#2894: Make stored routine variables work
according to the standard.

The idea is to use Field-classes to implement stored routines
variables. Also, we should provide facade to Item-hierarchy
by Item_field class (it is necessary, since SRVs take part
in expressions).

The patch fixes the following bugs:
  - BUG#8702: Stored Procedures: No Error/Warning shown for inappropriate data 
    type matching; 
 
  - BUG#8768: Functions: For any unsigned data type, -ve values can be passed 
    and returned; 
 
  - BUG#8769: Functions: For Int datatypes, out of range values can be passed 
    and returned; 
 
  - BUG#9078: STORED PROCDURE: Decimal digits are not displayed when we use 
    DECIMAL datatype; 
 
  - BUG#9572: Stored procedures: variable type declarations ignored; 
 
  - BUG#12903: upper function does not work inside a function; 
 
  - BUG#13705: parameters to stored procedures are not verified; 
 
  - BUG#13808: ENUM type stored procedure parameter accepts non-enumerated
    data; 
 
  - BUG#13909: Varchar Stored Procedure Parameter always BINARY string (ignores 
    CHARACTER SET); 
 
  - BUG#14161: Stored procedure cannot retrieve bigint unsigned;

  - BUG#14188: BINARY variables have no 0x00 padding;

  - BUG#15148: Stored procedure variables accept non-scalar values;


mysql-test/r/ctype_ujis.result:
  Explicitly specify correct charset.
mysql-test/r/schema.result:
  Drop our test database to not affect this test if some test
  left it cause of failure.
mysql-test/r/show_check.result:
  Drop our test database to not affect this test if some test
  left it cause of failure.
mysql-test/r/skip_name_resolve.result:
  Ignore columns with unpredictable values.
mysql-test/r/sp-big.result:
  Add cleanup statement.
mysql-test/r/sp-dynamic.result:
  Add cleanup statements.
mysql-test/r/sp.result:
  Update result file.
mysql-test/r/sum_distinct-big.result:
  Update result file.
mysql-test/r/type_newdecimal-big.result:
  Update result file.
mysql-test/t/ctype_ujis.test:
  Explicitly specify correct charset.
mysql-test/t/schema.test:
  Drop our test database to not affect this test if some test
  left it cause of failure.
mysql-test/t/show_check.test:
  Drop our test database to not affect this test if some test
  left it cause of failure.
mysql-test/t/skip_name_resolve.test:
  Ignore columns with unpredictable values.
mysql-test/t/sp-big.test:
  Add cleanup statement.
mysql-test/t/sp-dynamic.test:
  Add cleanup statements.
mysql-test/t/sp.test:
  Non-scalar values prohibited for assignment to SP-vars;
  polishing.
mysql-test/t/type_newdecimal-big.test:
  Update type specification so that the variables
  can contain the large values used in the test.
sql/field.cc:
  Extract create_field::init() to initialize an existing
  instance of create_field from new_create_field().
sql/field.h:
  Extract create_field::init() to initialize an existing
  instance of create_field from new_create_field().
sql/item.cc:
  - Introduce a new class: Item_sp_variable -- a base class
    of stored-routine-variables classes;
  - Introduce Item_case_expr -- an Item, which is used to access
    to the expression of CASE statement;
sql/item.h:
  - Introduce a new class: Item_sp_variable -- a base class
    of stored-routine-variables classes;
  - Introduce Item_case_expr -- an Item, which is used to access
    to the expression of CASE statement;
sql/item_func.cc:
  Pass the Field (instead of Item) for the return value of
  a function to the function execution routine.
sql/item_func.h:
  Pass the Field (instead of Item) for the return value of
  a function to the function execution routine.
sql/mysql_priv.h:
  Move create_virtual_tmp_table() out of sql_select.h.
sql/sp.cc:
  Use create_result_field() instead of make_field().
sql/sp_head.cc:
  - Add a function to map enum_field_types to Item::Type;
  - Add sp_instr_push_case_expr instruction -- an instruction
    to push CASE expression into the active running context;
  - Add sp_instr_pop_case_expr instruction -- an instruction
    to pop CASE expression from the active running context;
  - Adapt the SP-execution code to using Fields instead of Items
    for SP-vars;
  - Use create_field structure for field description instead of
    a set of members.
sql/sp_head.h:
  - Add a function to map enum_field_types to Item::Type;
  - Add sp_instr_push_case_expr instruction -- an instruction
    to push CASE expression into the active running context;
  - Add sp_instr_pop_case_expr instruction -- an instruction
    to pop CASE expression from the active running context;
  - Adapt the SP-execution code to using Fields instead of Items
    for SP-vars;
  - Use create_field structure for field description instead of
    a set of members.
sql/sp_pcontext.cc:
  - Change rules to assign an index of SP-variable: use
    transparent index;
  - Add an operation to retrieve a list of defined SP-vars
    from the processing context recursively.
sql/sp_pcontext.h:
  - Change rules to assign an index of SP-variable: use
    transparent index;
  - Add an operation to retrieve a list of defined SP-vars
    from the processing context recursively.
sql/sp_rcontext.cc:
  - Change rules to assign an index of SP-variable: use
    transparent index;
  - Use a tmp virtual table to store SP-vars instead of Items;
  - Provide operations to work with CASE expresion.
sql/sp_rcontext.h:
  - Change rules to assign an index of SP-variable: use
    transparent index;
  - Use a tmp virtual table to store SP-vars instead of Items;
  - Provide operations to work with CASE expresion.
sql/sql_class.cc:
  - Reflect Item_splocal ctor changes;
  - Item_splocal::get_offset() has been renamed to get_var_idx().
sql/sql_class.h:
  Polishing.
sql/sql_parse.cc:
  Extract create_field::init() to initialize an existing
  instance of create_field from new_create_field().
sql/sql_select.cc:
  Take care of BLOB columns in create_virtual_tmp_table().
sql/sql_select.h:
  Move create_virtual_tmp_table() out of sql_select.h.
sql/sql_trigger.cc:
  Use boolean constants for boolean type instead of numerical ones.
sql/sql_yacc.yy:
  Provide an instance of create_field for each SP-var.
mysql-test/include/sp-vars.inc:
  The definitions of common-procedures, which are created
  under different circumstances.
mysql-test/r/sp-vars.result:
  Result file for the SP-vars test.
mysql-test/sp-vars.test:
  A new test for checking SP-vars functionality.
2005-12-07 17:01:17 +03:00
unknown
83142adf50 Fixed sp-error.test result after merging fix for bug #11555 "Stored procedures:
current SP tables locking make impossible view security" with main tree.


mysql-test/r/sp-error.result:
  Fixed test result after merging fix for bug #11555 "Stored procedures: current
  SP tables locking make impossible view security" with main tree.
2005-12-07 16:55:16 +03:00
unknown
20f59cd255 Merge pmartin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/home/pem/mysql-5.1-new


mysql-test/t/disabled.def:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
2005-12-07 12:59:44 +01:00
unknown
920c1a354d Fixed compile error in sql_acl.cc.
sql/sql_acl.cc:
  Fixed compile error.
2005-12-07 12:58:33 +01:00
unknown
9c8773f563 Merge bk-internal:/home/bk/mysql-5.0
into  mysql.com:/data0/mysqldev/my/mysql-5.0
2005-12-07 12:50:14 +01:00
unknown
c4b8823fc3 Bump version number following 5.0.17 release clone-off
configure.in:
  Bump version number following release clone-off
2005-12-07 12:43:32 +01:00
unknown
6ccd6c0f9c Merge lgrimmer@bk-internal:/home/bk/mysql-5.0
into  mysql.com:/space/my/mysql-5.0
2005-12-07 12:42:36 +01:00
unknown
2423940675 Merge lgrimmer@bk-internal:/home/bk/mysql-5.1-new
into  mysql.com:/space/my/mysql-5.1


mysql-test/t/disabled.def:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
2005-12-07 12:38:52 +01:00
unknown
a2023cf018 Merge mysqldev@production.mysql.com:my/mysql-5.0-release
into  mysql.com:/home/dlenev/src/mysql-5.0-bg11555-2


mysql-test/r/view.result:
  Auto merged
mysql-test/t/sp-error.test:
  Auto merged
sql/sp_head.cc:
  Auto merged
mysql-test/r/sp-error.result:
  SCCS merged
2005-12-07 14:38:20 +03:00
unknown
9adfccfb0c Merge mysql.com:/space/my/mysql-5.0-merg
into  mysql.com:/space/my/mysql-5.0
2005-12-07 12:23:53 +01:00
unknown
509ceca691 Merge mysql.com:/space/my/mysql-5.0
into  mysql.com:/space/my/mysql-5.1


mysql-test/t/disabled.def:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
2005-12-07 11:52:47 +01:00
unknown
6f4fb143db Merge pmartin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/home/pem/mysql-5.1-new


mysql-test/t/disabled.def:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
2005-12-07 11:19:51 +01:00
unknown
24af7680d4 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/dlenev/src/mysql-5.0-bg11555-2


mysql-test/r/sp-error.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_trigger.h:
  Auto merged
sql/sp.cc:
  Manual merge.
sql/sp.h:
  Manual merge.
sql/sql_base.cc:
  Manual merge.
2005-12-07 12:47:25 +03:00