Commit graph

3999 commits

Author SHA1 Message Date
monty@narttu.mysql.fi
891d7ccd86 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-06-01 12:33:23 +03:00
monty@narttu.mysql.fi
02adbe6599 Fixed bug in ALTER TABLE DISABLE KEYS and INSERT DELAYED. Bug #478 2003-06-01 12:32:53 +03:00
bell@sanja.is.com.ua
902415bf3c Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.0
2003-06-01 10:51:33 +03:00
Sinisa@sinisa.nasamreza.org
048731dedb Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2003-05-31 18:38:41 +03:00
Sinisa@sinisa.nasamreza.org
90b6af3da0 Fix for the optimiser problem caused by the fact that with derived
tables one (or more tables) is opened / closed twice.
2003-05-31 18:31:57 +03:00
hf@deer.(none)
02d3d7e8bd SCRUM:
Here is another pack of changes about gathering common client code in
sql-common/client.c.
Now i symlink the client.c from sql/ and libmysql/. These directories
have client_settings.h files to be included to client.c. It contains
defines and declarations to compile client.c in appropriate manner.
Also i've added include/sql_common.h, containing declarations of what
is exported from client.c

I removed as many #ifdef-s from client.c as i dared to. I think it's better
push it with some extra #ifdef-s now (of course, if everythihg besides it is
ok) so other people can check the code.
2003-05-31 15:15:46 +05:00
bell@sanja.is.com.ua
2848e6c0d4 fixed bug 549 - incorect query cache memory formating on very small query cache sizes 2003-05-31 01:41:11 +03:00
bell@sanja.is.com.ua
7b0afa3ae7 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-mem_root-4.1
2003-05-30 21:09:38 +03:00
bell@sanja.is.com.ua
ac8180c2fc after review changes 2003-05-30 21:09:37 +03:00
bell@sanja.is.com.ua
56c77cc2d2 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-mem_root-4.1
2003-05-30 21:09:36 +03:00
bar@bar.mysql.r18.ru
bb611fa0a2 mysqlshow and mysqldump now send their vharacter set to server
character_set_results is now the same with character_set_client by default
2003-05-30 23:09:35 +05:00
ram@mysql.r18.ru
e15ea0291a Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/ram/work/4.1.latest
2003-05-30 23:09:34 +05:00
hf@deer.(none)
6bc3473f88 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.emb_bind
2003-05-30 23:09:33 +05:00
vva@eagle.mysql.r18.ru
5d4f9011a4 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/NEW_HELP/4.1.clear
2003-05-30 14:09:32 -04:00
vva@eagle.mysql.r18.ru
694b6f0bde fix some warnings in sql_help.cc 2003-05-30 14:08:58 -04:00
gluh@gluh.mysql.r18.ru
3317cfdc7d Fix for compiling MySQL-4.0.13 with SSL support on OpenBSD 2003-05-30 18:41:19 +05:00
ram@mysql.r18.ru
a36d4212fc Moved spatial functions to the sql/item_geofunc.cc file. 2003-05-30 15:22:34 +05:00
bar@bar.mysql.r18.ru
adb8c7e040 SET character_set_results=NULL is now working 2003-05-30 13:56:02 +05:00
bar@bar.mysql.r18.ru
0cb3f34806 set_var.cc, set_var.h:
character_set_connection new variable
2003-05-30 13:24:24 +05:00
bar@bar.mysql.r18.ru
81f0fb6e18 character_set_server is now updatable
character_set_database was added
Code optimization: reuse more code for all character sets variables
2003-05-30 13:03:56 +05:00
ram@mysql.r18.ru
ca17942619 Merge mysql.r18.ru:/usr/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/ram/work/4.1.latest
2003-05-30 13:03:50 +05:00
ram@mysql.r18.ru
0b979c0b9a Fix for the bug #537 (UDF example broken on 4.1). 2003-05-30 13:03:00 +05:00
vva@eagle.mysql.r18.ru
b4014b903b new version of help 2003-05-29 17:47:31 -04:00
gluh@gluh.mysql.r18.ru
450f168bd4 Fix for bug #529 ("x509" no allowed as field name) 2003-05-29 14:52:25 +05:00
bell@sanja.is.com.ua
0b1dda4023 manual types casting to satisfy gcc 3.2.1 compiler 2003-05-28 18:02:14 +03:00
bell@sanja.is.com.ua
806ad88222 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-mem_root-4.1
2003-05-28 16:54:56 +03:00
bell@sanja.is.com.ua
fe6175c40d added mem_root switching for subselect if it is necessary
(bug #518 fixed)
2003-05-28 16:52:56 +03:00
bar@bar.mysql.r18.ru
5fa6c4589e CAST(expr AS char) now supports character set with conversion:
SELECT CAST(_latin1'string' AS CHAR CHARACTER SET latin2)
2003-05-28 17:57:58 +05:00
bar@bar.mysql.r18.ru
67c6703463 --with-collation argument for configure. Now one can for example use this:
./configure --with-charset=latin1 --with-collation=latin1_danish_ci
2003-05-28 16:23:04 +05:00
hf@deer.(none)
4ef9acee9f resolving of merging conflict 2003-05-28 14:13:14 +05:00
hf@deer.(none)
e5428b2fe9 Lots of conflicts resolved 2003-05-28 13:54:58 +05:00
bar@bar.mysql.r18.ru
7ffcf6f64a "mysql" now sends client character set to server. 2003-05-28 13:54:18 +05:00
bar@bar.mysql.r18.ru
e546f33a1d item_cmpfunc.cc:
Fix for multibyte charsets
2003-05-28 11:24:48 +05:00
bell@sanja.is.com.ua
7df5635ff2 after-review fix 2003-05-28 02:06:56 +03:00
bell@sanja.is.com.ua
38caf8655c Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2003-05-28 01:48:47 +03:00
bell@sanja.is.com.ua
a02d89de30 fixed priority checking bug in sub select handling 2003-05-28 00:49:24 +03:00
guilhem@mysql.com
eff179ba8f Merge gbichot@213.136.52.20:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2003-05-27 18:19:32 +02:00
guilhem@mysql.com
cf3cda2778 Removed bad mutex locking 2003-05-27 18:16:50 +02:00
monty@narttu.mysql.fi
bdb66d24dd ORDER BY optimization
Fixed new bug when reading field types
2003-05-27 18:40:37 +03:00
monty@narttu.mysql.fi
030df25b9a Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1
2003-05-27 16:44:06 +03:00
monty@narttu.mysql.fi
da05a3e3f9 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-05-27 16:40:39 +03:00
monty@narttu.mysql.fi
381492093e Fixed problem with mysql prompt when server disconnect. (Bug 356)
Fixed problem with localtime -> gmt where some times resulted in
different (but correct) timestamps. Now MySQL should use the smallest
possible timestamp value in this case.  (Bug 316)
2003-05-27 16:40:14 +03:00
guilhem@mysql.com
97f9aa2aaf temporary update of the test to satisfy merge; will commit a final update
soon.
2003-05-27 14:50:14 +02:00
mysql@home.(none)
0017bb1bc0 Index.xml:
utf8 was not marked as compiled
2003-05-27 12:57:02 +05:00
wax@kishkin.ru
3d0e24caf2 Merge kishkin.ru:/home/wax/mysql-4n into kishkin.ru:/home/wax/mysql-4sm 2003-05-27 04:42:47 +06:00
monty@narttu.mysql.fi
5da35e0488 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1
2003-05-26 20:59:40 +03:00
monty@narttu.mysql.fi
999cb4e07c Portability fix 2003-05-26 20:59:09 +03:00
monty@mashka.mysql.fi
e436736d29 ixed wrong unlock of tables (new bug) 2003-05-26 20:48:40 +03:00
monty@mashka.mysql.fi
beb29e1bce Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-4.1-narttu
2003-05-26 20:38:47 +03:00
monty@narttu.mysql.fi
553637cbc4 Merge narttu.mysql.fi:/my/mysql-3.23 into narttu.mysql.fi:/my/mysql-4.0 2003-05-26 20:35:27 +03:00