Commit graph

3384 commits

Author SHA1 Message Date
hf@genie.(none)
f8f0b70380 SCRUM
two KILL commands implementation (version 2)
2003-03-31 13:39:46 +05:00
hf@genie.(none)
d00b3ba511 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into genie.(none):/home/hf/work/mysql-5.0.kil
2003-03-21 10:06:04 +04:00
hf@genie.(none)
dd49c33f20 SCRUM
two versions of KILL implementation
2003-03-21 09:37:01 +04:00
pem@mysql.com
0d95f36a12 Post post merge fix. Made the broken ip test work again. 2003-03-20 11:57:05 +01:00
pem@mysql.com
6822eb5ec0 Post-merge fixes. 2003-03-19 11:36:32 +01:00
pem@mysql.com
4a171efd6f Merged 4.1 -> 5.0. 2003-03-18 16:12:50 +01:00
bar@bar.mysql.r18.ru
0137c812dc SHOW CREATE TABLE didn't display field names in the proper charset 2003-03-18 13:42:45 +04:00
bar@bar.mysql.r18.ru
7549a76c7c Replication were broken because of automatic charset conversion.
As a fix, my_charset_bin is now used in master-slave packets instead
of system_charset_info.
2003-03-18 11:34:19 +04:00
bar@bar.mysql.r18.ru
9ed0bb2156 sql_yacc.yy:
SET NAMES BINARY now works
2003-03-18 10:02:57 +04:00
bar@bar.mysql.r18.ru
04db86f22a 2003-03-17 21:56:34 +04:00
bar@bar.mysql.r18.ru
c7b3eeb178 sql_show.cc:
Bug fix
  0 stayed for length here, now it is charset.
2003-03-17 17:30:34 +04:00
bar@bar.mysql.r18.ru
63a307bb38 sql_string.cc:
Copy as is if src or dst are binary
2003-03-17 13:40:40 +04:00
bar@bar.mysql.r18.ru
caf31a0790 Preparing to client<->server autoconvert 2003-03-17 13:14:04 +04:00
bar@bar.mysql.r18.ru
e00c9fa7d5 sql_select.cc:
binary comparing alway must be used, because sort_string() is executed for textual data.
2003-03-17 10:47:08 +04:00
monty@mashka.mysql.fi
ce7db2827e Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-4.1
2003-03-16 16:34:55 +02:00
mysql@home.(none)
c6efa7a8b7 New function my_charset_same() 2003-03-16 17:19:24 +04:00
root@home.(none)
5c6c54c09a system_charset_info has been moved to /sql directory
and isn't used in libraries any longer
2003-03-16 12:30:10 +04:00
root@home.(none)
f71a7e4b05 set_default_charset() is not used anymore
Some system_charset_info were removed
2003-03-16 10:56:14 +04:00
bar@bar.mysql.r18.ru
dfe65d3281 Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-03-15 17:25:41 +04:00
bar@bar.mysql.r18.ru
59f6e35cf6 sql_parse.cc, sql_db.cc:
less system_charset_info
2003-03-15 17:24:21 +04:00
bell@sanja.is.com.ua
1a8227d1c1 Merge 2003-03-15 14:16:57 +02:00
bell@sanja.is.com.ua
1e733bb8ab Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/mysql-4.1
2003-03-15 13:35:40 +02:00
bar@bar.mysql.r18.ru
d09f865d4f sql_lex.cc:
Use LEX charset instead of system one
2003-03-15 15:19:06 +04:00
bell@sanja.is.com.ua
65fe679d91 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-leak-4.1
2003-03-15 13:04:34 +02:00
serg@serg.mysql.com
15dbe91a6e fixed typo (double ++ in assert)
removed all side effects from asserts for not to confuse casual reader
2003-03-15 11:56:03 +01:00
bell@sanja.is.com.ua
587196984d Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-leak-4.1
2003-03-15 11:24:44 +02:00
serg@serg.mysql.com
15ff383e20 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1
2003-03-14 20:25:50 +01:00
serg@serg.mysql.com
9749ece292 cleanup 2003-03-14 20:22:06 +01:00
venu@myvenu.com
88df7b695b Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/work/sql/dev-4.1
2003-03-14 10:44:08 -08:00
venu@myvenu.com
3f7e4239a2 Fix for not to assert in DBUG mode when the result type is INT24 as data is sent in INT32 format
(normal protocol only, prepared protocol already handles it)
2003-03-14 10:35:13 -08:00
monty@mashka.mysql.fi
8887929a66 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-4.1
2003-03-14 17:03:42 +02:00
bar@bar.mysql.r18.ru
26e6fb0e24 Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-03-14 18:11:20 +04:00
bar@bar.mysql.r18.ru
b009386fa4 Every charset now have its own parser state arrays 2003-03-14 18:08:12 +04:00
bell@sanja.is.com.ua
50d3fc7d43 fixed uncachable union (bug #150) 2003-03-14 14:16:09 +02:00
bar@bar.mysql.r18.ru
b5bc52c7ae Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-03-13 16:23:48 +04:00
bar@bar.mysql.r18.ru
3d5286d7bc sql_lex.cc:
Move all charset recoding to the same place
2003-03-13 16:23:18 +04:00
bar@bar.mysql.r18.ru
b4c8ecd8bc filesort.cc, sql_analyse.cc, item_func.cc, item_strfunc.cc, field.cc:
Unnesessary binary() calls have been removed
2003-03-13 15:34:46 +04:00
gluh@gluh.mysql.r18.ru
7fa51a2320 Fix for embeded library compile 2003-03-13 14:12:28 +04:00
gluh@gluh.mysql.r18.ru
3d61d2d973 Conflicts relsolving 2003-03-11 16:32:17 +04:00
bell@sanja.is.com.ua
113dc05655 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-in-4.1
2003-03-11 13:26:26 +02:00
bell@sanja.is.com.ua
1cbf8f7408 fixed cached constsnt determination (bug #142 related) 2003-03-11 12:43:30 +02:00
gluh@gluh.mysql.r18.ru
e7f4bf5b27 Added 'PURGE LOGS BEFORE' command
Added expire-logs-days option
2003-03-11 13:49:06 +04:00
monty@mashka.mysql.fi
ced6463686 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-4.1
2003-03-11 00:39:55 +02:00
monty@mashka.mysql.fi
2d09c5bf9c Portability fixes 2003-03-11 00:30:35 +02:00
bell@sanja.is.com.ua
fd88f18547 fixed cleanup bug 2003-03-10 22:25:52 +02:00
Sinisa@sinisa.nasamreza.org
9c8838749f Fix for a bug with ROW(..) <=> ROW(...) 2003-03-10 20:54:18 +02:00
bell@sanja.is.com.ua
8482e27c81 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-in-4.1
2003-03-10 16:38:26 +02:00
bell@sanja.is.com.ua
af06b32a1d fixed crash on non-well-constructed reference 2003-03-10 16:38:06 +02:00
Sinisa@sinisa.nasamreza.org
dafa51eced Fix for a crashing bug 2003-03-08 22:19:41 +02:00
Sinisa@sinisa.nasamreza.org
3ee8d6e37e Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2003-03-07 21:48:22 +02:00