Commit graph

22914 commits

Author SHA1 Message Date
unknown
0e6674a972 fix embedded build
sql/sql_acl.cc:
  style fix, long line.
  fix for embedded build which I broke
2005-05-17 23:49:01 +01:00
unknown
92834915d7 Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0
into xiphis.org:/usr/home/antony/work2/p1-bug10246.1
2005-05-17 21:13:25 +01: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
32544f323a ha_innodb.cc:
Fix bug #10359 : remove extra code


sql/ha_innodb.cc:
  Fix bug #10359 : remove extra code
2005-05-17 21:47:28 +03:00
unknown
6358cdee1e ha_innodb.h, ha_innodb.cc:
Fix bug #10359 : the critical AUTO-INC bug in InnoDB; since reading of the auto-inc counter in an INSERT was not protected by the AUTO-INC table lock of InnoDB, two inserted rows could get the same value for the auto-inc counter, leading to a duplicate key error


sql/ha_innodb.cc:
  Fix bug #10359 : the critical AUTO-INC bug in InnoDB; since reading of the auto-inc counter in an INSERT was not protected by the AUTO-INC table lock of InnoDB, two inserted rows could get the same value for the auto-inc counter, leading to a duplicate key error
sql/ha_innodb.h:
  Fix bug #10359 : the critical AUTO-INC bug in InnoDB; since reading of the auto-inc counter in an INSERT was not protected by the AUTO-INC table lock of InnoDB, two inserted rows could get the same value for the auto-inc counter, leading to a duplicate key error
2005-05-17 21:43:15 +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
3a9ddef239 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/opt/local/work/mysql-5.0-9643
2005-05-17 15:55:27 +04: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
ece42b0916 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/opt/local/work/mysql-5.0-9643
2005-05-16 23:44:08 +04:00
unknown
9c71571f83 Merge with 4.1 to get fix for memory leak
client/mysql.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/sql_base.cc:
  merge
2005-05-16 20:21:38 +03:00
unknown
e9beb6d0aa Cleanups based on feedback from Monty.
sql/sql_show.cc:
  Use int10_to_str() instead of my_snprintf() for formatting number
2005-05-16 10:21:28 -07:00
unknown
f80fa96d1c Fix memory leak
client/mysql.cc:
  Remove usage of c_ptr_safe() as this causes a linkage problem when compiling MySQL without inline functions
sql/sql_base.cc:
  Don't use c_ptr_safe() on this string as this causes a realloc and the String object (allocated by sql_yacc.yy) is never freed
2005-05-16 20:16:46 +03:00
unknown
0500fefb14 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/opt/local/work/mysql-5.0-9643
2005-05-16 21:05:57 +04:00
unknown
5fa009aaf5 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/opt/local/work/mysql-5.0-9643


libmysql/libmysql.c:
  Auto merged
2005-05-16 18:48:01 +04:00
unknown
50ff727405 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0


BitKeeper/etc/logging_ok:
  auto-union
2005-05-16 16:44:53 +02:00
unknown
1c1cc00a8a Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/opt/local/work/mysql-5.0-9643


include/mysql.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
2005-05-16 18:29:04 +04:00
unknown
1bb1bc6993 A fix and a test case for Bug#9643 " CURSOR_TYPE_SCROLLABLE dos not work"
- check on the client the unsupported feature and return 
an error message if it's been requested.
Additionally added API support for STMT_ATTR_PREFETCH_ROWS.
Post-review fixes.


include/errmsg.h:
  Add a new error code for "Not implemented" client-side error message.
include/mysql.h:
  Add a statement attribute STMT_ATTR_PREFETCH_ROWS - unsigned long
  number of rows to fetch per one COM_FETCH command, used when there
  is a read-only cursor.
  Note, that we don't break compatibility by adding this new member
  because MYSQL_STMT is always allocated inside the client library by
  mysql_stmt_init.
libmysql/errmsg.c:
  Text for the error message CR_NOT_IMPLEMENTED
libmysql/libmysql.c:
  Implement support for STMT_ATTR_PREFETCH_ROWS
  Return an error message on attempt to set an attribute of a prepared
  statement which is not implemented yet. We probably should be doing
  it in the server: currently the server just ignores unknown attributes.
