mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 03:21:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
13103 commits 2791 branches 343 tags 1.7 GiB
Commit graph

6568 commits

Author SHA1 Message Date
hf@deer.(none)
1bedda6072 Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.4014
 2004-06-11 23:00:49 +05:00
bar@mysql.com
c64d93b274 Allocate memory when a character set is requested: 
- For simple character sets: from_uni convertion table.
- For UCA: alternative weight arrays.
Use mbminlen instead of MY_CS_NONTEXT
 2004-06-11 16:29:16 +05:00
heikki@hundin.mysql.fi
124c2ef4f0 ha_innodb.cc: 
Put back the ha_innodb.cc source code lines that were accidentally removed in Jan Lindstrom's push yesterday (he used the account heikki@mysql.com)
 2004-06-11 10:21:22 +03:00
konstantin@mysql.com
0276d38f64 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/kostja/mysql/mysql-4.1-root
 2004-06-11 00:20:18 +04:00
konstantin@mysql.com
f08bbd1f12 assert.h needed for my_dbug.h now is included in my_dbug.h, where it for 
some reason wasn't included before.
A lot of files cleaned up from #include <assert.h>
 2004-06-10 23:58:39 +04:00
serg@serg.mylan
78fa465b92 bug#3964 and related issues: FTB problems with charsets where one byte can match many 
correct prefix compare with my_strnncoll
 2004-06-10 21:18:57 +02:00
bell@sanja.is.com.ua
be642b9bcd EXISTS(SELECT * ...) 
close table before opening in optimize
 2004-06-10 21:33:15 +03:00
bell@sanja.is.com.ua
5f235eb828 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-count-4.1
 2004-06-10 18:58:53 +03:00
guilhem@mysql.com
3d33dc7c77 Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-874
 2004-06-10 16:42:07 +02:00
guilhem@mysql.com
e816a757db WL#1689 "Map OPTIMIZE TABLE to ALTER TABLE for InnoDB" 
exactly it's mapped to "ALTER TABLE t; ANALYZE TABLE t;"
 2004-06-10 16:41:24 +02:00
bar@mysql.com
34d413a6a0 Optimization to use less memory. 2004-06-10 19:10:21 +05:00
guilhem@mysql.com
73411a2ed5 WL#1595 "Optionally fsync() the binlog after every statement": 
New option --sync-binlog=x (and global settable variable) which will fsync the binlog
after every x-th disk write to it. That is, if in autocommit mode, after every x-th statement
written to the binlog; if using transactions, after every x-th transaction written to the binlog.
x==0 means no fsync. x==1 is the slowest.
There is no test added for this, I have just checked that it works as --sync-binlog=1 dramatically
slows down mysqld.
Made sync-frm a global settable variable.
 2004-06-10 15:56:13 +02:00
monty@mysql.com
30bed1bbf9 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/my/mysql-4.0
 2004-06-10 16:44:55 +03:00
guilhem@mysql.com
ec5b55f8e1 Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-1595
 2004-06-10 15:10:44 +02:00
