Commit graph

10028 commits

Author SHA1 Message Date
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
unknown
031b6b5fbb fix for BUG#1331: "Unexistent user variable is not replicated".
When an update query is to be written to the binlog, and it reads unset
user variables (example: INSERT INTO t VALUEs(@a) where @a does not exist),
we create the variable like if it had been set with SET before, and we loop
(i.e. we redo the steps of logging, now that the variable exists).


mysql-test/r/rpl_user_variables.result:
  result update.
mysql-test/t/rpl_user_variables.test:
  test to see if unset user variables are written to the binlog
sql/item_func.cc:
  When an update query is to be written to the binlog, and it reads unset
  user variables (example: INSERT INTO t VALUEs(@a) where @a does not exist),
  we create the variable like if it had been set with SET before, and we loop
  (i.e. we redo the steps of logging, now that the variable exists).
2003-10-02 10:31:37 +02:00
unknown
cce14aabfc Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into teton.kitebird.com:/home/paul/mysql-4.1
2003-10-01 12:24:40 -05:00
unknown
904dee7a97 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2003-10-01 18:46:24 +02:00
unknown
3258587258 Follow-up of an IRC discussion today. Declaring ignore_log_space_limit volatile,
and a comment to explain why.


sql/slave.h:
  Declaring ignore_log_space_limit volatile,
  and a comment to explain why.
