mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 05:22:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
12078 commits 2784 branches 343 tags 1.6 GiB
Commit graph

12078 commits

This branch
This branch
All branches
Author SHA1 Message Date
heikki@hundin.mysql.fi
7d3e633edc ha_innodb.cc, sync0sync.h, sync0sync.c: 
Use only noninlined InnoDB functions in ha_innodb.cc
 2004-04-09 22:18:18 +03:00
serg@serg.mylan
d1e1bc82f2 Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-04-09 18:51:51 +02:00
serg@serg.mylan
0d402d8d11 make session max_delayed_threads to be settable only to 0 or global value 2004-04-09 18:50:28 +02:00
ram@gw.mysql.r18.ru
a4a703ba8c Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0 
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b3376
 2004-04-09 19:08:13 +05:00
ram@gw.mysql.r18.ru
c8937dbcb7 A fix. (Bug #3376: AVG(constant) returns constant if no rows in result set) 2004-04-09 19:07:39 +05:00
bell@sanja.is.com.ua
e8137a13e0 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-ps3-4.1
 2004-04-09 11:31:06 +03:00
bell@sanja.is.com.ua
0d773f29de complex join example for test suite 2004-04-09 10:30:07 +03:00
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
monty@mysql.com
f96c4941d8 Fixed problems noticed with last build 2004-04-09 07:12:41 +03:00
bell@sanja.is.com.ua
555eb86616 merge 2004-04-08 23:50:10 +03:00
bell@sanja.is.com.ua
ef5f15c351 fixed subquery in the FROM clause with parameter (BUG#3020) 2004-04-08 23:28:47 +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
serg@serg.mylan
0ade401777 always call start_bulk_insert, clarify this behaviour in comment block 
change 10 to a #define'd constant
 2004-04-08 20:41:00 +02:00
monty@mysql.com
62fa4013ce Don't enable HA_EXTRA_WRITE_CACHE if too few rows 
Revert main parts of patch for online index builds. Should be done differently
Added support for %lx in my_snprintf()
 2004-04-08 17:56:45 +03:00
monty@mysql.com
00738a2be0 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-04-08 15:02:25 +03:00
monty@mysql.com
43546e7a82 Moved reading of ranges from opt_range.cc to handler.cc 
This gives the handler more optimization possiblities and is needed for NDB cluster
Fixed not-initialized memory error detected by valgrind
 2004-04-08 13:58:06 +03:00
bell@sanja.is.com.ua
d4f5f1b7ac field->store resuts passing is fixed for REAL and INT for Item_param (BUG3223) 2004-04-08 11:07:37 +03: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
monty@mysql.com
e94d935221 Cleanup/optimizations of structures and key usage to make it easier to move key-range-search to handler 2004-04-08 01:50:59 +03:00
bell@sanja.is.com.ua
56be6f3f93 merge 2004-04-08 00:19:43 +03:00
bell@sanja.is.com.ua
5e37c41fae new error for unsupported command in PS 
fixed IN subselect with basic constant left expression
SQLCOM_CREATE_TABLE, SQLCOM_UPDATE_MULTI, SQLCOM_REPLACE_SELECT, SQLCOM_INSERT_SELECT, QLCOM_DELETE_MULTI fixed to be compatible with PS (BUG#3398, BUG#3406)
fixed multiupdate privelege check (BUG#3408)
fixed multiupdate tables check (BUG#3411)
unchecked commands now is rejected by PS protocol to avoid serever crash
fixed cleunup procedure to be compatible sith DO/SET (BUG#3393)
 2004-04-08 00:16:17 +03:00
serg@serg.mylan
3b6c3dd2f5 escaping all molty-statement macro 2004-04-07 22:16:16 +02:00
serg@serg.mylan
1a0b6a7aa4 Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-04-07 20:59:11 +02:00
serg@serg.mylan
7899158736 correct SET GLOBAL ft_boolean_syntax=DEFAULT behaviour 2004-04-07 20:58:33 +02:00
jani@rhols221.adsl.netsonic.fi
0e5cdf319d Fixed previous security patch. mysqld_safe will use the given --log=file, 
or if not given, it will try to use the one in datadir, if possible, otherwise
log file will be disabled.
 2004-04-07 19:37:13 +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
serg@serg.mylan
1c0d4c4a46 merged 2004-04-07 17:14:38 +02:00
serg@serg.mylan
6ebf869b40 merged 2004-04-07 16:20:46 +02:00
ingo@mysql.com
06bca26041 Fix for Hand-Merge 2004-04-07 16:06:09 +02:00
serg@serg.mylan
6fc74e13e7 post-review fixes 
HA_EXTRA_WRITE_CACHE now part of start_bulk_insert()
test cleanups
 2004-04-07 16:04:28 +02:00
ingo@mysql.com
4de7e18b81 Hand-resolved auto merge 2004-04-07 14:56:24 +02:00
bell@sanja.is.com.ua
61fd95d168 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-ps3-4.1
 2004-04-07 15:23:05 +03:00
vva@eagle.mysql.r18.ru
5fa9953ce3 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1 
into eagle.mysql.r18.ru:/home/vva/work/BUG_3342/mysql-4.1
 2004-04-07 17:23:04 +05:00
ingo@mysql.com
376f252659 ignore: 
added install
 2004-04-07 13:57:09 +02:00
marko@hundin.mysql.fi
253bf9861b InnoDB: Remove debug functions unless #ifdef UNIV_DEBUG 2004-04-07 14:19:26 +03:00
ingo@mysql.com
ce816b351c Worklog#1563 - Support of on-line CREATE/DROP INDEX. 
Corrected minor problems of the preceding changeset 1.1705.
 2004-04-07 13:12:05 +02:00
bell@sanja.is.com.ua
560a9f66d3 after review changes 2004-04-07 13:25:24 +03:00
monty@mysql.com
70c4eb5838 Portability fixes 
Fixed problems with group_concat() and HAVING
Updated crash-me values
 2004-04-07 04:33:58 +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
serg@serg.mylan
e8eda8129f ::reset(), HA_FAST_KEY_READ, disable_indexes(), enable_indexes(), start_bulk_insert(), end_bulk_insert() 
Field::val_str simplification, comment
 2004-04-06 21:35:26 +02:00
monty@mysql.com
472e87a40c Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-04-06 18:30:34 +03:00
vva@eagle.mysql.r18.ru
aeff7ce714 fixed 
bug #3342 "SHOW CREATE DATABASE seems to require DROP privilege"
(now it require only SELECT privilege on database)
 2004-04-06 20:26:35 +05:00
bar@bar.intranet.mysql.r18.ru
950a2ebab1 Fixed charsetnr sent to the client 2004-04-06 19:57:33 +05:00
jani@a80-186-24-72.elisa-laajakaista.fi
0f484ebae6 Fixed a problem with mysqld_multi log file. The default is now datadir/mysqld_multi.log, 
if doesn't exists or is not writable, then /var/log/mysqld_multi.log, if does not exists
or is not writable, then /tmp/mysqld_multi.log, but only in case the file does not yet
exists in /tmp. Otherwise log will be disabled, unless user explicitely sets it with an
option.
 2004-04-06 17:57:32 +03:00
monty@mysql.com
7ca9a70583 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-04-06 17:17:15 +03:00