Commit graph

10749 commits

Author SHA1 Message Date
serg@serg.mylan
c4326bc68e better fix BUG#2361: ALTER TABLE ... DROP PRIMARY KEY drops a non-primary key 2004-01-28 18:35:52 +01:00
hf@deer.(none)
8dea612a36 Fix for #2210 (SHOW TABLE STATUS fails when .frm is corrupted)
We signed error instead of returning the result
2004-01-28 12:38:17 +04:00
hf@deer.(none)
7f26ab154c Fix for #2209
mysql->server_status wasn't set after the query
2004-01-27 16:51:11 +04:00
hf@deer.(none)
631dc30c5a Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.1224
2004-01-27 13:48:20 +04:00
hf@deer.(none)
94b0713ca1 bugfix to #1224
code slightly modified with Monty's suggestions
2004-01-27 13:46:47 +04:00
hf@deer.(none)
1edab55f32 code cleanup (unnecessary line in libmysqld/Makefile.am) 2004-01-27 11:25:07 +04:00
guilhem@gbichot2.local
0f5933e38e warning comment 2004-01-26 20:16:37 +01:00
guilhem@mysql.com
43aceea0bb Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1
2004-01-26 19:39:46 +01:00
guilhem@gbichot2.local
5ea3000d47 fix for BUG#2516: "SLAVE START may crash mysqld" 2004-01-26 19:39:00 +01:00
gluh@gluh.mysql.r18.ru
950e45ded8 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into gluh.mysql.r18.ru:/home/gluh/Bugs/mysql-4.1.long
2004-01-26 20:32:14 +04:00
gluh@gluh.mysql.r18.ru
fb6338d1a3 Fix for bug#2505: MySQL reports "out of memory"
when DROP USER if --skip-grant-tables
2004-01-26 20:31:38 +04:00
jani@rhols221.adsl.netsonic.fi
4f6330d841 Fixed a bug in slave-compressed-protocol. Using this option
from command line did not work.
2004-01-26 15:12:52 +02:00
Sinisa@sinisa.nasamreza.org
887fd04ffa Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2004-01-24 15:57:48 +02:00
igor@rurik.mysql.com
e120f5cec1 mysqld.cc:
Fixed a typo bug.
2004-01-23 21:26:13 -08:00
igor@rurik.mysql.com
0c5b6c1958 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
into rurik.mysql.com:/home/igor/mysql-4.1
2004-01-23 20:08:02 -08:00
hf@deer.(none)
acc84f0391 define name fixed 2004-01-23 20:52:35 +04:00
hf@deer.(none)
1562dafa5b Error message added 2004-01-23 20:03:42 +04:00
hf@deer.(none)
52f2529536 Conflicts resolved 2004-01-23 20:00:10 +04:00
hf@deer.(none)
c13f757c43 SCRUM
WL#1163 (Make spatial code separable)
fixes before the push
2004-01-23 19:54:22 +04:00
jani@rhols221.adsl.netsonic.fi
0680d16595 Reverted an addition to be able to use ';' as a comment
starting character elsewhere than in the beginning of a line,
because it affected some innodb options that had ';'
in them.
2004-01-23 15:31:16 +02:00
hf@deer.(none)
215a65b1fd SCRUM
wl #1163 (Make spatial code optional)
Patch I cleaned with Serg & Monty's suggestions
2004-01-23 16:02:57 +04:00
serg@serg.mylan
b68a83a050 patch reverted - USE_RAID is defined in my_config.h 2004-01-23 11:56:37 +01:00
Sinisa@sinisa.nasamreza.org
6315a4874f Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2004-01-22 22:44:05 +02:00
Sinisa@sinisa.nasamreza.org
6f1342a61d Fix for a bug #2422, where CONVERT(expr, cast) was masked by
CONVERT(expr, expr, expr);
2004-01-22 22:13:24 +02:00
serg@serg.mylan
fbf4299b5c Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-01-22 14:46:54 +01:00
Sinisa@sinisa.nasamreza.org
0bdf713a85 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2004-01-22 14:18:12 +02:00
serg@serg.mylan
c4a52e4ac4 enforcing coding style to cause an intentional merge conflict with 4.0 2004-01-22 12:55:37 +01:00
igor@rurik.mysql.com
a2209361d6 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
into rurik.mysql.com:/home/igor/mysql-4.1
2004-01-21 12:38:23 -08:00
serg@serg.mylan
905a548ee8 no unnecessary includes (Intel ecc 7.0 compatibility fix) 2004-01-21 20:25:49 +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
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
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
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