Commit graph

9278 commits

Author SHA1 Message Date
bar@bar.mysql.r18.ru
4f3474922b Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-09-10 17:26:09 +05:00
bar@bar.mysql.r18.ru
6fa45cec53 mysql_create_table now accepts field lengths in CREATE form, not in internal form.
This is to simplify fixing indexes to mean number of chars rather than bytes too.
2003-09-10 17:25:26 +05:00
hf@deer.(none)
b2a1bf2ef6 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.2way
2003-09-10 13:00:19 +05:00
hf@deer.(none)
fd77d78804 SCRUM: embedde library
Minor fixes
2003-09-10 12:58:26 +05:00
bell@sanja.is.com.ua
312755e115 Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
2003-09-10 10:25:29 +03:00
hf@deer.(none)
d9ef1585d1 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.2way
2003-09-10 12:10:30 +05:00
hf@deer.(none)
69283f8091 SCRUM: embedded library
mysql_fetch_length fixed for embedded library. Now data length is stored
before the data. Pointers in row still points to the data so you have to
get *(uint*)(data_ptr - sizeof(uint)) to get data length
2003-09-10 12:09:24 +05:00
bell@sanja.is.com.ua
23ad0cfbbb 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-09-10 09:43:30 +03:00
ram@mysql.r18.ru
4b1c22c57e Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/ram/work/4.1
2003-09-10 11:19:39 +05:00
ram@mysql.r18.ru
d0acda900c Fix for the fix for the bug #1209: SELECT DATABASE(). 2003-09-10 11:19:01 +05:00
bell@sanja.is.com.ua
a837b71e6c after merge fix 2003-09-09 23:07:39 +03:00
bell@sanja.is.com.ua
ad07ffbf6d merge 2003-09-09 22:26:19 +03:00
bell@sanja.is.com.ua
a0bf98b7a4 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-optimized_prepared-4.1
2003-09-09 17:38:21 +03:00
Sinisa@sinisa.nasamreza.org
5e32805713 Fix for a bug #1226.
Happens when braces are used on a single select, which leads
to the uninitialized global parameters structure.
2003-09-09 15:23:38 +03:00
bell@sanja.is.com.ua
813d81c726 removing additional IN subquery condition
fixed IN optimisation bug
2003-09-08 21:58:09 +03:00
serg@serg.mylan
536b8405b7 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-09-08 17:48:00 +02:00
serg@serg.mylan
503e7c930c Merge 2003-09-08 16:55:30 +02:00
hf@deer.(none)
90bd948e1e fix for #1219 2003-09-08 18:49:23 +05:00
ram@mysql.r18.ru
44d6102f81 Fix for the bug #1209: SELECT DATABASE(). 2003-09-08 17:30:53 +05:00
hf@deer.(none)
cf0c41aab4 fix for #1218 2003-09-08 17:00:39 +05:00
hf@deer.(none)
9807a3fa55 Trimming of embedded library code 2003-09-08 15:08:53 +05:00
ram@mysql.r18.ru
1f19af41a3 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/ram/work/4.1
2003-09-08 14:43:54 +05:00
hf@deer.(none)
9e83f314c3 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.clean
2003-09-08 13:13:17 +05:00
hf@deer.(none)
2ba517a3f1 fix for #1210 2003-09-08 13:11:18 +05:00
ram@mysql.r18.ru
0caa462b77 #1169: Add --exec command to mysqltest 2003-09-08 10:53:51 +05:00
bell@sanja.is.com.ua
d8361678da 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-09-07 20:36:21 +03:00
bell@sanja.is.com.ua
a02094ef10 fixed row union processing 2003-09-07 20:35:10 +03:00
hf@deer.(none)
bebe295dfe Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.clean
2003-09-06 18:51:39 +05:00
hf@deer.(none)
c7297eba3e Fix for LOAD DATA to work with embedded library 2003-09-06 18:50:30 +05:00
bell@sanja.is.com.ua
b48f64be19 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-string_parameters-4.1
2003-09-06 11:43:52 +03:00
gluh@gluh.mysql.r18.ru
548d7dc948 Fix for bug 1176 2003-09-04 17:12:20 +05:00
wax@kishkin.ru
b34c3934d9 BUG
correct bug 1085 (a problem with min/max functions)
add tests of bugs 833,836,1085
2003-09-04 06:44:16 +06:00
wax@mysql.com
f053ce3239 merge 2003-09-04 06:13:21 +06:00
kostja@oak.local
fbbc9a00af fixed bug - check_user shall not be included into the
embedded library.
2003-09-03 21:52:42 +04:00
kostja@oak.local
32635549fc Merge kosipov@bk-internal.mysql.com:/home/bk/mysql-4.1
into oak.local:/home/kostja/mysql/mysql-4.1-root
2003-09-03 19:28:16 +04:00
serg@serg.mylan
2317fa3ba5 C cleanups 2003-09-03 16:31:01 +02:00
kostja@oak.local
f1a4f7d037 Monty explanation for net_store_length(uint) put to the comment 2003-09-03 18:07:00 +04:00
serg@serg.mylan
7d2b0a0ce7 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-09-03 15:40:19 +02:00
kostja@oak.local
2335c7a0d4 fixed after-merge bug in CHANG_USER command 2003-09-03 17:29:51 +04:00
kostja@oak.local
711a3f6806 Merge kosipov@bk-internal.mysql.com:/home/bk/mysql-4.1
into oak.local:/home/kostja/mysql/mysql-4.1-root
2003-09-03 16:44:40 +04:00
kostja@oak.local
424a647069 post-merge fixes 2003-09-03 16:43:41 +04:00
bell@sanja.is.com.ua
358a9fafc7 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-string_parameters-4.1
2003-09-03 15:36:56 +03:00
kostja@oak.local
36dd82c1d5 merge commit, hope that none of bar and dlenev changes were
lost.
2003-09-03 14:12:10 +04:00
serg@serg.mylan
755455e15c merged 2003-09-03 12:07:18 +02:00
serg@serg.mylan
3d3f11f832 making InnoDB to return the row exactly the same (bytewise) as it was written to it 2003-09-03 11:37:59 +02:00
serg@serg.mylan
2fcab1c2ee CHECKSUM TABLE table1, table2, ... [ QUICK | EXTENDED ] 2003-09-03 11:34:32 +02:00
dlenev@dlenev.mshome
bd49884c19 Added automatically created SSL certificates from mysql-test/std_data
to ignore list.
2003-09-03 12:19:30 +04:00
bell@sanja.is.com.ua
054c6a93bb inserted forgoten ASSERT (BUG#1180) 2003-09-03 10:59:14 +03:00
bell@sanja.is.com.ua
51374e569d fixed BUG#1180 (changing WHERE clause of prepared statements by optimisation) 2003-09-02 19:56:55 +03:00
bell@sanja.is.com.ua
0f456a480e fixed string parameter assugnment (coping instead of asigning pointer to buffer) (BUG#1115)
fixed test_field_misc (UTF variable value)
2003-09-02 14:37:06 +03:00