guilhem@mysql.com
10429acb8e don't need to tag the slave SQL thread as "bootstrap". It causes duplicate 
error messages when a query goes wrong.
Note that from now on, if you run with --slave-skip-error=xx, then nothing will
be printed to the error log when the slave is having this error xx and
skipping it (but you don't care as you want to skip it).
 2004-06-10 14:03:25 +02:00
heikki@hundin.mysql.fi
4a5077a0dd Added function 
/***********************************************************************
This function stores binlog offset and flushes logs */


void innobase_store_binlog_offset_and_flush_log(char *binlog_name,longlong offset) 
requested by Guilhem to ha_innodb.cc and ha_innodb.h. 

Change made by Jan.Lindstrom@innodb.com
 2004-06-10 15:01:16 +03:00
serg@serg.mylan
3d36d97efb Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2004-06-10 13:58:32 +02:00
serg@serg.mylan
5647809350 warn about multiple mysqld --user parameters only if their arguments differ 2004-06-10 13:56:58 +02:00
pem@mysql.comhem.se
f467e0b354 Removed extra error messages (that were replaced). 2004-06-10 12:17:13 +02:00
monty@mysql.com
17db9de543 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/my/mysql-4.0
 2004-06-10 12:36:11 +03:00
monty@mysql.com
ff223db0fe Merge with 3.23 to get latest bug fixes 2004-06-10 11:59:45 +03:00
monty@mysql.com
c56a16b598 Cleanup 2004-06-10 11:58:16 +03:00
bell@sanja.is.com.ua
ba82b9e7d5 cleunup() of count() and max()/min() added (BUG#2687) 2004-06-10 10:59:55 +03:00
bell@sanja.is.com.ua
98a7b49dc5 do not unlock tables early if we have subquery in HAVING clause (BUG#3984) 2004-06-09 23:32:20 +03:00
hf@deer.(none)
4506aba179 Fix for the bug #4014 (prepared SELECT in embedded server) 
Problem is that store_string_aux calls 'wrong' net_store_data
 2004-06-09 22:36:48 +05:00
guilhem@mysql.com
aa3c80fb7d Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-874
 2004-06-09 16:24:35 +02:00
guilhem@mysql.com
2b20e84ff8 Making DROP TABLE IF EXISTS, DROP DATABASE IF EXISTS, DELETE FROM, UPDATE be logged to 
binlog even if they changed nothing, and a test for this.
This is useful when users use these commands to clean up their master and slave by issuing
one command on master (assume master and slave have slightly different data for some
reason and you want to clean up both).
Note that I have not changed multi-table DELETE and multi-table UPDATE because their
error-reporting mechanism is more complicated.
 2004-06-09 16:07:01 +02:00
guilhem@mysql.com
9799c5ba33 complement to previous fix (which was for SQLCOM_DROP_DB), for COM_DROP_DB. 2004-06-09 15:27:15 +02:00
guilhem@mysql.com
e76a332165 Fix for BUG#4066 "DROP DATABASE case sensitive even if lower-case-table-names > 0" 2004-06-09 15:22:31 +02:00
konstantin@mysql.com
f3e018f833 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/kostja/mysql/mysql-4.1-4026
 2004-06-09 03:22:55 +04:00
konstantin@mysql.com
dc11d3cfa1 Proposed fix for Bug#4026 "Microseconds part of TIME/DATETIME types 
is broken (prepared statements)": fixed date handling in many places 
of prepared statements code.
 2004-06-09 03:21:50 +04:00
serg@serg.mylan
a8a8da3920 different (simpler and more compatible) fix for bug#4046 2004-06-09 00:08:24 +02:00
guilhem@mysql.com
c75b24a73a Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-874
 2004-06-08 19:55:35 +02:00
guilhem@mysql.com
b514e6a8c5 Correction to replication of charsets in 4.1: 
In mysqlbinlog, there was a problem with how we escaped the content of a string user variable.
To be perfect, we should have escaped with character_set_client. But this charset is unknown
to mysqlbinlog. So the simplest is to print the string in hex. This is unreadable but
100% safe with any charset (checked with Bar), no more need to bother with character_set_client.
 2004-06-08 19:55:04 +02:00
bell@sanja.is.com.ua
6ab2d24ad8 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
 2004-06-08 17:09:59 +03:00
ram@gw.mysql.r18.ru
71eee450e0 a fix 
(Bug #4035 GROUP_CONCAT with HAVING clause truncates field                       
Bug #4057 LEFT() function in HAVING clause truncates query result).
 2004-06-08 18:01:15 +05:00
jplindst@t41.(none)
d6e1e47bbe Added function innobase_store_binlog_offset_and_flush_log requested by Guilhem 
to ha_innodb.cc and ha_innodb.h
 2004-06-08 15:38:22 +03:00
bar@bar.intranet.mysql.r18.ru
500874b554 Bug #3717 ENCODE returns a character string, not a binary string 2004-06-08 15:36:44 +05:00
bar@bar.intranet.mysql.r18.ru
7d33346854 Bug #2077 Japanese characters in enum/default values are reported incorrectly 2004-06-08 14:26:16 +05:00
heikki@hundin.mysql.fi
d9dc42b5be ha_innodb.cc: 
Fix Bug #4047: remove the improvement ported from 4.0 that made InnoDB to remember the original select_lock_type inside LOCK TABLES
 2004-06-08 10:41:14 +03:00
bell@sanja.is.com.ua
273b74c836 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
 2004-06-07 23:43:04 +03:00
sergefp@mysql.com
26a5650d1b SQL Syntax for Prepared Statements: post-merge fixes 2004-06-08 00:43:03 +04:00
sergefp@mysql.com
7e0455f333 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
 2004-06-07 23:50:59 +04:00
bell@sanja.is.com.ua
415e7c6fd2 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
 2004-06-07 21:31:54 +03:00
gluh@gluh.mysql.r18.ru
5725831c73 Fix for bug #4036 multiple SELECT DATE_FORMAT, incorrect results 2004-06-07 20:35:05 +04:00
gluh@gluh.mysql.r18.ru
147c2988cc Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.1
 2004-06-07 19:58:34 +04:00
gluh@gluh.mysql.r18.ru
d381736c31 Fix for bug#3946: Error in LPAD() when padstring is longer than 1 character 2004-06-07 17:39:17 +04:00
bar@bar.intranet.mysql.r18.ru
7d17da9018 mysqld.cc: 
WL#1160.
  Adding variable-conformant startup options for --default-character-set and --default-collation
 2004-06-07 18:33:17 +05:00
serg@serg.mylan
5d947f7b97 Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2004-06-07 12:39:26 +02:00
serg@serg.mylan
86e9dc29b0 BUG#3987 - if(int, aggregate(int)) 2004-06-07 12:38:35 +02:00