Commit graph

2084 commits

Author SHA1 Message Date
Sinisa@sinisa.nasamreza.org
96078b5fc5 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2002-10-14 17:50:44 +03:00
serg@serg.mysql.com
784aeed98b bad merge fixed 2002-10-14 11:55:28 +00:00
serg@serg.mysql.com
fcb8bc061d merged 2002-10-14 11:36:48 +00:00
serg@serg.mysql.com
fd8e2337f5 Merge work:/home/bk/mysql-4.1
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1
2002-10-14 10:44:17 +00:00
bell@sanja.is.com.ua
d9f998164d fixed bug of multi-level EXPLAIN 2002-10-13 14:25:16 +03:00
Sinisa@sinisa.nasamreza.org
7ba2242803 Two bug fixes 2002-10-12 21:36:39 +03:00
serg@serg.mysql.com
68cd8c47fc --tmpdir=dir1:dir2... uses (is_windows ? ";" : ":") as a delimiter 2002-10-12 17:43:40 +00:00
serg@serg.mysql.com
f7ca3212ea Merge work:/home/bk/mysql-4.1
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1
2002-10-12 17:40:57 +00:00
Sinisa@sinisa.nasamreza.org
9c8871cf51 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2002-10-12 15:52:51 +03:00
bell@sanja.is.com.ua
f6d9e96fbc fixed subselect * bug 2002-10-12 01:09:47 +03:00
Sinisa@sinisa.nasamreza.org
4df2e3bf40 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2002-10-11 21:50:38 +03:00
Sinisa@sinisa.nasamreza.org
97990887cb SCRUM task 2002-10-11 21:49:10 +03:00
bell@sanja.is.com.ua
b79a4c01e7 fixed bug in subselect value storing 2002-10-11 17:00:11 +03:00
bar@bar.mysql.r18.ru
11a93ede41 Some reorganization to use less memory as well as to hide some implementation
aspects into *.c files from *.h files. Some steps to get closer to generating
*.c files from *.conf files again.
2002-10-10 15:52:32 +05:00
bar@bar.mysql.r18.ru
50c391538a my_sortcmp -> my_strnncoll 2002-10-09 16:33:35 +05:00
bar@bar.mysql.r18.ru
954a47b95a Simple charsets now have strncoll() field too 2002-10-09 15:40:57 +05:00
bell@sanja.is.com.ua
40c0fd1c6c removed 'this' pointer from initialization list of constructors 2002-10-08 23:49:59 +03:00
serg@serg.mysql.com
e65536b147 --tmpdir=dir1:dir2:... support in myisamchk 2002-10-08 14:34:04 +00:00
lenz@mysql.com
727e3056d9 Merge mysql.com:/my/mysql-4.0
into mysql.com:/space/my/mysql-4.0-automake
2002-10-08 16:22:35 +02:00
serg@serg.mysql.com
4842b82e9f Merge work:/home/bk/mysql-4.1
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1
2002-10-08 14:17:38 +00:00
serg@serg.mysql.com
3217f2cc06 support for --tmpdir=dir1:dir2:... 2002-10-08 12:39:37 +00:00
bell@sanja.is.com.ua
226535865b removed compiler warnings 2002-10-08 15:34:39 +03:00
bell@sanja.is.com.ua
2715d331f7 fixed couple of bugs in field/reference name resolution
fixed error handling in subselect fix_field
2002-10-08 14:50:12 +03:00
bell@sanja.is.com.ua
8d252004dc fixed query cache with system database
FN_NO_CASE_SENCE used instead of __WIN__ in table name handling of quary cache
2002-10-08 00:26:15 +03:00
bell@sanja.is.com.ua
ff855e0962 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-4.1
2002-10-07 22:22:26 +03:00
bell@sanja.is.com.ua
09bec43b89 fixed error handling bug 2002-10-07 22:21:17 +03:00
ram@mysql.r18.ru
d987b235c2 Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/ram/mysql-4.1
2002-10-07 17:51:05 +05:00
ram@mysql.r18.ru
2e1a0c031a auto_increment for heap tables
test case
2002-10-07 17:49:03 +05:00
bell@sanja.is.com.ua
23de67efae after merging fix 2002-10-07 00:56:21 +03:00
bell@sanja.is.com.ua
199f667c19 merging 2002-10-04 14:15:59 +03:00
lenz@mysql.com
fa0c110cd2 Merge mysql.com:/my/mysql-4.0
into mysql.com:/space/my/mysql-4.0-automake
2002-10-03 21:12:28 +02:00
monty@mashka.mysql.fi
61488a7b98 Fixed bug that causes select test to fail
Now MySQL 4.1 is up to date with all patches from 4.0.4 and passes the test suite.
2002-10-03 19:44:46 +03:00
bell@sanja.is.com.ua
2883c3a8cc fixing EXPLAIN select types 2002-10-03 18:47:04 +03:00
monty@mashka.mysql.fi
2e52a69b12 Merge work:/my/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1 2002-10-03 16:56:09 +03:00
monty@mashka.mysql.fi
62a26cf891 Update after last merge. Fixes some wrong test results. 2002-10-03 16:54:26 +03:00
bell@sanja.is.com.ua
70ee4943de Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-merge_lex-4.1
2002-10-03 16:37:41 +03:00
bell@sanja.is.com.ua
48b2a76a48 after merging bugfix 2002-10-03 16:35:08 +03:00
ram@mysql.r18.ru
d5ca940a4b Merge mysql.r18.ru:/usr/home/ram/mysql-4.1.last
into mysql.r18.ru:/usr/home/ram/mysql-4.1
2002-10-03 17:26:05 +05:00
ram@mysql.r18.ru
032a4a927a Additional key segment (HA_KEYTYPE_END) creation has been moved from handler to hp_create.c 2002-10-03 14:55:02 +05:00
monty@mashka.mysql.fi
0f39457613 Merge with 4.0.4 2002-10-02 17:55:12 +03:00
monty@mashka.mysql.fi
a748b35ddd merge with work 2002-10-02 13:45:16 +03:00
monty@mashka.mysql.fi
d69250a969 Fixes and code cleanups after merge with 4.0.3
Warning handling and initial prepared statement handling (last not complete yet)
Changed a lot of functions that returned 0/1 to my_bool type.
GRANT handling now uses read/write locks instead of mutex
Change basic net functions to use THD instead of NET
(needed for 4.1 protocol)
Use my_sprintf instead of sprintf() + strlen()
Added alloc_query() to be able to chare query initialization code with
prepared statements.
Cleanup handling of SHOW COUNT(*) WARNINGS and SELECT LAST_INSERT_ID()

