Commit graph

11150 commits

Author SHA1 Message Date
serg@serg.mylan
905a548ee8 no unnecessary includes (Intel ecc 7.0 compatibility fix) 2004-01-21 20:25:49 +01:00
lenz@mysql.com
002c2faaf9 Merge lgrimmer@build.mysql.com:/home/bk/mysql-5.0
into mysql.com:/space/my/mysql-5.0
2004-01-21 17:19:33 +01:00
pem@mysql.comhem.se
bfdf9d3cc4 Fixed BUG#2227: Server crash with stored procedure call.
(Meaning "... with SELECT v", where v is a local variable.)
2004-01-21 14:28:35 +01:00
bar@bar.intranet.mysql.r18.ru
03d60deed7 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into bar.intranet.mysql.r18.ru:/usr/home/bar/mysql-4.1
2004-01-21 15:48:32 +04:00
hf@deer.(none)
3d65182c24 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.clean
2004-01-21 15:48:31 +04:00
hf@deer.(none)
97fbbcd17c yet another cleanup()-related fix 2004-01-21 15:47:47 +04:00
bar@bar.intranet.mysql.r18.ru
daf0bba236 sql_string.cc:
Rewrote to comply the coding style
2004-01-21 14:32:02 +04:00
bar@bar.intranet.mysql.r18.ru
03d00c7da9 Further fixes for 2390: ucs2 alignment 2004-01-21 14:15:19 +04:00
hf@deer.(none)
237d655e12 Fix for #2278 (mysql_prepare and mysql_execute not exported in libmysqld.dll)
Actually no PS-related methods were exported.
Now they're in the libmysqld.def
2004-01-21 00:08:18 +04:00
bell@sanja.is.com.ua
03d7217f77 Merge 2004-01-20 19:23:28 +02:00
bell@sanja.is.com.ua
2a55a7684f for multy-delete command used same algorithm of table reference (alias) 2004-01-20 19:16:18 +02:00
hf@deer.(none)
5b32ce5b0d Merge deer.(none):/home/hf/work/mysql-4.1.clean
into deer.(none):/home/hf/work/mysql-4.1.1676
2004-01-20 21:00:29 +04:00
hf@deer.(none)
37abf689ec Pack of changes about 'cleanup()'-s
Some errorneous code trimmed
2004-01-20 20:55:47 +04:00
Sinisa@sinisa.nasamreza.org
ab4042adc1 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2004-01-20 17:49:10 +02:00
heikki@hundin.mysql.fi
d9ef69e7a1 row0sel.c:
Remove extra mtr_start()
2004-01-20 17:35:51 +02:00
Sinisa@sinisa.nasamreza.org
aeb013b6ae Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-5.0
into sinisa.nasamreza.org:/mnt/work/petica
2004-01-20 17:01:34 +02:00
igor@rurik.mysql.com
ab28521dff Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
into rurik.mysql.com:/home/igor/mysql-4.1
2004-01-19 23:00:46 -08:00
monty@mysql.com
b078d2df64 merge 2004-01-20 00:15:01 +01:00
monty@mysql.com
0eb6070068 Code cleanup
Fixed bug in optimizer where it didn't choose right table order in some cases
2004-01-19 23:51:17 +01:00
konstantin@mysql.com
eb0ae211c5 more clear (grammar mistake) 2004-01-19 23:34:40 +03:00
konstantin@oak.local
c74cd37cd1 More comments to THD::lock and THD::locked_tables commented 2004-01-19 23:34:39 +03:00
vva@eagle.mysql.r18.ru
6b94ea53d5 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_2310/mysql-4.1
2004-01-20 00:34:38 +04:00
vva@eagle.mysql.r18.ru
12008677de Fixed bug #2310 "INET_ATON handles short-forms addresses incorrectly" 2004-01-20 00:32:25 +04:00
hf@deer.(none)
7dda8c102f Merge deer.(none):/home/hf/work/mysql-4.1.clean
into deer.(none):/home/hf/work/mysql-4.1.1676
2004-01-19 21:06:27 +04:00
hf@deer.(none)
c29e27dabc Code cleanup
Superfluous line removed
2004-01-19 21:05:26 +04:00
lenz@mysql.com
2a3d219186 Merge lgrimmer@build.mysql.com:/home/bk/mysql-5.0
into mysql.com:/space/my/mysql-5.0
2004-01-19 17:56:41 +01:00
pem@mysql.comhem.se
ee41164863 Made UDFs work again. 2004-01-19 17:37:51 +01:00
hf@deer.(none)
1f8eb40310 Code cleanup (working on PS & cleanup() code)
Item & changed with Item* in Item_xxx constructors
tables_list.first -> get_table_list()
2004-01-19 19:53:25 +04:00
bar@bar.intranet.mysql.r18.ru
d921a05ec6 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into bar.intranet.mysql.r18.ru:/usr/home/bar/mysql-4.1
2004-01-19 19:21:07 +04:00
bar@bar.intranet.mysql.r18.ru
f802ec0215 UCS-2 aligning 0xAA -> 0x00AA 2004-01-19 19:16:30 +04:00
serg@serg.mylan
6985f346b9 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-01-19 14:23:18 +01:00
serg@serg.mylan
cf80041e09 field length convertion (bytes->chars) should be done with rounding UP. 2004-01-19 14:22:38 +01:00
Sinisa@sinisa.nasamreza.org
aa933d382b Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2004-01-19 14:15:40 +02:00
ram@gw.mysql.r18.ru
9ac61de6bb Test case for the bug #2198: SELECT INTO OUTFILE (with Sub-Select) Problem. 2004-01-19 14:10:05 +04:00
ram@gw.mysql.r18.ru
e289783cf8 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b2182
2004-01-19 13:00:51 +04:00
acurtis@pcgem.rdg.cyberkinetica.com
81ef764e2c Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into pcgem.rdg.cyberkinetica.com:/usr/home/acurtis/work/wl1280-fix
2004-01-18 22:32:14 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
aa31e98c90 Fix deprecation warning - database_engine => storage_engine 2004-01-18 22:30:35 +00:00
serg@serg.mylan
ca8929a1fb trivial FT2 bug in mi_write fixed
(same as ChangeSet@1.1538.36.1, 2003-06-12 12:41:29+02:00, serg@serg.mylan, "FT2 bug in mi_delete fixed")
BUG#2417
2004-01-18 17:29:27 +01:00
Sinisa@sinisa.nasamreza.org
8959551451 merge fixes 2004-01-17 17:18:32 +02:00
bell@sanja.is.com.ua
0b7ebbb57d Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-insert-4.1
2004-01-17 15:28:56 +02:00
bell@sanja.is.com.ua
16f2e3d78d new test added
test fixed
2004-01-17 15:28:20 +02:00
bell@sanja.is.com.ua
7277c4e95d Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-exists-4.1
2004-01-17 14:43:56 +02:00
bell@sanja.is.com.ua
48686f89e6 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-ft_derived-4.1
2004-01-17 14:03:22 +02:00
bell@sanja.is.com.ua
242e8dbbbb merge 2004-01-17 13:13:48 +02:00
bell@sanja.is.com.ua
a5800f8f44 commit of forgoten test 2004-01-17 13:09:41 +02:00
bell@sanja.is.com.ua
c04fd7b177 switched to new syntax (TYPE->ENGINE)
check of memory allocation operation was added
2004-01-17 13:00:46 +02:00
bell@sanja.is.com.ua
4adf62eab3 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-sub-4.1
2004-01-17 12:18:46 +02:00
bell@sanja.is.com.ua
b781183f09 mysqldump results fixed 2004-01-17 12:03:14 +02:00
bell@sanja.is.com.ua
bcbc9ff22f Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-sub-4.1
2004-01-17 11:53:04 +02:00
bell@sanja.is.com.ua
41323e8b76 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-drop-4.1
2004-01-17 10:02:01 +02:00