tests/mysql_client_test.c:
  A test case for Bug#9643 "CURSOR_TYPE_SCROLLABLE dos not work"
  - check that an error message is returned for CURSOR_TYPE_SCROLLABLE.
  Additionally, check setting of STMT_ATTR_PREFETCH_ROWS.
2005-05-16 18:27:21 +04:00
unknown
259699b4eb Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/psergey/mysql-4.1-bug10221
2005-05-16 14:10:02 +00:00
unknown
4b2020c575 Some improvement in Item_int_with_ref class comment. 2005-05-16 14:06:52 +00:00
unknown
2957088d7b Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-05-16 15:28:58 +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
unknown
d15f89c47a After merge fixes
mysql-test/r/alter_table.result:
  Fixed results after merge
sql/handler.cc:
  Trivial optimzation
sql/sql_table.cc:
  Trvial optimization
sql/sql_yacc.yy:
  After merge fix
sql/unireg.cc:
  Removed argument 'null_fields' from make_empty_rec() as it was not needed
  Moved assert() to right place to take bit fields into account
2005-05-16 15:21:35 +03:00
unknown
b9a4e7d88e Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/my/mysql-5.0


sql/sql_select.cc:
  Auto merged
2005-05-16 13:36:17 +03:00
unknown
70c4325d67 Fixed failing tests for not 32 bit intel machines
Fixed bug in mysql_stmt_fetch() when retrieving rows to return


mysql-test/r/ps.result:
  Fix to not get warnings if mysql_client_test.test fails
mysql-test/t/index_merge_ror.test:
  Proper fix for 64 bit intel (which gives uses another, equal good index)
mysql-test/t/ps.test:
  Fix to not get warnings if mysql_client_test.test fails
sql-common/client.c:
  More debugging
sql/sql_prepare.cc:
  Fixed bug in mysql_stmt_fetch() when retrieving rows to return
sql/sql_select.cc:
  More debugging
tests/mysql_client_test.c:
  More debugging
2005-05-16 13:34:23 +03:00
unknown
5112e25c58 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0


BitKeeper/etc/logging_ok:
  auto-union
2005-05-16 12:05:42 +02:00
unknown
70686e252a Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-05-16 11:25:38 +02:00
unknown
b0fc53f336 Build fixes
configure.in:
  Fix for build problems
   - Removing extra semicolon and parentheses, this is not C++ :)
