Commit graph

17574 commits

Author SHA1 Message Date
unknown
11b1f49f5f Bug #7593
Caused a hard limit of 64 unique indexes in cluster
2004-12-31 02:22:48 +01:00
unknown
8736181d82 page0page.c:
page_dir_find_owner_slot(): Fix bug in corruption diagnostics.


innobase/page/page0page.c:
  page_dir_find_owner_slot(): Fix bug in corruption diagnostics.
2004-12-31 00:56:54 +02:00
unknown
9e8f628d3d row0upd.c:
row_upd_clust_rec(): Call btr_cur_get_rec() after
  btr_pcur_restore_position(), not before.  (Bug #7598)


innobase/row/row0upd.c:
  row_upd_clust_rec(): Call btr_cur_get_rec() after
  btr_pcur_restore_position(), not before.
2004-12-31 00:46:33 +02:00
unknown
cdf70f2ede Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/marko/j/mysql-5.0
2004-12-30 19:14:38 +02:00
unknown
c6d329b4f7 InnoDB: Remove crash in in-place update from NULL to non-NULL. (Bug #7591)
rem0rec.c:
  rec_init_offsets(): Make the function comment more accurate.
rem0rec.ic:
  rec_get_nth_field(): Return pointer to the field, even to NULL fields.
  rec_set_nth_field(): Make more accurate debug assertions.


innobase/include/rem0rec.ic:
  rec_get_nth_field(): Return pointer to the field, even to NULL fields.
  rec_set_nth_field(): Make more accurate debug assertions.
innobase/rem/rem0rec.c:
  rec_init_offsets(): Make the function comment more accurate.
2004-12-30 19:13:31 +02:00
unknown
0c0d8cfd96 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/cps/mysql/trees/mysql-5.0
2004-12-30 19:25:51 +03:00
unknown
c1b5d27260 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/cps/mysql/trees/mysql-5.0
2004-12-30 19:21:10 +03:00
unknown
fe5e169980 Merge from 4.1: fix for bug #7285 (embedded server)
libmysql/libmysql.c:
  Merge from 4.1: fix for bug #7285
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-12-30 17:17:21 +01:00
unknown
ecf24c66cf Removed unnecessary chahges from previous commit(see ChangeSet 1.1761 04/12/30) 2004-12-30 19:16:44 +03:00
unknown
525242d37f wl#1629 SHOW with WHERE(final part, after review)
added syntax:
  'show variables where', 'show status where', 'show open tables where'


mysql-test/r/grant_cache.result:
  wl#1629 SHOW with WHERE(final part,after review)
mysql-test/r/information_schema.result:
  wl#1629 SHOW with WHERE(final part,after review)
mysql-test/r/query_cache.result:
  wl#1629 SHOW with WHERE(final part,after review)
mysql-test/r/temp_table.result:
  wl#1629 SHOW with WHERE(final part,after review)
mysql-test/r/union.result:
  wl#1629 SHOW with WHERE(final part,after review)
mysql-test/t/information_schema.test:
  wl#1629 SHOW with WHERE(final part,after review)
mysql-test/t/query_cache.test:
  wl#1629 SHOW with WHERE(final part,after review)
sql/item.cc:
  wl#1629 SHOW with WHERE(final part,after review)
sql/mysql_priv.h:
  wl#1629 SHOW with WHERE(final part,after review)
sql/sql_parse.cc:
  wl#1629 SHOW with WHERE(final part,after review)
sql/sql_select.cc:
  wl#1629 SHOW with WHERE(final part,after review)
sql/sql_show.cc:
  wl#1629 SHOW with WHERE(final part,after review)
sql/sql_yacc.yy:
  wl#1629 SHOW with WHERE(final part,after review)
sql/table.h:
  wl#1629 SHOW with WHERE(final part,after review)
2004-12-30 15:20:40 +03:00
unknown
499deb9c44 InnoDB: fix bug in insert buffer merge of prefix columns in
new-style InnoDB tables. (Bug #7578)


innobase/ibuf/ibuf0ibuf.c:
  ibuf_dummy_index_add_col(): Add parameter "len"
2004-12-29 23:22:25 +02:00
unknown
44728324f0 InnoDB: Remove dependency on rem0rec.ic from dict0dict.ic (Bug #7464)
innobase/dict/dict0dict.c:
  Make dict_is_mixed_table_rec() a non-inlined function.
innobase/include/dict0dict.h:
  Make dict_is_mixed_table_rec() a non-inlined function.
  Remove dict_index_rec_get_sys_col().
innobase/include/dict0dict.ic:
  Make dict_is_mixed_table_rec() a non-inlined function.
  Remove dict_index_rec_get_sys_col().
innobase/trx/trx0rec.c:
  Replace the two calls to the removed
  function dict_index_rec_get_sys_col() with equivalent code.
2004-12-29 12:09:23 +02:00
unknown
4b24ddeb74 VC++Files/mysqlmanager deleted
BitKeeper/deleted/.del-bitmap1.bmp~54ea131b7c29df5f:
  Delete: VC++Files/mysqlmanager/RES/bitmap1.bmp
BitKeeper/deleted/.del-bitmap3.bmp~6faf6bc91b463d2d:
  Delete: VC++Files/mysqlmanager/RES/bitmap3.bmp
BitKeeper/deleted/.del-bmp00001.bmp~ed2353e7a58f63d8:
  Delete: VC++Files/mysqlmanager/RES/bmp00001.bmp
BitKeeper/deleted/.del-bmp00002.bmp~ba8f5b6fd1066053:
  Delete: VC++Files/mysqlmanager/RES/bmp00002.bmp
BitKeeper/deleted/.del-database.bmp~d1a1f6159bfd71e:
  Delete: VC++Files/mysqlmanager/RES/database.bmp
BitKeeper/deleted/.del-fontd.bmp~bd3e1b7461b00016:
  Delete: VC++Files/mysqlmanager/RES/fontd.bmp
BitKeeper/deleted/.del-fontu.bmp~6e22e2ed7ae639:
  Delete: VC++Files/mysqlmanager/RES/fontu.bmp
BitKeeper/deleted/.del-mysqlmanager.ico~94a243787d626945:
  Delete: VC++Files/mysqlmanager/RES/mysqlmanager.ico
BitKeeper/deleted/.del-mysqlmanager.rc2~fbc8719f8b13efcd:
  Delete: VC++Files/mysqlmanager/RES/mysqlmanager.rc2
BitKeeper/deleted/.del-mysqlmanagerdoc.ico~29c87653289ac9cf:
  Delete: VC++Files/mysqlmanager/RES/mysqlmanagerdoc.ico
BitKeeper/deleted/.del-query_ex.bmp~ab2603bf4bd91317:
  Delete: VC++Files/mysqlmanager/RES/query_ex.bmp
BitKeeper/deleted/.del-toolbar.bmp~168741ee79064a8e:
  Delete: VC++Files/mysqlmanager/RES/toolbar.bmp
BitKeeper/deleted/.del-README.TXT~8ff556bf1b02820a:
  Delete: VC++Files/mysqlmanager/README.TXT
BitKeeper/deleted/.del-childfrm.cpp~3417c093c7cdeb2a:
  Delete: VC++Files/mysqlmanager/childfrm.cpp
BitKeeper/deleted/.del-childfrm.h~9ef4b6fd2c2f9fc1:
  Delete: VC++Files/mysqlmanager/childfrm.h
BitKeeper/deleted/.del-cresource.h~fae297f06d54bb1c:
  Delete: VC++Files/mysqlmanager/cresource.h
BitKeeper/deleted/.del-mainfrm.cpp~d244cbb63582bd80:
  Delete: VC++Files/mysqlmanager/mainfrm.cpp
BitKeeper/deleted/.del-mainfrm.h~b76be2ff891c1071:
  Delete: VC++Files/mysqlmanager/mainfrm.h
BitKeeper/deleted/.del-mysqlmanager.cpp~39ea688f3e047a32:
  Delete: VC++Files/mysqlmanager/mysqlmanager.cpp
BitKeeper/deleted/.del-mysqlmanager.dsp~52d7a8f016396837:
  Delete: VC++Files/mysqlmanager/mysqlmanager.dsp
BitKeeper/deleted/.del-mysqlmanager.dsw~2b8409b0200abf7e:
  Delete: VC++Files/mysqlmanager/mysqlmanager.dsw
BitKeeper/deleted/.del-mysqlmanager.h~1b072d70b3a7182d:
  Delete: VC++Files/mysqlmanager/mysqlmanager.h
BitKeeper/deleted/.del-mysqlmanager.mak~182f734c438d1b3b:
  Delete: VC++Files/mysqlmanager/mysqlmanager.mak
BitKeeper/deleted/.del-mysqlmanager.rc~6464a02e5cd36fcf:
  Delete: VC++Files/mysqlmanager/mysqlmanager.rc
BitKeeper/deleted/.del-mysqlmanagerdoc.cpp~9ff2c50e7fcff890:
  Delete: VC++Files/mysqlmanager/mysqlmanagerdoc.cpp
BitKeeper/deleted/.del-mysqlmanagerdoc.h~7945547b7791a7ce:
  Delete: VC++Files/mysqlmanager/mysqlmanagerdoc.h
BitKeeper/deleted/.del-mysqlmanagerview.cpp~cdd54f8f4624d17:
  Delete: VC++Files/mysqlmanager/mysqlmanagerview.cpp
BitKeeper/deleted/.del-mysqlmanagerview.h~a6bc8b1e58b54505:
  Delete: VC++Files/mysqlmanager/mysqlmanagerview.h
BitKeeper/deleted/.del-registerserver.cpp~b191b37e5d69b483:
  Delete: VC++Files/mysqlmanager/registerserver.cpp
BitKeeper/deleted/.del-registerserver.h~ab70de17932db93a:
  Delete: VC++Files/mysqlmanager/registerserver.h
BitKeeper/deleted/.del-resource.h~26da5f7e53499741:
  Delete: VC++Files/mysqlmanager/resource.h
BitKeeper/deleted/.del-stdafx.cpp~c4ad855530f5cc0f:
  Delete: VC++Files/mysqlmanager/stdafx.cpp
BitKeeper/deleted/.del-stdafx.h~ec4c4d8fb3597657:
  Delete: VC++Files/mysqlmanager/stdafx.h
BitKeeper/deleted/.del-toolsql.cpp~27601d31f5c5c1a6:
  Delete: VC++Files/mysqlmanager/toolsql.cpp
BitKeeper/deleted/.del-toolsql.h~966f9761b84e9df0:
  Delete: VC++Files/mysqlmanager/toolsql.h
BitKeeper/deleted/.del-toolsqlquery.cpp~c0d895cf5657eb97:
  Delete: VC++Files/mysqlmanager/toolsqlquery.cpp
BitKeeper/deleted/.del-toolsqlquery.h~a05f34095fc943eb:
  Delete: VC++Files/mysqlmanager/toolsqlquery.h
BitKeeper/deleted/.del-toolsqlresults.cpp~c263d8e2ba797dc4:
  Delete: VC++Files/mysqlmanager/toolsqlresults.cpp
BitKeeper/deleted/.del-toolsqlresults.h~bd0a93e948792b71:
  Delete: VC++Files/mysqlmanager/toolsqlresults.h
BitKeeper/deleted/.del-toolsqlstatus.cpp~ff5562b787f794ef:
  Delete: VC++Files/mysqlmanager/toolsqlstatus.cpp
BitKeeper/deleted/.del-toolsqlstatus.h~6dad0c576d9c67f4:
  Delete: VC++Files/mysqlmanager/toolsqlstatus.h
2004-12-29 11:41:58 +03:00
unknown
59b274eab8 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/cps/mysql/trees/mysql-5.0
2004-12-29 01:12:09 +03:00
unknown
b859c1921e cleanup 2004-12-29 00:13:32 +03:00
unknown
0c83f07c5e Reverted previous name changes of all bug tests in sp.test, but kept the
robustness (dropping things just in case).


mysql-test/r/sp.result:
  Reverted previous name changes of all bug tests, but kept the
  robustness (dropping things just in case).
mysql-test/t/sp.test:
  Reverted previous name changes of all bug tests, but kept the
  robustness (dropping things just in case).
2004-12-28 16:58:14 +01:00
unknown
7ce58befd3 InnoDB: Fix some bugs in the new record format. (Bug #7493)
innobase/btr/btr0btr.c:
  Remove parameter n_fields from cmp_rec_rec()
innobase/btr/btr0cur.c:
  Remove parameter n_fields from cmp_rec_rec_with_match()
innobase/btr/btr0pcur.c:
  Remove parameter n_fields from cmp_rec_rec()
innobase/include/rem0cmp.h:
  Remove parameter n from cmp_rec_rec_with_match() and cmp_rec_rec()
innobase/include/rem0cmp.ic:
  Remove parameter n from cmp_rec_rec()
innobase/include/rem0rec.ic:
  Correct the implementation of rec_offs_nth_size() (Bug #7493)
innobase/page/page0page.c:
  Remove parameter n_fields from cmp_rec_rec()
innobase/rem/rem0cmp.c:
  Remove parameter n from cmp_rec_rec_with_match()
innobase/rem/rem0rec.c:
  rec_get_offsets(): Pass the number of allocated elements to
  rec_offs_set_n_alloc() instead of the number of allocated bytes,
  so that debugging assertions are more likely to detect
  out-of-bounds errors.
2004-12-28 01:34:52 +02:00
unknown
e3c7697431 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2004-12-27 23:21:06 +01:00
unknown
1fb2c0bcbe Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2004-12-27 23:18:25 +01:00
unknown
83e58bc0ea strings/decimal.c
test_d2b2d("123.4", 10, 2, "123.40");


strings/decimal.c:
  test_d2b2d("123.4", 10, 2, "123.40");
2004-12-27 23:17:09 +01:00
unknown
d6e995bbab Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/M50/mysql-5.0
2004-12-27 15:33:14 +01:00
unknown
75463050b9 Ensure "bottom-up" order of "inline functions" within 'innobase/include/rem0rec.ic'.
This is a partial solution for bug#7464.


innobase/include/rem0rec.ic:
  On several platforms, "inline functions" must be coded before being used, in "bottom-up" order.
  Ensure this for 'rec_get_status' and 'rec_offs_n_fields'.
2004-12-27 14:02:30 +01:00
unknown
520e7f2d50 revert "LOCK TABLES ... WHERE ENGINE=INNODB" 2004-12-27 12:08:22 +01:00
unknown
6499169d81 Fix for bug #7467: sql_lex.c on HPUX fails to compile 2004-12-24 12:42:01 +03:00
unknown
2c92b3f880 Fix for bug: #7218: information_schema: errors in "tables" 2004-12-24 12:16:47 +03:00
unknown
24ea59cf71 Merge mysql.com:/home/mydev/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-wl2126


include/my_base.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
2004-12-23 21:46:10 +01:00
unknown
8d11c01c59 WL#2126 - Multi_read_range.
Added the required structures and functions for
handing over multiple key ranges to the table handler.


include/my_base.h:
  WL#2126 - Multi_read_range.
  Moved key range flags from sql/opt_range.h to here.
  Added the multi-range structure.
sql/handler.cc:
  WL#2126 - Multi_read_range.
  Added the new table handler methods.
sql/handler.h:
  WL#2126 - Multi_read_range.
  Added a new table flag.
  Added a declaration for the handler buffer.
  Added new elements to class handler.
  Added new function declarations.
sql/mysqld.cc:
  WL#2126 - Multi_read_range.
  Added an option to set new system variable 'multi_range_count'.
sql/opt_range.cc:
  WL#2126 - Multi_read_range.
  Added initialization for the new class members.
  Added initialization for the extended get_next().
  Added de-initialization for the allocated buffers.
  Added a buffer allocation method.
  Added an inner loop to collect multiple ranges.
  Adapted range collection loops to the new initialization.
sql/opt_range.h:
  WL#2126 - Multi_read_range.
  Moved key range flags from here to include/my_base.h.
  Added new elements to class QUICK_RANGE_SELECT.
  Added a copy constructor.
sql/records.cc:
  WL#2126 - Multi_read_range.
  Added a call of the allocation method.
sql/set_var.cc:
  WL#2126 - Multi_read_range.
  Added the new system variable 'multi_range_count'.
sql/sql_class.h:
  WL#2126 - Multi_read_range.
  Added the new system variable 'multi_range_count'.
2004-12-23 21:45:10 +01:00
unknown
bec3feaa0b WL#1895 - Print message to error log in case of detected MyISAM corruption
Changed my_error() to print error messages, which come from
arbitrary registered ranges of error messages. Messages can
be unregistered (and should be at end of the program).
Added registration of handler error messages.
Added a new mi_print_error() macro and a new 
mi_report_error() function, which supply error
messages with a table name.
Added calls to mi_print_error() or mi_report_error()
at all places in MyISAM, where table corruption is detected.


extra/comp_err.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added prints for ER_ERROR_FIRST and ER_ERROR_LAST.
  Removed print for ER_ERROR_MESSAGES.
include/errmsg.h:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added declaration for a new function.
  Added first and last error number defines.
include/my_base.h:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added first and last error number defines.
include/my_sys.h:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Removed obsolete defines.
  Removed a global variable, which held pointers to the error message arrays.
  Added declarations for new functions.
include/mysys_err.h:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Removed an obsolete define.
  Changed two defines to use the new defines.
  Added first and last error number defines.
libmysql/errmsg.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Replaced global array initialization by proper registration
  and unregistration of client error messages.
libmysql/libmysql.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added a call for unregistration of client error messages.
myisam/mi_delete.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added calls to the new error logging function at all places, where
  corruption is detected.
  Added a debugging call to pretend MyISAM corruption in case a special
  debug string is set.
  Added a debugging call to test undefined error numbers in case a special
  debug string is set.
myisam/mi_extra.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added calls to the new error logging function at all places, where
  corruption is detected.
myisam/mi_info.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added the error logging function.
myisam/mi_key.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added calls to the new error logging function at all places, where
  corruption is detected.
myisam/mi_keycache.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added calls to the new error logging function at all places, where
  corruption is detected.
myisam/mi_locking.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added calls to the new error logging function at all places, where
  corruption is detected.
myisam/mi_open.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added calls to the new error logging function at all places, where
  corruption is detected.
  Added a debugging call to pretend MyISAM corruption in case a special
  debug string is set.
myisam/mi_page.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added calls to the new error logging function at all places, where
  corruption is detected.
myisam/mi_range.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added calls to the new error logging function at all places, where
  corruption is detected.
myisam/mi_rkey.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added calls to the new error logging function at all places, where
  corruption is detected.
myisam/mi_search.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added calls to the new error logging function at all places, where
  corruption is detected.
myisam/mi_update.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added calls to the new error logging function at all places, where
  corruption is detected.
  Added a debugging call to pretend MyISAM corruption in case a special
  debug string is set.
myisam/mi_write.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added calls to the new error logging function at all places, where
  corruption is detected.
  Added a debugging call to pretend MyISAM corruption in case a special
  debug string is set.
myisam/myisamdef.h:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added the declaration of the new error logging function
  and a new macro.
mysql-test/r/merge.result:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Changed test results. These come from the changed error reporting
  in openfrm().
mysql-test/r/repair.result:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Changed test results. These come from the changed error reporting
  in openfrm().
mysql-test/t/merge.test:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Changederror numbers. These come from the changed error reporting
  in openfrm().
mysys/errors.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Dropped the assignment of the global errors to the
  dropped global pointer array.
mysys/my_error.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Changed my_error() from using a static array of pointers to
  error message arrays to using a linked list of structures
  with pointers to array message arrays.
  Added functions for registering and unregistering error 
  message arrays to the chain.
sql/derror.cc:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Changed reading of mysqld error messages to using the new
  registering and unregistering functions.
sql/handler.cc:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added initialization and deinitialization of handler error messages.
  Included more handler error messages in the mapping to
  mysqld error messages.
sql/mysqld.cc:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Changed deinitialization of error messages to proper
  unregistration.
sql/table.cc:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Changed error reporting in openfrm() so that error messages from
  handler::ha_open() are reported by handler::print_error(). This
  changed messages from "Can't open 't1.MYI' (errno: 130)" to
  "Incorrect file format 't1'" for example.
sql/unireg.h:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Changed two defines to use the new defines.
2004-12-23 20:11:38 +01:00
unknown
1a1974544d Set default port to the one assigned by IANA 2004-12-23 20:47:03 +03:00
unknown
dd6981f4d0 Fix for embedded 2004-12-23 11:42:57 +00:00
unknown
0cc6e44707 Fix compile error, caused by wl#925 variable rename
sql/sql_acl.cc:
  Fix compile error
2004-12-23 11:23:36 +00:00
unknown
90b56f2180 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into pcgem.rdg.cyberkinetica.com:/usr/home/acurtis/work/wl925.4


mysql-test/r/information_schema.result:
  Auto merged
sql/sql_show.cc:
  Auto merged
2004-12-23 10:49:28 +00:00
unknown
09ce0b330b WL#925 - Privileges for stored routines
Implement fine-grained control over access to stored procedures
  Privileges are cached (same way as existing table/column privs)
  


mysql-test/include/system_db_struct.inc:
  WL#925 - Privileges for stored routines
    New system table: procs_priv
mysql-test/r/connect.result:
  WL#925 - Privileges for stored routines
    New system table: procs_priv
mysql-test/r/grant.result:
  WL#925 - Privileges for stored routines
    user table has additional privilege attributes
    SHOW PRIVILEGES amended
mysql-test/r/grant2.result:
  Fix result
mysql-test/r/information_schema.result:
  WL#925 - Privileges for stored routines
    New system table procs_priv
    New user privileges
mysql-test/r/show_check.result:
  Fix result
mysql-test/r/sp-security.result:
  WL#925 - Privileges for stored routines
    Fix existing tests to work with new privileges
    New tests for new privileges
mysql-test/r/sp.result:
  WL#925 - Privileges for stored routines
    Fix SHOW PRIVILEGES results
mysql-test/r/system_mysql_db.result:
  WL#925 - Privileges for stored routines
    New system table: procs_priv
    user and db tables have new privilege attributes
mysql-test/t/grant2.test:
  Fix test
mysql-test/t/show_check.test:
  Fix test
mysql-test/t/sp-security.test:
  WL#925 - Privileges for stored routines
    Allow existing tests to run with new privilege checks
    New tests for privileges
mysql-test/t/system_mysql_db_fix.test:
  WL#925 - Privileges for stored routines
    New system table: procs_priv
scripts/mysql_create_system_tables.sh:
  WL#925 - Privileges for stored routines
    db and user has new privilege attributes
    new system table: procs_priv
scripts/mysql_fix_privilege_tables.sql:
  WL#925 - Privileges for stored routines
    new system table: procs_priv
scripts/mysql_install_db.sh:
  WL#925 - Privileges for stored routines
    Amend comment
sql/item_func.cc:
  WL#925 - Privileges for stored routines
    Privilege check for stored FUNCTION routine
sql/lex.h:
  WL#925 - Privileges for stored routines
    new token ROUTINE
sql/mysql_priv.h:
  WL#925 - Privileges for stored routines
    New function: check_procedure_access()
sql/mysqld.cc:
  WL#925 - Privileges for stored routines
    system option automatic-sp-privileges
sql/set_var.cc:
  WL#925 - Privileges for stored routines
    system option automatic-sp-privileges
sql/share/errmsg.txt:
  WL#925 - Privileges for stored routines
    rename errormessage to conform:
      ER_SP_ACCESS_DENIED_ERROR -> ER_PROCACCESS_DENIED_ERROR
    New error messages
      ER_NONEXISTING_PROC_GRANT, ER_PROC_AUTO_GRANT_FAIL, ER_PROC_AUTO_REVOKE_FAIL
sql/sp.cc:
  WL#925 - Privileges for stored routines
    new function: sp_exists_routine()
sql/sp.h:
  WL#925 - Privileges for stored routines
    new function: sp_exists_routine()
sql/sql_acl.cc:
  WL#925 - Privileges for stored routines
    Implementation for SP privileges.
    Privileges are cached in memory hash.
    New functions:
      mysql_procedure_grant()
      check_grant_procedure()
      sp_revoke_privileges()
      sp_grant_privileges()
sql/sql_acl.h:
  WL#925 - Privileges for stored routines
    New privilege bits: CREATE_PROC_ACL, ALTER_PROC_ACL
    Alter confusing bit-segments to be shifted
    New macros: fix_rights_for_procedure() get_rights_for_procedure()
    New functions:
      mysql_procedure_grant()
      check_grant_procedure()
      sp_grant_privileges()
      sp_revoke_privileges()
sql/sql_lex.h:
  WL#925 - Privileges for stored routines
    new all_privileges attribute in LEX
sql/sql_parse.cc:
  WL#925 - Privileges for stored routines
    Remove function: check_sp_definer_access()
    Add handling for SP grants/revokes
    Add privilege checks for stored procedure invocation
sql/sql_show.cc:
  WL#925 - Privileges for stored routines
    update result for SHOW PRIVILEGES
sql/sql_yacc.yy:
  WL#925 - Privileges for stored routines
    New token ROUTINE
    rename some rules
    handle CREATE ROUTINE / ALTER ROUTINE privileges
2004-12-23 10:46:24 +00:00
unknown
1fabc5de0a Bug#7219 information_schema: errors in "columns"
changed field names in 'collations' table(discussed with PGulutzan)


mysql-test/r/information_schema.result:
  result fix
mysql-test/t/information_schema.test:
  test for bug2719
2004-12-23 13:35:34 +03:00
unknown
d1db2ebf84 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/cps/mysql/trees/mysql-5.0
2004-12-22 01:02:48 +03:00
unknown
8b80b58488 Bug #7468 Instance Manager fails to compile: thread_registry.cc
This fix icludes workaround for Irix compiler bug & removs some unused
variables (resulted in warnings)


server-tools/instance-manager/mysql_connection.cc:
  removed unused variable
server-tools/instance-manager/parse.cc:
  removed unused variable
server-tools/instance-manager/thread_registry.cc:
  Workaround for the Irix compiler bug
server-tools/instance-manager/user_map.cc:
  removed unused variable
2004-12-22 01:00:29 +03:00
unknown
aeb7cc819d Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-tzbug
2004-12-21 17:47:48 +03:00
unknown
3663e2cfb7 Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/jan/mysql-5.0
2004-12-21 15:54:04 +02:00
unknown
920ed11aef Review fixes. 2004-12-21 15:53:01 +02:00
unknown
76ce41bd06 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-tzbug
2004-12-21 16:23:17 +03:00
unknown
ce206d9020 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into gw.mysql.r18.ru:/usr/home/ram/work/5.0.b7283
2004-12-21 16:46:04 +04:00
unknown
97f4b97909 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-tzbug


sql/sql_base.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2004-12-21 15:42:19 +03:00
unknown
9cadf9526d Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into gw.mysql.r18.ru:/usr/home/ram/work/5.0.b7283
2004-12-21 16:12:46 +04:00
unknown
ae08913e6f Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0
2004-12-21 13:03:17 +03:00
unknown
52d080f099 Content merge.
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/handler.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
innobase/trx/trx0roll.c:
  Auto merged.
2004-12-21 07:49:38 +02:00
unknown
272b380b45 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/dbdata/psergey/mysql-5.0-nov-clean


sql/opt_range.cc:
  Auto merged
sql/opt_range.h:
  Auto merged
2004-12-21 02:28:12 +03:00
unknown
1fc04e0b12 Fix for BUG#4480: In joins with SELECT_STRAIGHT_JOIN re-order tables by outer join dependency,
so we read dependent tables after tables they depend on (this is needed for outer joins)


mysql-test/r/join_outer.result:
  Test for BUG#4480
mysql-test/t/join_outer.test:
  Test for BUG#4480
2004-12-21 01:59:58 +03:00
unknown
de5ce11108 Merge akopytov@bk-internal.mysql.com:/home/bk/mysql-5.0
into polly.local:/home/kaa/src/mysql-5.0


innobase/os/os0proc.c:
  Auto merged
2004-12-20 20:20:20 +03:00
unknown
19ee81dfb9 Fixed compilation for old Linux distributions that have no HugeTLB support 2004-12-20 20:17:36 +03:00
unknown
060baf1821 A fix (bug #7283: Test failure: 'update' (using '--ps-protocol': server crash)).
client/mysqltest.c:
  A fix (bug #7283: Test failure: 'update' (using '--ps-protocol': server crash)).
  Unused bind slots should be zeroed.
2004-12-20 20:18:17 +04:00