Commit graph

10027 commits

Author SHA1 Message Date
unknown
3f896fd821 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1


sql/mysqld.cc:
  Auto merged
2003-10-06 20:23:14 +03:00
unknown
6fc8b48c46 Fix for #1447
libmysqld/lib_sql.cc:
  Check for unfetched rows added
2003-10-06 18:01:11 +05:00
unknown
08a08a67db fix_max_connections to resize alarm_queue (Bug #1435)
include/queues.h:
  resize_queue()
include/thr_alarm.h:
  resize_thr_alarm() to resize alarm_queue
mysys/queues.c:
  resize_queue()
mysys/thr_alarm.c:
  resize_thr_alarm() to resize alarm_queue
2003-10-06 14:11:16 +02:00
unknown
c479f5d397 Fix for #1488
libmysqld/lib_sql.cc:
  net->sqlstate should be initialized here
2003-10-06 17:06:05 +05:00
unknown
01cb13912b Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.stmt
2003-10-06 16:33:07 +05:00
unknown
f9ce2f4b58 Fix for #1487
libmysqld/lib_sql.cc:
  arg_parameters now are stored in these THD members
sql/sql_class.h:
  members to store query arguments
sql/sql_prepare.cc:
  query arguments retrieval added for embedded case
  code not necessary in embedded server #ifdefed
2003-10-06 16:32:38 +05:00
unknown
63aebfe5ec Fix for the bug #1336 mysql.cc assumes DATABASE() doesn't return NULL 2003-10-06 15:47:17 +05:00
unknown
9f7674c894 fix error messages
fix derived inside subqueries


mysql-test/r/subselect.result:
  error tex changes whi i forgot to commit
mysql-test/t/derived.test:
  code changing
sql/sql_yacc.yy:
  allow derived inside subselects
2003-10-06 13:16:56 +03:00
unknown
84285351be Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-udf-5.0


sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-10-06 12:08:28 +03:00
unknown
7a614ffb67 Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-derived-4.1
2003-10-06 12:04:08 +03:00
unknown
d2574b928e after review patch (SCRUM)
sql/sql_parse.cc:
  already fixed in right way
sql/udf_example.cc:
  not used function
tests/udf_test.res:
  added test of AS
tests/udf_test:
  added test of AS
2003-10-06 11:13:25 +03:00
unknown
fed70100e7 row0mysql.c:
Remove unintentional changes in previous push


innobase/row/row0mysql.c:
  Remove unintentional changes in previous push
2003-10-06 10:50:12 +03:00
unknown
8e31a24190 row0mysql.c:
Fix bug: if one used the rename trick of ibman section 15.1 to recover a temp table, InnoDB asserted because it tried to lock the data dictionary twice


innobase/row/row0mysql.c:
  Fix bug: if one used the rename trick of ibman section 15.1 to recover a temp table, InnoDB asserted because it tried to lock the data dictionary twice
2003-10-06 10:46:22 +03:00
unknown
08504cfe27 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0


scripts/mysql_config.sh:
  Auto merged
sql/mysqld.cc:
  Auto merged
2003-10-06 09:24:12 +02:00
unknown
1d5c187e2f Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.stmt
2003-10-06 12:10:18 +05:00
unknown
5218a0cd15 Fix for #1470
libmysqld/lib_sql.cc:
  check for error
sql/sql_prepare.cc:
  set success mark here
2003-10-06 12:09:20 +05:00
unknown
9b8114845b Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-errs-4.1


sql/share/czech/errmsg.txt:
  Auto merged
sql/share/danish/errmsg.txt:
  Auto merged
sql/share/dutch/errmsg.txt:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/share/estonian/errmsg.txt:
  Auto merged
sql/share/french/errmsg.txt:
  Auto merged
sql/share/greek/errmsg.txt:
  Auto merged
sql/share/hungarian/errmsg.txt:
  Auto merged
sql/share/italian/errmsg.txt:
  Auto merged
sql/share/japanese/errmsg.txt:
  Auto merged
sql/share/korean/errmsg.txt:
  Auto merged
sql/share/norwegian/errmsg.txt:
  Auto merged
sql/share/norwegian-ny/errmsg.txt:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/share/serbian/errmsg.txt:
  Auto merged
sql/share/slovak/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged
2003-10-05 21:13:54 +03:00
unknown
ff518b9893 prohibited using derived tables in UPDATE command (BUG#1477)
fixed incorrect table name in test


mysql-test/r/derived.result:
  fixed incorrect table name in test
  new test of derived table
mysql-test/t/derived.test:
  fixed incorrect table name in test
  new test of derived table
sql/sql_yacc.yy:
  prohibited using derived tables in UPDATE command
2003-10-05 21:09:50 +03:00
unknown
b2fd821816 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.0
into ice.snake.net:/Users/paul/mysql-4.0
2003-10-04 17:42:43 -05:00
unknown
a0e2753e87 Ride hobby horse.
mysql-test/mysql-test-run.sh:
  deamon -> daemon
scripts/mysql_install_db.sh:
  deamon -> daemon
support-files/my-small.cnf.sh:
  deamon -> daemon
2003-10-04 17:41:17 -05:00
unknown
4f4b786dc2 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.stmt


sql/sql_parse.cc:
  Auto merged
2003-10-04 19:28:50 +05:00
unknown
759aabf7df Fix for bugs #1437, #1446
include/mysql.h:
  read_statistic added to virtual methods
libmysql/client_settings.h:
  interface for cli_read_statistic added
libmysql/libmysql.c:
  read_statistic and mysql_stat code changes
libmysqld/lib_sql.cc:
  emb_read_statistic implemented
  server_version initialized
sql-common/client.c:
  cli_read_statistic added to the table
sql/sql_parse.cc:
  storage of result of COM_STATISTIC changed in embedded library
2003-10-04 19:28:08 +05:00
unknown
67bb21cb71 fixed error message as suggested by Peter Gulutzan 2003-10-04 13:46:23 +03:00
unknown
63ed77ca1d Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_1323/mysql-4.0
2003-10-03 17:55:57 -04:00
unknown
496bc77694 Fixed bug #1323 (varchar fields becoming char fields adter create ... select) 2003-10-03 17:54:32 -04:00
unknown
867f1d28b6 Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1
2003-10-03 23:23:59 +02:00
unknown
d52e95164d Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_1323/mysql-4.1
2003-10-03 17:23:58 -04:00
unknown
ffc5c66927 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_1323/mysql-4.1
2003-10-03 17:22:47 -04:00
unknown
c9c6ae3872 fixed bug with Item_sum_min/Item_sum_max from test func_gconcat.test 2003-10-03 17:22:17 -04:00
unknown
179700e3f3 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2003-10-03 22:18:34 +02:00
unknown
f8a27fef4f editing comments.
mysql-test/t/rpl_relayrotate.test:
  a comment
sql/log_event.cc:
  removed irrelevant comment, added another one.
2003-10-03 22:14:23 +02:00
unknown
1bd7662b89 When the I/O thread was stopped while copying a long transaction, and restarted,
Rotate_log_event::exec_event() believed that the relay log was corrupted. Fixed it
by moving the test for corruption to Start_log_event::exec_event(). 
Changed Rotate_log_event::exec_event() to not increment positions when the
event is seen in the middle of a transaction.
I did a separate commit in 4.1 (so this should not be merged to 4.0) because
code is a bit different in 4.1.
A test to see if the slave detects when the master died while writing a 
transaction to the binlog (uses a forged truncated binlog I made).


sql/log_event.cc:
  When the I/O thread was stopped while copying a long transaction, and restarted,
  Rotate_log_event::exec_event() believed that the relay log was corrupted. Fixed it
  by moving the test for corruption to Start_log_event::exec_event(). 
  Changed Rotate_log_event::exec_event() to not increment positions when the
  event is seen in the middle of a transaction.
2003-10-03 22:13:01 +02:00
unknown
c78680b43f Fix for a rpl_relayrotate failure.
Changed Rotate_log_event::exec_event() to not increment positions when the
event is seen in the middle of a transaction.


mysql-test/r/rpl_relayrotate.result:
  remove timeout which was too short for Valgrind
mysql-test/r/rpl_until.result:
  updated error message
mysql-test/t/rpl_relayrotate.test:
  removed timeout which was too short for Valgrind
sql/log_event.cc:
  Fix for a rpl_relayrotate failure. The problem was that Rotate_log_event::exec_event()
  believed that the relay log was corrupted. Fixed it by moving the test for
  corruption to Start_log_event::exec_event(). 
  Changed Rotate_log_event::exec_event() to not increment positions when the
  event is seen in the middle of a transaction (that was an old bug found by
  chance :)
2003-10-03 20:07:08 +02:00
unknown
311ddd8a32 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.0
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.0
2003-10-03 11:43:50 -05:00
unknown
34c39673e3 Minor edits.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-10-03 11:42:37 -05:00
unknown
4379cbcf30 Check that a FUNCTION contains RETURN and that we actually get a return value.
include/mysqld_error.h:
  New error codes/messages for missing RETURNs in FUNCTIONs.
mysql-test/r/sp-error.result:
  New error tests for missing RETURNs in FUNCTIONs.
mysql-test/t/sp-error.test:
  New error tests for missing RETURNs in FUNCTIONs.
sql/share/czech/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/danish/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/dutch/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/english/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/estonian/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/french/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/german/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/greek/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/hungarian/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/italian/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/japanese/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/korean/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/norwegian-ny/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/norwegian/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/polish/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/portuguese/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/romanian/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/russian/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/serbian/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/slovak/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/spanish/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/swedish/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/ukrainian/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/sp_head.h:
  Check that a FUNCTION contains RETURN.
sql/sql_parse.cc:
  Check that a FUNCTION contains RETURN.
sql/sql_yacc.yy:
  Check that a FUNCTION contains RETURN.
2003-10-03 17:38:12 +02:00
unknown
32ace686f3 sql_cache.cc, mysql_priv.h:
Query cache now takes in account character_set_results and collation_connection


sql/mysql_priv.h:
  Query cache now takes in account character_set_results and collation_connection
sql/sql_cache.cc:
  Query cache now takes in account character_set_results and collation_connection
2003-10-03 17:09:54 +05:00
unknown
869b49efe5 Fixed BUG#822: Copying and clearing some things in thd/lex when
executing sub-statements (selects) prevents crashes intermittent
crashes.
Also fixed bug in sql_yacc.yy (generated a hpop instruction when
not needed).


mysql-test/r/sp.result:
  Test-case for BUG#822.
mysql-test/t/sp.test:
  Test-case for BUG#822.
sql/sp_head.cc:
  Fixed BUG#822; needed to copy and clear some stuff when calling sub-statements.
sql/sql_yacc.yy:
  Only generate hpop instruction when we actually have handlers.
2003-10-03 12:39:12 +02:00
unknown
bd7470241b Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mishka.mysql.fi:/home/my/mysql-4.1


sql/mysql_priv.h:
  Auto merged
2003-10-03 02:08:49 +03:00
unknown
9a0b864a23 Changes in NetWare directory from Novell, pre-4.1.1 2003-10-02 19:08:48 -04:00
unknown
0adf47e67a Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mishka.mysql.fi:/home/my/mysql-4.0
2003-10-03 00:42:47 +03:00
unknown
2985e91acd Optimized code for setting user variables with := and fixed some bugs in old code (Bug #1194)
Use forced close of socket to make mysqld shutdown faster when used under valgrind


mysql-test/mysql-test-run.sh:
  Added --skip-bdb for valgrind
mysql-test/r/user_var.result:
  Extended test for user variables
mysql-test/t/user_var.test:
  Extended test for user variables
sql/item_func.cc:
  Optimized code for setting user variables with := and fixed some bugs in old code
sql/item_func.h:
  Optimized code for setting user variables
sql/log.cc:
  Fixed comments
sql/mysqld.cc:
  Use forced close of socket to make mysqld shutdown faster when used under valgrind
sql/sql_class.h:
  Optimized code for setting user variables
2003-10-03 00:40:27 +03:00
unknown
45b96bb8af thd pointer storing moved to fix_fields() (WL#1254) (SCRUM)
sql/item_subselect.cc:
  thd pointer storing moved to fix_fields()
sql/item_subselect.h:
  thd pointer storing moved to fix_fields()
sql/sql_yacc.yy:
  thd pointer storing moved to fix_fields()
2003-10-02 22:19:41 +03:00
unknown
187ca48554 minor edit (changed tense) as suggested by our docs team.
Portuguese and Swedish are not affected (they were already translated).


sql/share/czech/errmsg.txt:
  changed tense
sql/share/danish/errmsg.txt:
  changed tense
sql/share/dutch/errmsg.txt:
  changed tense
sql/share/english/errmsg.txt:
  changed tense
sql/share/estonian/errmsg.txt:
  changed tense
sql/share/french/errmsg.txt:
  changed tense
sql/share/german/errmsg.txt:
  changed tense
sql/share/greek/errmsg.txt:
  changed tense
sql/share/hungarian/errmsg.txt:
  changed tense
sql/share/italian/errmsg.txt:
  changed tense
sql/share/japanese/errmsg.txt:
  changed tense
sql/share/korean/errmsg.txt:
  changed tense
sql/share/norwegian-ny/errmsg.txt:
  changed tense
sql/share/norwegian/errmsg.txt:
  changed tense
sql/share/polish/errmsg.txt:
  changed tense
sql/share/romanian/errmsg.txt:
  changed tense
sql/share/russian/errmsg.txt:
  changed tense
sql/share/serbian/errmsg.txt:
  changed tense
sql/share/slovak/errmsg.txt:
  changed tense
sql/share/spanish/errmsg.txt:
  changed tense
sql/share/ukrainian/errmsg.txt:
  changed tense
2003-10-02 16:39:48 +02:00
unknown
7722d99eb2 Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1
2003-10-02 16:26:39 +02:00
unknown
7a58bfee61 Reverting changeset 1.1590
sql/slave.h:
  Reverting changeset 1.1590.
2003-10-02 16:25:47 +02:00
unknown
311cd84db8 Had mangled the order of if()s in a previous changeset (1.1596) (not pushed),
correcting it now. Thanks Dmitri for spotting this.


mysql-test/r/user_var.result:
  result update
mysql-test/t/user_var.test:
  a simple test
sql/item_func.cc:
  Had mangled the order of if()s in a previous changeset (1.1596) (not pushed),
  correcting it now.
2003-10-02 16:19:33 +02:00
unknown
39fe2f6a51 Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-udf-5.0
2003-10-02 15:52:39 +03:00
unknown
dcf02aa571 Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-qc_struct-4.1


sql/mysql_priv.h:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2003-10-02 12:18:34 +03:00
unknown
f1666943c0 Structure for storing parameters of query in query cache (asked by Bar)
sql/mysql_priv.h:
  Structure for storing parameters of query in query cache
sql/sql_cache.cc:
  Structure for storing parameters of query in query cache
sql/sql_parse.cc:
  Structure for storing parameters of query in query cache
2003-10-02 12:02:05 +03:00