Commit graph

7751 commits

Author SHA1 Message Date
jani@rhols221.adsl.netsonic.fi
96cb3ec0e9 - Merged in changes from mysqld_multi 2.6
- Changed reading of config file so that one can use a separate config
  file for [mysqld_multi] also. In other words --config-file=file will
  read group [mysqld_multi] from this file, earlier it wouldn't have.
2004-04-09 09:59:11 +03:00
guilhem@mysql.com
c640a3904a Fix for BUG#3422 "In 3.23 -> 4.0 replication, slave segfault when replicating LOAD DATA INFILE":
as we transform the 3.23 Load_log_event into a 4.0 Create_file_log_event which is one
byte longer, we need to increment event_len. The bug was that we did not increment it,
so later in code the end 0 was not seen so there was for example a segfault in
strlen(fname) because fname was not 0-terminated.
Other problems remain in 3.23->4.0 replication of LOAD DATA INFILE but they are less serious:
Exec_master_log_pos and Relay_log_space are incorrect. I'll document them.
They are not fixable without significant code changes (if you fix those problems in 4.0,
you get assertion failures somewhere else etc), * which are already done in 5.0.0 *.
2004-04-08 22:12:22 +02:00
marko@hundin.mysql.fi
8219d4ef88 Merge marko@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/j/mysql-4.0
2004-04-08 10:48:49 +03:00
marko@hundin.mysql.fi
9dec81b89c InnoDB: Fix a preprocessor error introduced in ChangeSet 1.1772 2004-04-08 10:47:38 +03:00
heikki@hundin.mysql.fi
7560f3bae7 sql_select.cc:
Fix a glitch reported by Philippe Lewicki on the general mailing list: do not print a warning to the .err log if read_key fails with a lock wait timeout error 146
2004-04-08 09:25:48 +03:00
guilhem@mysql.com
69ba8f4c34 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2004-04-07 18:35:45 +02:00
guilhem@mysql.com
58e90107d9 Fix for BUG#3415 "mysqlbinlog loses a USE command when LOAD DATA INFILE is involved":
if you are printing LOAD DATA INFILE and its USE as comments, don't update 'last_db' (because you
have not actually changed the db in the server).
2004-04-07 18:34:31 +02:00
marko@hundin.mysql.fi
253bf9861b InnoDB: Remove debug functions unless #ifdef UNIV_DEBUG 2004-04-07 14:19:26 +03:00
guilhem@mysql.com
44a6fcba2f Fix for BUG#3401 "Rare replication bug which leads to "Binlog has bad magic number" from slave":
Backport of a part of this changeset of 4.1:
ChangeSet@1.1753.1.1, 2004-04-05 13:56:05+03:00, monty@mysql.com
which fixes the bug.
2004-04-07 01:14:11 +02:00
guilhem@mysql.com
da6685fba5 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2004-04-07 00:58:53 +02:00
guilhem@mysql.com
b5ffdec204 This is a fix for a bug in 3.23 -> 4.0 replication: Exec_master_log_pos is always
too big by 6 bytes. So I add code to substract 6 bytes if the master is 3.23.
This is not perfect (because it won't work if the slave I/O thread has not
noticed yet that the master is 3.23), but as long as the slave I/O thread
starts Exec_master_log_pos will be ok.
It must be merged to 4.1 but not to 5.0 (or it can be, because of #if MYSQL_VERSION_ID),
because 5.0 already works if the master is 3.23 (and in a more natural way:
in 5.0 we store the end_log_pos in the binlog and relay log).
I had to move functions from slave.h to slave.cc to satisfy gcc.
2004-04-07 00:57:14 +02:00
marko@hundin.mysql.fi
6af38c65be InnoDB: send diagnostic output to stderr or files
instead of stdout or fixed-size memory buffers
2004-04-06 16:14:43 +03:00
marko@hundin.mysql.fi
4f9b59f71d Merge marko@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/j/mysql-4.0
2004-04-06 15:19:12 +03:00
vva@eagle.mysql.r18.ru
f3302f2e88 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_3361/mysql-4.0
2004-04-06 17:19:11 +05:00
vva@eagle.mysql.r18.ru
7b68b26623 fixed Bug #3361 "mysqldump quotes DECIMAL values" 2004-04-05 23:18:16 +05:00
marko@hundin.mysql.fi
d9d1957ebe Merge hundin.mysql.fi:/home/marko/j/mysql-4.0
into hundin.mysql.fi:/home/marko/i/mysql-4.0
2004-04-05 15:45:22 +03:00
marko@hundin.mysql.fi
f7f8efc263 InnoDB: Backport fil_path_to_mysql_datadir from MySQL 4.1.x 2004-04-05 15:40:56 +03:00
lenz@mysql.com
0e39b9220b - added ncurses-devel to the build prerequisites (BUG#3377) 2004-04-05 14:38:17 +02:00
serg@serg.mylan
63e1d8dfa0 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-04-05 11:37:00 +02:00
serg@serg.mylan
a6c6bfe7e9 made fulltext search aware of concurrent inserts 2004-04-05 11:36:30 +02:00
marko@hundin.mysql.fi
23a5fc5558 InnoDB: ignore intra-database foreign key references between tables
when dropping database (Bug #3058)
2004-04-02 16:25:48 +03:00
marko@hundin.mysql.fi
0219adc00b Merge marko@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/j/mysql-4.0
2004-04-02 12:00:00 +03:00
marko@hundin.mysql.fi
cfae16667e InnoDB: Handle quotes properly in the InnoDB SQL parser 2004-04-02 11:58:54 +03:00
vva@eagle.mysql.r18.ru
56169c74d5 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_3200/mysql-4.0
2004-04-01 23:57:12 +05:00
vva@eagle.mysql.r18.ru
64280f50e4 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_3200/mysql-4.0
2004-04-01 23:55:45 +05:00
marko@hundin.mysql.fi
4da72c2eb1 Merge marko@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/j/mysql-4.0
2004-04-01 16:54:22 +03:00
marko@hundin.mysql.fi
e00bf40360 InnoDB cleanup: fixing buffer overflows and quoting of quotes 2004-04-01 16:51:34 +03:00
heikki@hundin.mysql.fi
a169bfa6ae fil0fil.c, os0file.c, srv0srv.h, srv0srv.c:
Add an accessor function to set srv_io_thread_op_info, change the type to const char*, also change the type of srv_io_thread_function to const char*
2004-04-01 09:18:32 +03:00
heikki@hundin.mysql.fi
f30da8edd5 fil0fil.c:
Add assertions to check that we do not go out of bounds of io thread status array
os0file.c:
  Fix memory corruption (assertion failure on line 244 of sync0sync.c) reported by Miguel in a Windows build of MySQL-4.1.2. The bug is present in all InnoDB versions in Windows, but it depends on how the linker places a static array in srv0srv.c, whether the bug shows itself. 4 bytes were overwritten with a pointer to a statically allocated string: 'get windows aio return value'.
2004-03-31 18:06:13 +03:00
marko@hundin.mysql.fi
ebc7b6ba87 Merge marko@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/j/mysql-4.0
2004-03-31 11:41:16 +03:00
marko@hundin.mysql.fi
7f1f7b9391 InnoDB: cleanup of B-tree cursor operations 2004-03-31 11:40:07 +03:00
gluh@gluh.mysql.r18.ru
03d0ca225a Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0
into gluh.mysql.r18.ru:/home/gluh/Bugs/mysql-4.0
2004-03-31 13:29:07 +05:00
marko@hundin.mysql.fi
7f2a007496 InnoDB: Remove ut_str_contains() and replace it with strchr() 2004-03-31 11:26:56 +03:00
marko@hundin.mysql.fi
16ac732cb9 InnoDB: Remove unused hash table code and parameters 2004-03-31 10:58:50 +03:00
marko@hundin.mysql.fi
3476db87a0 InnoDB: Remove unnecessary code, mostly related to stored procedures 2004-03-31 10:30:14 +03:00
marko@hundin.mysql.fi
80c37f6a92 InnoDB: parse CONSTRAINT FOREIGN KEY correctly (Bug #3332) 2004-03-30 17:26:20 +03:00
Sinisa@sinisa.nasamreza.org
6e79ece190 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2004-03-30 13:52:53 +03:00
Sinisa@sinisa.nasamreza.org
2ff3f487aa A fix for the error message when database can not be dropped due to
the extra files being present.
2004-03-30 13:50:00 +03:00
monty@mysql.com
8ab16104e8 Fix test results when you are in daylight saving time 2004-03-30 01:01:31 +03:00
monty@mysql.com
3cbab63af1 Fixed wrong assert (Got failure in ctype_tis620) 2004-03-29 18:59:51 +03:00
monty@mysql.com
7e161ae070 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/my/mysql-4.0
2004-03-29 17:27:25 +03:00
gluh@gluh.mysql.r18.ru
9832571c1e Fix bug #3181: insert_test client test missing mysql_init 2004-03-29 18:10:59 +05:00
vva@eagle.mysql.r18.ru
c81bf339c2 some cleanup of last patch for BUG #2342 2004-03-27 02:37:05 +04:00
vva@eagle.mysql.r18.ru
1eff4744f1 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_2342/mysql-4.0
2004-03-27 00:41:48 +04:00
vva@eagle.mysql.r18.ru
23d30c397d fixed bug #2342
"Running ANALYZE TABLE on bdb table inside a transaction hangs server thread"

1. added new status HA_ADMIN_REJECT and processing of it in mysql_admin_table
2. got ha_berkley::analyze to return HA_ADMIN_REJECT if there are any 
 transactions with the table..
2004-03-27 00:35:45 +04:00
Sinisa@sinisa.nasamreza.org
ff5cbb795c Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2004-03-26 17:56:24 +02:00
heikki@hundin.mysql.fi
87a279b424 Merge heikki@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/heikki/mysql-4.0
2004-03-26 17:49:46 +02:00
heikki@hundin.mysql.fi
86569695f7 mem0dbg.c:
Backport from 4.1: make mem_current_allocated_memory global variable
2004-03-26 17:49:02 +02:00
Sinisa@sinisa.nasamreza.org
e2b48a2232 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2004-03-26 17:01:55 +02:00
Sinisa@sinisa.nasamreza.org
09d26f0ff6 order_by.result:
result of the test case for FORCE INDEX on ORDER BY
order_by.test:
  test case for FORCE INDEX on ORDER BY
sql_select.cc:
  Changing behaviour that MySQL server takes FORCE INDEX clause into account when optimising ORDER BY clause
2004-03-26 17:01:13 +02:00