2003-10-01 18:40:27 +02:00
unknown
866a3ada7b Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_1194/mysql-4.0
2003-10-01 12:22:30 -04:00
unknown
d7e308c667 turn Item_func_set_user_var
::native_val, ::native_val_int and native_val_str into inline
2003-10-01 12:00:08 -04:00
unknown
2f468db76e Made SELECT INTO variable-list re-entrant, which fixes bug in stored procedures (#822) 2003-10-01 17:15:24 +03:00
unknown
422bb4fcc5 Add proc table if not exists
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-10-01 16:50:50 +03:00
unknown
ee3bf94cbd Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.stmt
2003-10-01 16:45:37 +05:00
unknown
e50b19a047 Fix for #1430
there was an error about sendind prepared parameters to the server


libmysqld/lib_sql.cc:
  parameter's length added as a parameter
sql/ha_berkeley.cc:
  these lines sometimes crashes in embedded library
  so i #ifdef-ed it
sql/item.h:
  add the data_len parameter in the embedded case
sql/sql_prepare.cc:
  i added macroses to make headers of store_param_xxx functions
  they have different number of parameters in standalone an embedded servers
  also get_param_length now is implemented differently in embedded server
2003-10-01 16:44:57 +05:00
unknown
15075b11ab ctype-mb.c:
Stupid typo. Led to compilation failure with non-gcc compilers.


strings/ctype-mb.c:
  Stupid typo. Led to compilation failure with non-gcc compilers.
2003-10-01 11:04:19 +05:00
unknown
3d5505d56e New build directory files - NetWare only, as used in 4.0.15 2003-09-30 23:14:07 -04:00
unknown
e085cada8d Subselect -> subquery 2003-09-30 11:40:15 -05:00
unknown
de6a1085eb rewrite Item_func_set_user_var ::val, ::val_str, ::val_int, ::update
with less code duplication
2003-09-30 12:32:48 -04:00
unknown
16de8b37f8 A note that Valgrind does not give a good stacktrace when the problem
is involving an assembly function.
Testcase was BUG#1194
SELECT @a:=1; SELECT @a, @a:=1;


BUILD/compile-pentium-valgrind-max:
  a warning note about Valgrind&assembly.
2003-09-30 00:08:12 +02:00
unknown
4e24aff59c fix for a random test failure on hpux/ia64
(a missing synchronization in the test)


mysql-test/r/drop_temp_table.result:
  result update
mysql-test/t/drop_temp_table.test:
  synchronize to be sure that the ending connection has finished binlogging.
2003-09-29 22:56:31 +02:00
unknown
794e1387d3 - fixed yet another C++ comment inside a .c file 2003-09-29 22:45:00 +02:00
unknown
55dc3dcb82 Added resetting of replace_result patterns after --exec command in mysqltest (in order to be consistent with ordinary query execution).
client/mysqltest.c:
  Now resetting replace_result patterns after --exec command (in order to be consistent with ordinary query execution).
mysql-test/t/mysqlbinlog.test:
  Added additional replaces potentially needed after adding reset of replace conditions for exec
2003-09-29 23:10:30 +04:00
unknown
43069b953a 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-09-29 22:06:49 +03:00
unknown
f3051834e6 Add missing define (after merge) 2003-09-29 22:06:31 +03:00
unknown
6fbd3da597 fix for #1344
handling of init-file option added to embedded library
main problem was killing of output (resulting recordsets etc)
i added checks for empty output in Protocol:: methods
better solution could be special Protocol_nul class to redirect
results to nowhere


libmysqld/lib_sql.cc:
  code was added to call read_init_file
  Protocol methods now can support output to nowhere
sql/mysqld.cc:
  bootstrap function extended to work in embedded library
sql/sql_parse.cc:
  handle_bootstrap modified to work in embedded library
2003-09-29 21:07:53 +05:00
unknown
4b7c1f831f Bugfix for #1342
I made libmysqld not to do freopen(stdout...)
I think we need better solution here so i added it as a worklog entry #1247


sql/mysqld.cc:
  freopen #ifdef-ed
  Not a perfect solution though
2003-09-29 21:07:52 +05:00
unknown
d5f0f77411 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1


sql/mysqld.cc:
  Auto merged
2003-09-29 19:07:51 +03:00
unknown
5c08e1c1f4 bugfix for #1375
libmysqld/lib_sql.cc:
  some programs check mysql_error for empty string
sql/log.cc:
  in embedded library these members can be NULL
2003-09-29 21:07:51 +05:00
unknown
a8cd1d2773 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.stmt
2003-09-29 21:07:50 +05:00
unknown
3e1cb47889 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/help_correction/mysql-4.1
2003-09-29 12:07:49 -04:00
unknown
b05d33885f Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/help_correction/mysql-4.1
2003-09-29 12:06:23 -04:00
unknown
d2bc40e864 added fine error messages in scripts/fill_help_tables.sh
scripts/fill_help_tables.sh:
  added fine error messages
2003-09-29 11:39:00 -04:00
unknown
ad0a7a3034 - enable changing the number of table bits for JOINs to be increased
from ulong to ulonglong by defining -DBIG_JOINS


sql/mysql_priv.h:
   - enable changing the number of table bits for JOINs to be increased
     from ulong to ulonglong by defining BIG_JOINS
2003-09-29 12:01:10 +02:00
unknown
3b3b0d3a3d Don't print warnings about 'setrlimit' if --warnings is not given
Code review/cleanup of sub subselect_uniquesubquery_engine


sql/ha_myisam.cc:
  Removed unnecessary casts
sql/item_subselect.cc:
  Safety fix (reset engine)
  Code review/cleanup of sub subselect_uniquesubquery_engine
  Remove 'end_exec'. (Should be done on query end, not in the middle)
sql/item_subselect.h:
  Removed end_exec();
sql/mysqld.cc:
  Don't print warnings about 'setrlimit' if --warnings is not given
2003-09-29 12:39:38 +03:00
unknown
e03265d4d5 Removed random chars after filename for LOAD DATA INFILE (in mysqlbinlog)
Add quoting for use `database` for mysqlbinlog
Removed test ins0000001
Add support for --replace for exec in mysqltest
Don't refer to install dir in mysqlbinlog.result


BitKeeper/deleted/.del-ins000001.result~f45c599efdf8352b:
  Delete: mysql-test/r/ins000001.result
BitKeeper/deleted/.del-ins000001.test~2428ee5c9b1bc483:
  Delete: mysql-test/t/ins000001.test
client/mysqlbinlog.cc:
  Removed random chars after filename for LOAD DATA INFILE
client/mysqltest.c:
  Add support for --replace for 'exec'
mysql-test/r/drop_temp_table.result:
  Updated results after quoting change
mysql-test/r/fulltext_multi.result:
  Updated results after quoting change
mysql-test/r/fulltext_order_by.result:
  Updated results after quoting change
mysql-test/r/insert.result:
  New tests
mysql-test/r/insert_select.result:
  Updated results after quoting change
mysql-test/r/mix_innodb_myisam_binlog.result:
  Updated results after quoting change
mysql-test/r/mysqlbinlog.result:
  Updated results after quoting change
mysql-test/r/rpl_log.result:
  Updated results after quoting change
mysql-test/t/fulltext_multi.test:
  Remove 'use'
mysql-test/t/fulltext_order_by.test:
  Remove 'use'
mysql-test/t/insert.test:
  Merge test with ins0000001.test
mysql-test/t/mysqlbinlog.test:
  Don't refer to install dir in result
sql/log_event.cc:
  Add quoting for use `database` for mysqlbinlog
support-files/mysql.server.sh:
  Move pid_file test after arguments have been parsed
2003-09-29 12:31:35 +03:00
unknown
907e055583 enum options renamed to avoid possible name conflicts 2003-09-29 11:21:17 +02:00
unknown
15779a96d7 SCRUM
embedded library
some fixes - cleanup procedure changed for embedded library - deletion of
embedded mysql->thd


include/mysql.h:
  free_embedded_thd added to the list of virtual methods
libmysqld/embedded_priv.h:
  function deleted
libmysqld/lib_sql.cc:
  function moved upper in file
sql-common/client.c:
  call of free_embedded_thd added
2003-09-29 14:09:51 +05:00
unknown
9a942c854f SCRUM
WL604 Privilegies in embedded library
another bug fixed


sql/sql_parse.cc:
  flag selection fixed
2003-09-29 12:50:28 +05:00
unknown
65ad60db40 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.stmt


sql/sql_db.cc:
  Auto merged
2003-09-29 12:27:39 +05:00
unknown
e1c1aa7aaf SCRUM
WL#604 Privileges in embedded library
bugs fixed


sql/mysql_priv.h:
  reload_acl_and_cache interface unifdefed
sql/sql_parse.cc:
  ifdefs added/removed
2003-09-29 11:47:37 +05:00
unknown
206168cd0a typo fixed (bug #1390 - incorrect mysql_config output) 2003-09-28 21:35:47 +02:00
unknown
3106e3119a Fix for BUG#1345 "SQL Syntax Error in binarylog with DROP TABLES":
it's just backquoting the db's and table's names
when writing DROP TEMPORARY TABLE to the binlog when a connection ends.
A testcase for this.


sql/sql_base.cc:
  backquote db and table name when writing DROP TEMPORARY TABLE to the binlog
  when a connection ends.
2003-09-28 18:31:49 +02:00
unknown
bb9a92cc53 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


include/mysql_com.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/udf_example.cc:
  Auto merged
2003-09-28 12:00:30 +03:00
unknown
eb7dc66717 make mysqld to respect socket/port options of mysqld_safe command line
and [mysqld_safe] section in my.cnf, even if they are also specified
in [mysql] section.
2003-09-27 18:54:22 +02:00
unknown
8094305c86 Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2003-09-27 00:43:12 +02:00
unknown
223716f35d - better test for a string to avoid "test: integer expression expected"
if a variable is not defined (empty).
2003-09-27 00:25:57 +02:00
unknown
f0cb432fd3 - added missing zlib subdirectory to the source distribution
(crc32.c is included by mysys/my_crc32.c)
2003-09-26 23:57:06 +02:00
unknown
d84ae0fde9 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2003-09-26 23:44:27 +02:00
unknown
e7f4749fb6 Fix for 64-bit machines.
I am almost sure this is the cause for
BUG#1381 [Opn]: Bug in replication on HP-UX 64 bit binaries?
BUG#1256 [CRp]: Replication slave fails to connect to master in 64-bit version (Solaris)
The reason why I think it's wrong is that the normal client code has 
uint32 ip_addr.
(of course on 32-bit machines it does not matter, but on 64-bit it does).
2003-09-26 23:43:22 +02:00
unknown
a4f7ed563f Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1
2003-09-26 22:57:34 +02:00
unknown
44f65c246d A fix of the fix for BUG#1209 (was: SELECT DATABASE() still shows dropped database).
Don't free the client's selected db (thd->db) when it has been DROPped,
if this is a slave thread; the x_free() was causing a lot
of various bugs in rpl_loaddata_rule_m (garbage characters, segfault, hangs in
other threads).
A small post-merge fix (rli->inside_transaction exists in 4.0 only).


sql/log_event.cc:
  Post-merge fix (rli->inside_transaction existed in 4.0 only)
sql/sql_db.cc:
  Don't free the client's selected db (thd->db) when it has been DROPped,
  if this is a slave thread; the x_free() was causing a lot
  of various bugs in rpl_loaddata_rule_m which does a DROP DATABASE 
  (garbage characters, segfault, hangs in other threads).
2003-09-26 22:56:13 +02:00
unknown
f755cb36d0 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-rplunt
2003-09-26 17:55:10 +04:00
unknown
4a3bb67886 Fixed spurios failures of rpl_until test.
mysql-test/r/rpl_until.result:
  Fixed race then sometimes io slave thread stopped without managing to get any data from master and sometimes not.
mysql-test/t/rpl_until.test:
  Fixed race then sometimes io slave thread stopped without managing to get any data from master and sometimes not.
2003-09-26 17:42:05 +04:00