Commit graph

7077 commits

Author SHA1 Message Date
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
63aebfe5ec Fix for the bug #1336 mysql.cc assumes DATABASE() doesn't return NULL 2003-10-06 15:47:17 +05: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
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
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
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
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
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
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
7a58bfee61 Reverting changeset 1.1590
sql/slave.h:
  Reverting changeset 1.1590.
2003-10-02 16:25:47 +02:00
unknown
fd9031547e Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-qc_crash-4.0
2003-10-02 16:33:50 +03: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
3d5505d56e New build directory files - NetWare only, as used in 4.0.15 2003-09-30 23:14:07 -04: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
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
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
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
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
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
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
21d0da1503 Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
2003-09-25 23:13:43 +02:00
unknown
dd3af2257a - Improved portability of the sql-bench Perl scripts by replacing
the calls of external programs "uname" and "pwd" with Perl builtin
   functions "cwd()" and "POSIX::uname()"


sql-bench/as3ap.sh:
   - portability fix: don't call external "pwd" command, use the "cwd()"
     builtin function instead.
sql-bench/bench-count-distinct.sh:
   - portability fix: don't call external "pwd" command, use the "cwd()"
     builtin function instead.
sql-bench/bench-init.pl.sh:
   - portability fix: don't call external "pwd" command, use the "cwd()"
     builtin function instead.
   - portability fix: don't call external "uname" in various combinations,
     use POSIX::uname() instead.
sql-bench/copy-db.sh:
   - portability fix: don't call external "pwd" command, use the "cwd()"
     builtin function instead.
sql-bench/crash-me.sh:
   - portability fix: don't call external "pwd" command, use the "cwd()"
     builtin function instead.
   - portability fix: don't call external "uname" in various combinations,
     use POSIX::uname() instead.
sql-bench/innotest1.sh:
   - portability fix: don't call external "pwd" command, use the "cwd()"
     builtin function instead.
sql-bench/innotest1a.sh:
   - portability fix: don't call external "pwd" command, use the "cwd()"
     builtin function instead.
sql-bench/innotest1b.sh:
   - portability fix: don't call external "pwd" command, use the "cwd()"
     builtin function instead.
sql-bench/innotest2.sh:
   - portability fix: don't call external "pwd" command, use the "cwd()"
     builtin function instead.
sql-bench/innotest2a.sh:
   - portability fix: don't call external "pwd" command, use the "cwd()"
     builtin function instead.
sql-bench/innotest2b.sh:
   - portability fix: don't call external "pwd" command, use the "cwd()"
     builtin function instead.
sql-bench/run-all-tests.sh:
   - portability fix: don't call external "pwd" command, use the "cwd()"
     builtin function instead.
sql-bench/test-ATIS.sh:
   - portability fix: don't call external "pwd" command, use the "cwd()"
     builtin function instead.
sql-bench/test-alter-table.sh:
   - portability fix: don't call external "pwd" command, use the "cwd()"
     builtin function instead.
sql-bench/test-big-tables.sh:
   - portability fix: don't call external "pwd" command, use the "cwd()"
     builtin function instead.
sql-bench/test-connect.sh:
   - portability fix: don't call external "pwd" command, use the "cwd()"
     builtin function instead.
sql-bench/test-create.sh:
   - portability fix: don't call external "pwd" command, use the "cwd()"
     builtin function instead.
sql-bench/test-insert.sh:
   - portability fix: don't call external "pwd" command, use the "cwd()"
     builtin function instead.
sql-bench/test-select.sh:
   - portability fix: don't call external "pwd" command, use the "cwd()"
     builtin function instead.
sql-bench/test-transactions.sh:
   - portability fix: don't call external "pwd" command, use the "cwd()"
     builtin function instead.
sql-bench/test-wisconsin.sh:
   - portability fix: don't call external "pwd" command, use the "cwd()"
     builtin function instead.
2003-09-25 23:12:24 +02:00
unknown
ba9e2efc17 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/dlenev/src/mysql-4.0-binlog
2003-09-25 20:05:39 +04:00
unknown
2d9e4e6698 fixed bug #1194
(changes in Item_func_set_user_var::update, ::val, ::val_str, ::val_int)


mysql-test/r/user_var.result:
  added tests for bug #1194
mysql-test/t/user_var.test:
  added tests for bug #1194
2003-09-24 19:30:20 -04:00
unknown
8090030700 a small comment about why we call end_io_cache in mysql_load
sql/sql_load.cc:
  small comment
2003-09-25 00:24:06 +02:00
unknown
1ae7ee3ba0 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2003-09-25 00:15:47 +02:00
unknown
dae13b5415 Fix for BUG#1391:
"If LOAD DATA INFILE 'small_file' fails on master, slave leaves temp files"
(the bug is in the master)


mysql-test/r/rpl_loaddata.result:
  result update
mysql-test/std_data/rpl_loaddata2.dat:
  change to introduce a unique key violation
mysql-test/t/rpl_loaddata.test:
  testcase for bug#1391.
sql/sql_load.cc:
  fix for bug#1391:
  for a small file, we had in the binlog only the Create_file, not the Delete_file
  (the Create_file was written when the READ_INFO was destroyed).
2003-09-25 00:14:46 +02:00
unknown
e373f3cccf Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/dlenev/src/mysql-4.0-bgrn


sql/log_event.cc:
  Auto merged
2003-09-25 01:25:54 +04:00
unknown
b608c79091 Fixed BUG#1357 MySQL too eagerly cleanups temporary files for LOAD DATA (SQL_LOAD-...)
sql/log_event.cc:
  Now cleaning up only our files during processing of Start_log_event
2003-09-25 01:25:19 +04:00
unknown
699f3175fe Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2003-09-24 22:55:57 +02:00
unknown
874783abb2 Fix for
Bug #1392 "On Win, slave leaves one temp file after successf. replicating LOAD DATA INFILE"
Windows-specific bug (we forgot to close a file before deleting it).
Patch written by me, tested by Miguel (thanks!) and it works.


sql/log.cc:
  changed the comment to mean the truth
sql/log_event.cc:
  When you finish replicating LOAD DATA INFILE, close the SQL_LOADxxx.data file
  before deleting it, or Windows will refuse to delete.
  No need to do the same thing for the SQL_LOADxxx.data file, it's not opened
  at this moment.
2003-09-24 22:55:04 +02:00
unknown
87bc22a509 Test for mysqlbinlog
Particularly for BUG#1340 mysqlbinlog coredumps when reading Exec
event without seeing Create_file event before


mysql-test/mysql-test-run.sh:
  Now mysqlbinlog will use proper temporary directory
2003-09-24 23:25:58 +04:00
unknown
052f9bc37f Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
into gw.mysql.r18.ru:/usr/home/ram/work/4.0
2003-09-24 16:47:00 +05:00
unknown
97933001fd Added MYSQL_BINLOG variable. 2003-09-24 16:46:19 +05:00
unknown
d3def9c5b8 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-09-24 14:37:44 +03:00
unknown
931633bbbb Correct fix for buffer overruns for compressed blobs.
(Bugs #770, #1304 and maybe #1295)
2003-09-24 14:33:23 +03:00