Note that the following test fails (will be fixed ASAP):
sub_select, union, rpl_rotate_logs and rpl_mystery22
2002-10-02 13:33:08 +03:00
monty@hundin.mysql.fi
bef1d7d32e Fix for building shared libraries with a patched glibc
Don't require UPDATE_ACL for REPLACE
2002-10-02 12:37:32 +03:00
lenz@mysql.com
3cf7acb756 - Applied required modifications for automake 1.5
- some additional small fixes
 - added "depcomp" for automake 1.5
2002-10-01 21:57:10 +02:00
bar@bar.mysql.r18.ru
1af778c05b User variables didn't store charset, so this didn't work
as expected and returned default charset instead:
SET @x = _koi8_ru'test';
SELECT CHARSET(@x);
2002-10-01 17:23:28 +05:00
bar@bar.mysql.r18.ru
d1d725c5a1 SHOW TABLE STATUS now displays table charset as well 2002-10-01 13:54:59 +05:00
monty@hundin.mysql.fi
2d66b2f519 Revert change to use ha_rows for number of rows as other code depend of this 2002-09-30 14:54:16 +03:00
bell@sanja.is.com.ua
c65515d888 fixed bug in string & date types with group function in subselect 2002-09-28 18:34:56 +03:00
bell@sanja.is.com.ua
6c6726931d fixed Item_subselect constructor 2002-09-27 23:11:51 +03:00
monty@hundin.mysql.fi
5ce2900d48 Merge hundin.mysql.fi:/my/mysql-3.23
into hundin.mysql.fi:/my/bk/mysql-4.0
2002-09-27 12:13:28 +03:00