2005-05-16 11:24:41 +02:00
unknown
03d170597a Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/ram/work/5.0.b10655
2005-05-16 13:45:13 +05:00
unknown
eaa7615eb1 a fix (bug #10655: mysys/default.c compilation problem).
mysys/default.c:
  a fix (bug #10655: mysys/default.c compilation problem).
  DBUG_ENTER() must be the first.
2005-05-16 13:40:57 +05:00
unknown
aeda265208 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb


BitKeeper/etc/logging_ok:
  auto-union
mysql-test/mysql-test-run.sh:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
sql/item.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2005-05-16 08:12:35 +02:00
unknown
01dfde6faa Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-05-16 02:55:51 +02:00
unknown
3e029b363f Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
2005-05-16 02:03:18 +02:00
unknown
7f7da689b3 Merge
client/mysqltest.c:
  SCCS merged
2005-05-16 01:25:14 +02:00
unknown
94f3584bc7 mysqltest.c:
To solve bug#8455, call mysql_affected_rows() earlier, before query to find warnings


client/mysqltest.c:
  To solve bug#8455, call mysql_affected_rows() earlier, before query to find warnings
2005-05-16 01:08:42 +02:00
unknown
577f140e3f Merge
include/my_sys.h:
  Auto merged
libmysql/Makefile.shared:
  Auto merged
mysys/default.c:
  SCCS merged
2005-05-16 03:01:05 +04:00
unknown
6b4dbcb4db post-review fixes
include/my_sys.h:
  added prototype for the defaults correction function
libmysql/Makefile.shared:
  my_chsize added to libmysql to let my_correct_defaults_file be used from libmysql
mysys/default.c:
  New defaults function added we use it to correct defaults file. Currently the function doesn't lock defaults
  file. This is because of the linking and backwards-compatibility issues. This needs to be fixed later.
mysys/my_chsize.c:
  comment added
server-tools/instance-manager/buffer.cc:
  cleanup
server-tools/instance-manager/commands.cc:
  refactoring: removed do_command method from most of the classes
server-tools/instance-manager/commands.h:
  cleanup
server-tools/instance-manager/guardian.cc:
  cleanup
server-tools/instance-manager/instance.cc:
  cleanup
server-tools/instance-manager/instance_map.cc:
  cleanup
server-tools/instance-manager/instance_options.cc:
  cleanup
server-tools/instance-manager/instance_options.h:
  cleanup
server-tools/instance-manager/listener.cc:
  cleanup
server-tools/instance-manager/log.cc:
  cleanup
server-tools/instance-manager/manager.cc:
  cleanup
server-tools/instance-manager/messages.cc:
  new errors added
server-tools/instance-manager/mysql_connection.cc:
  cleanup
server-tools/instance-manager/mysql_manager_error.h:
  new error codes added
server-tools/instance-manager/mysqlmanager.cc:
  clenup
server-tools/instance-manager/options.cc:
  cleanup
server-tools/instance-manager/parse.cc:
  removed unused function
server-tools/instance-manager/parse.h:
  removed prototype
server-tools/instance-manager/protocol.cc:
  cleanup
server-tools/instance-manager/protocol.h:
  added enum to be used in protocol.cc instead of the constants
2005-05-16 01:54:02 +04:00
unknown
0697f1d103 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
2005-05-15 20:53:19 +02:00
unknown
8fd8d819d0 mysqltest.c:
To solve bug#6193, also reset require when using 'eval' for running query
mysql-test-run.pl:
  In cleanup, remove possible soft link to var directory


mysql-test/mysql-test-run.pl:
  In cleanup, remove possible soft link to var directory
client/mysqltest.c:
  To solve bug#6193, also reset require when using 'eval' for running query
2005-05-15 20:38:54 +02:00
unknown
db2616673f ndb - wl-2451 update schemafile format change to 5.0.6
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  version update
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  version update
ndb/src/kernel/blocks/dbdict/SchemaFile.hpp:
  version update
ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp:
  version update
2005-05-15 18:10:30 +02:00
unknown
194745cd63 ndb - testScan -n ScanRead488O fix
ndb/test/ndbapi/testScan.cpp:
  remove added test feature
2005-05-15 17:56:39 +02:00
unknown
f4038de74b Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile


mysql-test/mysql-test-run.pl:
  Auto merged
2005-05-15 17:36:36 +02:00
unknown
bea0e79f57 mtr_report.pl, mtr_process.pl, mysql-test-run.pl:
Added option --vardir=<directory> for feature bug#10096


mysql-test/mysql-test-run.pl:
  Added option --vardir=<directory> for feature bug#10096
mysql-test/lib/mtr_process.pl:
  Added option --vardir=<directory> for feature bug#10096
mysql-test/lib/mtr_report.pl:
  Added option --vardir=<directory> for feature bug#10096
2005-05-15 17:22:54 +02:00
unknown
3f53fa149a Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/lib/init_db.sql:
  Auto merged
2005-05-15 07:38:42 +02:00
unknown
657469bab8 mysql-test-run.pl:
Not to conflict with Windows return code 2 for "not found", use 62 for "skip"
init_db.sql:
  Initial db updates


mysql-test/lib/init_db.sql:
  Initial db updates
mysql-test/mysql-test-run.pl:
  Not to conflict with Windows return code 2 for "not found", use 62 for "skip"
2005-05-15 07:34:09 +02:00
unknown
aa778612f7 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
2005-05-15 07:06:47 +02:00
unknown
f4425b50e1 mysqltest.c, mysql-test-run.sh:
Not to conflict with Windows return code 2 for "not found", use 62 for "skip"
mysql-test-run.sh, suppress.purify:
  Use Purify suppress file


mysql-test/suppress.purify:
  Purify suppress file
mysql-test/mysql-test-run.sh:
  Use Purify suppress file
  Not to conflict with Windows return code 2 for "not found", use 62 for "skip"
client/mysqltest.c:
  Not to conflict with Windows return code 2 for "not found", use 62 for "skip"
2005-05-15 06:59:34 +02:00
unknown
fe302e584e Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/cw/mysql-4.1
2005-05-14 23:48:15 +02:00
unknown
04b56a3efa Portability fix (for 64 bit intel) 2005-05-15 00:30:23 +03:00
unknown
3efe3e26b4 merged
BitKeeper/etc/logging_ok:
  auto-union
client/mysql.cc:
  automerged
2005-05-14 19:28:29 +02:00