Commit graph

21423 commits

Author SHA1 Message Date
unknown
941943c0f8 Add the test case for Bug#8722 "prepared statement with view crashes
server" to the test suite, the bug is no longer repeatable.


tests/mysql_client_test.c:
  The test case for Bug#8722 "prepared statement with view crashes server"
2005-03-24 00:48:16 +03:00
unknown
7c5e5b2cc2 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-03-23 22:33:47 +01:00
unknown
564e40da22 Fix a valgrind warning spotted while trying to repeat Bug#7166
"Server crashes when running out of connections"


sql/sql_class.cc:
  thd->query_id is compared with thd->warn_id in push_warning, 
  THD::THD seems to be the best place to fix it.
2005-03-23 23:39:20 +03:00
unknown
a199cc208a Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0


sql/ha_innodb.cc:
  Auto merged
2005-03-23 21:37:56 +01:00
unknown
b9a236a63a Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/media/sda1/mysql/mysql-5.0-6282
2005-03-23 21:38:00 +03:00
unknown
f0b89ba5aa A test case for Bug#6282 "Packet error with SELECT INTO"
(the bug itself is no longer repeatable).


mysql-test/r/variables.result:
  Results fixed (Bug#6282)
mysql-test/t/variables.test:
  A test case for Bug#6282 "Packet error with SELECT INTO"
2005-03-23 21:36:15 +03:00
unknown
c9659f0e6d sql/sql_acl.cc
report correct errror in MODE_NO_AUTO_CREATE_USER
    cleanup
after merge fixes


mysql-test/r/grant2.result:
  updated after merge
mysql-test/r/grant3.result:
  updated after merge
mysql-test/r/rpl_temporary.result:
  sqlstate fixed
mysql-test/t/grant2.test:
  updated after merge
mysql-test/t/grant3.test:
  updated after merge
sql/share/errmsg.txt:
  sqlstate fixed
sql/sql_acl.cc:
  report correct errror in MODE_NO_AUTO_CREATE_USER
  cleanup
2005-03-23 19:18:25 +01:00
unknown
f869b2d59b Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0
2005-03-23 10:52:26 -06:00
unknown
c42e7c7b6e Merge kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
into kite-hub.kitebird.com:/src/extern/MySQL/bk/merge-5.0
2005-03-23 10:47:24 -06:00
unknown
d2ab1393ff README:
Fix typo.


mysql-test/README:
  Fix typo.
2005-03-23 10:45:57 -06:00
unknown
bf8f321efc ha_innodb.cc:
Fix bug #9314 in InnoDB true VARCHAR: InnoDB stored the 'position' of a row wrong in a column prefix primary key index; this could cause MySQL to complain 'ERROR 1032: Can't find record in ...' in an update of the primary key, and also some ORDER BY or DISTINCT queries


sql/ha_innodb.cc:
  Fix bug #9314 in InnoDB true VARCHAR: InnoDB stored the 'position' of a row wrong in a column prefix primary key index; this could cause MySQL to complain 'ERROR 1032: Can't find record in ...' in an update of the primary key, and also some ORDER BY or DISTINCT queries
2005-03-23 18:00:22 +02:00
unknown
cd12c26a31 A fix (bug #9309: Wrong order in INFORMATION_SCHEMA)
strings/ctype-utf8.c:
  A fix (bug #9309: Wrong order in INFORMATION_SCHEMA)
  We should clear the last byte, not the next one.
2005-03-23 17:39:20 +04:00
unknown
226628d12e Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0


mysql-test/mysql-test-run.sh:
  Auto merged
2005-03-23 11:49:11 +01:00
unknown
704b8576f7 added symbols mysql_server_init and mysql_server_end to allow windows
applications with embedded server to connect to external servers too.
(required for Connector/OO.org)
2005-03-23 10:18:43 +01:00
unknown
d27a709f3d merged
BitKeeper/etc/logging_ok:
  auto-union
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/r/ndb_autodiscover.result:
  Auto merged
mysql-test/r/ps_1general.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
scripts/fill_func_tables.sh:
  Auto merged
scripts/mysql_create_system_tables.sh:
  Auto merged
scripts/mysql_fix_privilege_tables.sh:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
sql/field.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/table.cc:
  Auto merged
2005-03-23 09:42:24 +01:00
unknown
903d1b6b51 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-03-23 09:27:59 +01:00
unknown
47a1612d6e Merge mysql.com:/home/jimw/my/mysql-5.0-5036
into mysql.com:/home/jimw/my/mysql-5.0-clean


mysql-test/mysql-test-run.sh:
  Auto merged
2005-03-22 16:09:51 -08:00
unknown
485a58e1f4 Merged
mysql-test/mysql-test-run.sh:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
2005-03-22 22:31:51 +01:00
unknown
1c0c25e747 Simplified rounding up to nearest 64-bit boundry 2005-03-22 22:12:24 +01:00
unknown
e2ca9c5b41 Merge mysql.com:/data0/mysqldev/my/mysql-5.0-build
into mysql.com:/data0/mysqldev/jimw/mysql-5.0-build
2005-03-22 21:57:03 +01:00
unknown
8fc710cee6 Hack to ensure that CHAR's created in 5.0 are not converted to VARCHAR even if
the row type is dynamic (For 4.1 tables old 'VARCHAR' fields are converted to
true VARCHAR in the next ALTER TABLE)
      
This ensures that one can use MySQL 5.0 privilege tables with MySQL 4.1.

(Fix imported from main 5.0 tree to 5.0.3 build tree.)


mysql-test/r/information_schema.result:
  Update results (for .frm version number change)
mysql-test/r/ndb_autodiscover.result:
  Update results (for .frm version number change)
mysql-test/r/ps_1general.result:
  Update results (for .frm version number change)
mysql-test/r/show_check.result:
  Update results (for .frm version number change)
mysql-test/r/view.result:
  Update results (for .frm version number change)
scripts/fill_func_tables.sh:
  Ensure that no privilege tables that is used in 4.1 uses VARCHAR
scripts/mysql_create_system_tables.sh:
  Ensure that no privilege tables that is used in 4.1 uses VARCHAR
sql/sql_table.cc:
  Only set create_info->varchar if we are using the new VARCHAR field
scripts/mysql_fix_privilege_tables.sh:
  Fixed bug that made it impossible to run the script from the mysql source dist
scripts/mysql_fix_privilege_tables.sql:
  Ensure that no privilege tables that is used in 4.1 uses VARCHAR
sql/table.cc:
  Hack to ensure that CHAR's created in 5.0 are not converted to VARCHAR even if
  the row type is dynamic (For 4.1 tables old 'VARCHAR' fields are converted to
  true VARCHAR in the next ALTER TABLE)
2005-03-22 21:52:01 +01:00
unknown
3ca77071dc Merge mysql.com:/data0/mysqldev/my/mysql-5.0-build
into mysql.com:/data0/mysqldev/serg/m50b
2005-03-22 20:15:56 +01:00
unknown
968410b034 BUG#9339 - Updating a column does not work if the table has a UTF-8 VARCHAR primary key
fixed my_charpos() call in Field_varstring::get_key_image


mysql-test/t/type_varchar.test:
  BUG#9339 - Updating a column does not work if the table has a UTF-8 VARCHAR primary key
mysql-test/r/type_varchar.result:
  BUG#9339 - Updating a column does not work if the table has a UTF-8 VARCHAR primary key
2005-03-22 20:13:49 +01:00
unknown
21c3112536 Merge mysql.com:/data0/mysqldev/my/mysql-5.0-build
into mysql.com:/data0/mysqldev/jimw/mysql-5.0-build
2005-03-22 20:02:53 +01:00
unknown
677a9936a1 Added better comment for perceived problem with fix for Bug #8753 Invalid schema object version after dropping index 2005-03-22 17:48:28 +01:00
unknown
8d0393aae3 Extra fix for perceived problem with fix for Bug #8753 Invalid schema object version after dropping index 2005-03-22 17:42:08 +01:00
unknown
e31642727b Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0


innobase/include/trx0trx.h:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
2005-03-22 16:11:43 +01:00
unknown
3a88de4321 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-build
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl


mysql-test/mysql-test-run.sh:
  Auto merged
2005-03-22 15:57:20 +01:00
unknown
8e23f5fecc Merge 2005-03-22 15:55:24 +01:00
unknown
30a2327848 sql_acl.cc, sql_acl.h, sql_parse.cc
New privilege CREATE USER (CREATE_USER_ACL, Create_user_priv) added
grant2.test:
  new tests (mostly backported from jani's patch)
system_mysql_db.result, sp.result, grant2.result, grant.result:
  results updated


mysql-test/r/grant.result:
  results updated
mysql-test/r/grant2.result:
  results updated
mysql-test/r/sp.result:
  results updated
mysql-test/r/system_mysql_db.result:
  results updated
mysql-test/t/grant2.test:
  new tests (mostly backported from jani's patch)
scripts/mysql_create_system_tables.sh:
  Create_user_priv added
scripts/mysql_fix_privilege_tables.sql:
  Create_user_priv added
sql/sql_acl.cc:
  Create_user_priv added
sql/sql_acl.h:
  Create_user_priv added
sql/sql_parse.cc:
  Create_user_priv added
sql/sql_show.cc:
  Create_user_priv added
sql/sql_yacc.yy:
  Create_user_priv added
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-03-22 15:54:18 +01:00
unknown
6ed02debff Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-build
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
2005-03-22 15:31:56 +01:00
unknown
de5a4c0968 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-build
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-build


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
2005-03-22 15:14:40 +01:00
unknown
27a711b4cb mysql-test-run.sh, mysql-test-run.pl:
InnoDB needs longer start time for second slave on slow hosts


mysql-test/mysql-test-run.pl:
  InnoDB needs longer start time for second slave on slow hosts
mysql-test/mysql-test-run.sh:
  InnoDB needs longer start time for second slave on slow hosts
2005-03-22 15:12:05 +01:00
unknown
c851595c67 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
2005-03-22 15:58:07 +02:00
unknown
06abeb4f63 - Added new error message.
- Changed error message in sql_acl.cc
- Added some more tests for GRANT.


Docs/mysqld_error.txt:
  Added new error message.
mysql-test/r/grant2.result:
  Error message changed.
mysql-test/r/grant3.result:
  Clean up.
mysql-test/t/grant2.test:
  Error message changed.
sql/share/errmsg.txt:
  Added new error message.
sql/sql_acl.cc:
  Changed error message.
mysql-test/t/grant3.test:
  Error message changed.
2005-03-22 15:57:24 +02:00
unknown
a99cb51c9d Hack to ensure that CHAR's created in 5.0 are not converted to VARCHAR even if the row type is dynamic
(For 4.1 tables old 'VARCHAR' fields are converted to true VARCHAR in the next ALTER TABLE)

This ensures that one can use MySQL 5.0 privilege tables with MySQL 4.1


mysql-test/r/information_schema.result:
  Update results (for .frm version number change)
mysql-test/r/ndb_autodiscover.result:
  Update results (for .frm version number change)
mysql-test/r/ps_1general.result:
  Update results (for .frm version number change)
mysql-test/r/show_check.result:
  Update results (for .frm version number change)
mysql-test/r/view.result:
  Update results (for .frm version number change)
scripts/fill_func_tables.sh:
  Ensure that no privilege tables that is used in 4.1 uses VARCHAR
scripts/mysql_create_system_tables.sh:
  Ensure that no privilege tables that is used in 4.1 uses VARCHAR
scripts/mysql_fix_privilege_tables.sh:
  Fixed bug that made it impossible to run the script from the mysql source dist
scripts/mysql_fix_privilege_tables.sql:
  Ensure that no privilege tables that is used in 4.1 uses VARCHAR
sql/sql_table.cc:
  Only set create_info->varchar if we are using the new VARCHAR field
sql/table.cc:
  Hack to ensure that CHAR's created in 5.0 are not converted to VARCHAR even if the row type is dynamic
  (For 4.1 tables old 'VARCHAR' fields are converted to true VARCHAR in the next ALTER TABLE)
2005-03-22 15:48:06 +02:00
unknown
3e13c80a20 Merge mysql.com:/M50/build-5.0.3 into mysql.com:/M50/push-5.0 2005-03-22 11:53:29 +01:00
unknown
0550fead3b disabling rpl_timezone.test if --ps-protocol, as binlogging of CONVERT_TZ(,,@@time_zone)
fails there; until we find reason (me and possibly Konstantin).


mysql-test/t/rpl_timezone.test:
  disabling test if --ps-protocol, until we find reason
sql/slave.cc:
  fixing comment
2005-03-22 11:38:51 +01:00
unknown
135979d959 Revert the inclusion of 'signal.h' as the module contains 'kill()'.
server-tools/instance-manager/instance.cc:
  Revert the inclusion of 'signal.h' as this module contains 'kill()'.
2005-03-22 10:39:26 +01:00
unknown
6b94830a09 Merge jwinstead@production.mysql.com:mysql-5.0-build
into mysql.com:/data0/mysqldev/jimw/mysql-5.0-build
2005-03-22 02:06:34 +01:00
unknown
bac0698065 Fixed newly introduced bug in ROLLUP 2005-03-22 02:36:31 +02:00
unknown
2daffc8727 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into production.mysql.com:/nfstmp1/guilhem/mysql-5.0-prod
2005-03-22 01:32:24 +01:00
unknown
a2bf9d52ee Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into production.mysql.com:/nfstmp1/guilhem/mysql-5.0-prod


BitKeeper/etc/logging_ok:
  auto-union
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
2005-03-22 00:28:33 +01:00
unknown
ac46bf77ae Last part of WL#1062: better replication of timezones: no more use
of SET ONE_SHOT; storing tz info directly in event (if this info is needed),
it's now allowed to have different global tz on master and slave.


client/mysqlbinlog.cc:
  we need MAX_TIME_ZONE_NAME_LENGTH when processing log_event.h, and it's declared in mysql_priv.h
mysql-test/r/rpl_timezone.result:
  result update
mysql-test/t/rpl_timezone-slave.opt:
  Now that we can have different global value of timezone on master and slave, let's test it.
mysql-test/t/rpl_timezone.test:
  Tests of the new replication of timezones: checking the output of mysqlbinlog,
  replication of CONVERT_TZ().
sql/ha_innodb.cc:
  No very fast shutdown on Netware (anyway it's disabled on all platforms,
  but this is so that we don't forget to keep it disabled on Netware in the future).
sql/log.cc:
  No more need to write SET ONE_SHOT to binlog for character set and timezone
  (as we store this info  directly nin the Query_log_event now).
sql/log_event.cc:
  Exclude ::write() methods if MYSQL_CLIENT.
  Storing timezone info in the Query_log_event in master. Re-reading it in slave.
  Small code cleanups. I plan to not store the end 0 of catalog in binlog
  events soon.
sql/log_event.h:
  replication of time zones: a place for tz info in Query_log_event,
  in LAST_EVENT_INFO. Plus if we are compiling a client, we don't need
  the ::write() methods, so keeping them out (of mysqlbinlog.cc;
  keeping them in, resulted in problem that mysqlbinlog does not know Timezone
  structure).
sql/mysql_priv.h:
  moving this define from tztime.h (tztime.h has things which are
  too much for a client like mysqlbinlog).
sql/set_var.cc:
  It's now allowed to change global value of charset or timezone even if using binlogging
  or if being a slave.
  Making CONVERT_TZ(,,@@session.time_zone) replicate.
sql/set_var.h:
  these ::check()s are not needed anymore (changing global charset
  or timezone is now allowed even if binlogging or slave)
sql/slave.cc:
  No more need to check for same global timezone if master is 5.x
  (ok, strictly speaking if it is > 5.0.3 but this is alpha).
sql/slave.h:
  a function to wrap settings of charset to default.
sql/tztime.cc:
  Adaptation of my_tz_find() to the case where it's not called from inside
  a query (i.e. cannot join its tz tables to the query's ones): this variant
  opens the tz tables itself, reads from them, and closes them. This is presently
  only used by the slave SQL thread (when it sets the tz before executing a query).
sql/tztime.h:
  declaration of new function, plus moving symbol to mysql_priv.h
  for easier usage in mysqlbinlog (Dmitri, pardon me).
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-03-22 00:26:12 +01:00
unknown
523a421725 Merge mysql.com:/home/cps/mysql/devel/im-failure-fix
into mysql.com:/home/cps/mysql/devel/merge-5.0
2005-03-22 02:22:48 +03:00
unknown
ddfdd6aa3b Fix for AIX compilation failure: sacred knowledge of my_global.h nature (it should be
included before any other include) was hidden from me.


server-tools/instance-manager/commands.cc:
  Fix for AIX compilation failure & cleanup
server-tools/instance-manager/commands.h:
  Fix for AIX compilation failure & cleanup
server-tools/instance-manager/factory.cc:
  Fix for AIX compilation failure & cleanup
server-tools/instance-manager/guardian.cc:
  Fix for AIX compilation failure & cleanup
server-tools/instance-manager/guardian.h:
  Fix for AIX compilation failure & cleanup
server-tools/instance-manager/instance.cc:
  Fix for AIX compilation failure & cleanup
server-tools/instance-manager/instance.h:
  Fix for AIX compilation failure & cleanup
server-tools/instance-manager/instance_map.cc:
  Fix for AIX compilation failure & cleanup
server-tools/instance-manager/instance_map.h:
  Fix for AIX compilation failure & cleanup
server-tools/instance-manager/instance_options.cc:
  Fix for AIX compilation failure & cleanup
server-tools/instance-manager/log.cc:
  Fix for AIX compilation failure & cleanup
server-tools/instance-manager/manager.cc:
  Fix for AIX compilation failure & cleanup
server-tools/instance-manager/messages.cc:
  Fix for AIX compilation failure & cleanup
server-tools/instance-manager/messages.h:
  Fix for AIX compilation failure & cleanup
server-tools/instance-manager/mysql_connection.cc:
  Fix for AIX compilation failure & cleanup
server-tools/instance-manager/mysqlmanager.cc:
  Fix for AIX compilation failure & cleanup
server-tools/instance-manager/options.cc:
  Fix for AIX compilation failure & cleanup
server-tools/instance-manager/parse.cc:
  Fix for AIX compilation failure & cleanup
server-tools/instance-manager/parse_output.cc:
  Fix for AIX compilation failure & cleanup
server-tools/instance-manager/protocol.cc:
  Fix for AIX compilation failure & cleanup
server-tools/instance-manager/protocol.h:
  Fix for AIX compilation failure & cleanup
server-tools/instance-manager/thread_registry.cc:
  Fix for AIX compilation failure & cleanup
server-tools/instance-manager/user_map.h:
  Fix for AIX compilation failure & cleanup
2005-03-22 02:04:14 +03:00
unknown
5be4362874 Fix Windows compile warnings, declarations of walk functions
sql/item_func.cc:
  Remove unused variable
sql/handler.cc:
  Fix warnings
sql/item_sum.cc:
  Restore C_MODE_START/END around count_distinct_walk
  Change second argument to dump_leaf_key to correct type
sql/item_sum.h:
  Change second argument to dump_leaf_key to correct type
2005-03-22 00:00:24 +01:00
unknown
0b93a4f112 Remove references to no-longer-used MySqlManager project files
BitKeeper/deleted/.del-MySqlManager_ia64.dsp~179439d0832c941e:
  Delete: VC++Files/mysqlmanager/MySqlManager_ia64.dsp
VC++Files/mysql.dsw:
  Remove MySqlManager and references to it
VC++Files/mysql_ia64.dsw:
  Remove references to MySqlManager
2005-03-21 23:32:27 +01:00
unknown
61f1e9a3e4 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0


sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2005-03-21 23:46:11 +02:00
unknown
802c41e04d Cleanups during review of code
Fixed newly introduced bug in rollup


client/mysqldump.c:
  Safer buffer allocation
  Removed wrong assert
mysql-test/r/olap.result:
  more tests
mysql-test/t/olap.test:
  more tests
sql/handler.cc:
  Simple cleanup
  Fixed wrong check for next digit (wrong debug output)
sql/item.cc:
  Replace shrink_to_length() with mark_as_const() as the former allowed one to do changes to the string
sql/item_sum.cc:
  Change reference to pointer
  Trivial optimzation of testing 'allways_null'
sql/mysqld.cc:
  Proper indentation of comment
sql/sql_select.cc:
  Fixed newly introduced bug in rollup
sql/sql_string.h:
  Remove not needed 'shrink_to_length()'
  Added 'mark_as_const()' to be used when one want to ensure that a string is not changed
2005-03-21 23:41:28 +02:00