Commit graph

3896 commits

Author SHA1 Message Date
Sinisa@sinisa.nasamreza.org
4fecd58e43 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2003-04-16 17:07:20 +03:00
heikki@hundin.mysql.fi
f841b4ae23 Many files:
Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
2003-04-16 16:45:01 +03:00
gluh@gluh.mysql.r18.ru
cde0099e23 Memory leak fixed. 2003-04-16 17:47:36 +05:00
Sinisa@sinisa.nasamreza.org
0f61926325 fix for a bug with two natural joins. 2003-04-16 13:39:39 +03:00
gluh@gluh.mysql.r18.ru
05817b7311 Fix bug: Crash server when grant ssl options are used and ssl handshake is not set 2003-04-16 15:05:47 +05:00
monty@mashka.mysql.fi
6cf83136af Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-4.1
2003-04-16 09:26:24 +03:00
monty@mashka.mysql.fi
491589baf8 Add mysys specific error messages
Make RELAY_THREAD and alias for IO_THREAD
Added new interface for string -> (unsigned) long long.
2003-04-16 09:25:43 +03:00
hf@deer.mysql.r18.ru
e2baf777d0 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.mysql.r18.ru:/home/hf/work/mysql-4.1.clean
2003-04-16 11:09:06 +05:00
hf@deer.mysql.r18.ru
bc8f8d95db Fix for bug #212 2003-04-16 11:08:21 +05:00
monty@mashka.mysql.fi
52ebc0e883 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0
2003-04-15 22:10:49 +03:00
monty@mashka.mysql.fi
3e6c350f64 Fixed bug in SUM() with NULL:s
Added logging of warnings for failed connections with ssl.
Fixed bug in symbolic link handling on Windows
2003-04-15 22:04:16 +03:00
wax@kishkin.ru
a17c567f86 replace default separator in group_concat, correct a bug 2003-04-16 00:22:43 +06:00
Sinisa@sinisa.nasamreza.org
0e76eab9d4 Fix for a NAN problem in FORMAT(...) string function .. 2003-04-14 21:46:24 +03:00
Sinisa@sinisa.nasamreza.org
cf2ebdba32 Back porting a fix from 4.0 at customer's request 2003-04-14 20:58:41 +03:00
Sinisa@sinisa.nasamreza.org
5ae3989fe3 A fix for a bug with uncached database privileges. 2003-04-14 19:45:09 +03:00
Sinisa@sinisa.nasamreza.org
7791dfeeeb Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2003-04-14 14:51:52 +03:00
venu@myvenu.com
24d5cd37d2 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/work/sql/dev-4.1
2003-04-12 20:07:52 -07:00
Sinisa@sinisa.nasamreza.org
c3db30b5f1 Two bug fixes 2003-04-11 20:09:24 +03:00
Sinisa@sinisa.nasamreza.org
47f67214d9 A fix for a crashing bug in EXPLAIN on derived tables with a join. 2003-04-10 21:05:28 +03:00
vva@eagle.mysql.r18.ru
02ad1b95e3 Merge 2003-04-10 10:25:21 -04:00
vva@eagle.mysql.r18.ru
950fa7aa8a added compress/uncompress function 2003-04-09 20:50:30 -04:00
Sinisa@sinisa.nasamreza.org
3cef0070f9 Post - post merge fix. 2003-04-09 19:17:12 +03:00
Sinisa@sinisa.nasamreza.org
5d971658db merge fix 2003-04-09 18:52:33 +03:00
Sinisa@sinisa.nasamreza.org
a81dc6d9f3 A fix for DELETE with ORDER BY and LIMIT.
How come we do not have a test case for this ??
2003-04-09 18:22:17 +03:00
Sinisa@sinisa.nasamreza.org
5ca7b274fe fix for a :
SELECT USER();
2003-04-09 17:34:06 +03:00
serg@sergbook.mysql.com
2381be2084 Merge bk-internal:/home/bk/mysql-4.1
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
2003-04-09 07:31:29 -07:00
Sinisa@sinisa.nasamreza.org
48a6e3d367 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2003-04-09 16:38:36 +03:00
guilhem@mysql.com
c7891fe9bc fix for #254
(3.23 master, 4.0 slave. 
Slave loss temp tables everytime FLUSH LOGS on master). 
This fix is less bad than the bug, it will cause a problem only maybe
if the master dies the hard way (I say maybe because I could not
cause a problem, and I don't see how it could happen).
2003-04-09 15:16:12 +02:00
Sinisa@sinisa.nasamreza.org
f79cabdc8f a fix for a crashing bug when attempting to create InnoDB table
with GEOMETRY field type.
2003-04-08 20:39:50 +03:00
Sinisa@sinisa.nasamreza.org
b998c3fab9 Fix for a bug with empty item list in UNION's 2003-04-08 15:55:28 +03:00
bar@bar.mysql.r18.ru
8cf9ada977 Use of CHARSWT_INFO *result_collation
instead of bool convert_result_charset
SET CHARACTER SET inststead of SET NAMES in tests
2003-04-08 14:38:17 +05:00
bar@bar.mysql.r18.ru
2cdc21d24a SET NAMES doesn't start recoding
SET CHARACTER SET does
2003-04-08 11:33:54 +05:00
hf@deer.mysql.r18.ru
fa0741c918 #244 bugfix (thread stack error message in embedded library) 2003-04-08 10:35:13 +05:00
monty@mashka.mysql.fi
06febc8df3 A better fix for UNION and slow query log. 2003-04-08 03:54:02 +03:00
monty@mashka.mysql.fi
204795595c Merge bk-internal.mysql.com:/home/bk/mysql-3.23
into mashka.mysql.fi:/home/my/mysql-3.23
2003-04-07 21:37:25 +03:00
monty@mashka.mysql.fi
9f6aa11769 Changed innobase_flush_log_at_trx_commit to be 1 as default
Fixed problem with not freed thr_alarm() on slave connect
2003-04-07 21:36:45 +03:00
bar@bar.mysql.r18.ru
11355b6795 All collation names are now fit into convension 2003-04-07 18:49:56 +05:00
Sinisa@sinisa.nasamreza.org
ad751d7cfc merge fix 2003-04-07 14:32:25 +03:00
Sinisa@sinisa.nasamreza.org
e452e0b051 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2003-04-07 14:21:01 +03:00
bar@bar.mysql.r18.ru
e165845d39 sys_var_collation is now abstract class
Two separate classes sys_var_client_collation and sys_var_literal_collation have been added
for "literal_collation" and "client_collation" variables.
2003-04-07 16:10:27 +05:00
bar@bar.mysql.r18.ru
e0caf3f225 New methods to store strings with "convert to" argimument 2003-04-07 13:52:48 +05:00
bell@sanja.is.com.ua
ae5e85576d Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-limit-4.0
2003-04-06 12:26:04 +03:00
bell@sanja.is.com.ua
4cecc44ce7 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-in-4.1
2003-04-05 21:51:03 +03:00
mysql@home.(none)
bbf710b35e Some optimization in SET NAMES 2003-04-05 18:56:15 +05:00
bell@sanja.is.com.ua
fa46807825 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-in-4.1
2003-04-05 15:17:16 +03:00
mysql@home.(none)
e93e98c239 sql_yacc.yy:
I wonder how it happend that I compiled this!
2003-04-05 17:02:34 +05:00
mysql@home.(none)
bc1fe848cb sql_yacc.yy, set_var.h, set_var.cc:
Optimization of SET NAMES
2003-04-05 15:59:29 +05:00
bell@sanja.is.com.ua
65c356cfa8 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-in-4.1
2003-04-05 09:29:58 +03:00
bell@sanja.is.com.ua
7bd0d02bda fixed st_select_lex initialization
fixed mustiupdate subselect compatibility

(bug 217)
2003-04-05 09:29:28 +03:00
bell@sanja.is.com.ua
e793f17691 Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.0
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
2003-04-05 09:06:45 +03:00