paul@ice.snake.net
a5952ef768
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-06-25 14:35:15 -05:00
konstantin@mysql.com
172ab0ab8b
Fix for 'make dist' 'make distclean' goals work even if ./configure
...
called without NDB enabled.
2004-06-25 23:21:14 +04:00
monty@mysql.com
8c867328cd
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-06-25 21:56:42 +03:00
monty@mysql.com
e7a01ed3dc
After merge fixes
2004-06-25 21:56:23 +03:00
paul@ice.snake.net
da149eccee
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-06-25 12:16:52 -05:00
monty@mysql.com
b1d08ba2b4
Merge with 4.0 to get the latest bug patches to 4.1
2004-06-25 20:13:05 +03:00
dlenev@brandersnatch.localdomain
ab26a68498
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-fix
2004-06-25 21:05:25 +04:00
dlenev@brandersnatch.localdomain
9c35c402f2
Removed mysql_tzinfo_to_sql dependancy on sql/mysql_priv.h for circumventing
...
problems with unresolved dependancies on some platforms.
2004-06-25 21:04:48 +04:00
paul@ice.snake.net
6a0676d8be
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-06-25 11:37:46 -05:00
monty@mysql.com
c3eb936040
Merge mysql.com:/home/my/mysql-3.23 into mysql.com:/home/my/mysql-4.0
2004-06-25 18:55:03 +03:00
monty@mysql.com
b878240940
Add missing .cnf files to windows installation (Bug #4216 )
2004-06-25 18:54:43 +03:00
monty@mysql.com
f6765146c1
Added missing root user to mysql.user on windows. (Bug #4242 )
...
Set default max_allowed_packet to be able to read help tables even if an my.cnf file with this option is present. (Bug #3938 )
Don't use default arguments for ha_rnd_init()
Simple code cleanups since last pull
2004-06-25 18:49:36 +03:00
paul@ice.snake.net
cbf79fd2ff
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-06-25 10:45:27 -05:00
bell@sanja.is.com.ua
45411ca0b5
merge
2004-06-25 18:33:31 +03:00
lenz@mysql.com
00dc9a0e91
Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1
2004-06-25 16:03:25 +02:00
lenz@mysql.com
9911d93f07
- removed the VC++Files/InstallShield directory per Montys request
...
(moved it into another BK tree instead)
2004-06-25 16:00:17 +02:00
serg@serg.mylan
3ba6fd97b4
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-06-25 15:12:51 +02:00
serg@serg.mylan
3b59dd1bd0
bug#4008 - merge table cannot determine what key caused "dupl. key" error
2004-06-25 15:12:13 +02:00
konstantin@mysql.com
354e2ba67b
Type of MYSQL_BIND::buffer changed to void *
2004-06-25 17:04:33 +04:00
ingo@mysql.com
8db6c064df
Merge mysql.com:/home/mydev/mysql-4.0
...
into mysql.com:/home/mydev/mysql-4.0-bug2686
2004-06-25 14:44:37 +02:00
bell@sanja.is.com.ua
74b01ca387
type of parameter assignment for parameters from variables added (BUG#4280)
2004-06-25 15:16:00 +03:00
bell@sanja.is.com.ua
6e1eb6a78c
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-explain-4.1
2004-06-25 14:48:15 +03:00
serg@serg.mylan
02f411124d
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-06-25 13:16:48 +02:00
serg@serg.mylan
2b93adb9c1
Bug#3808 - fulltext index, delete, 2-level tree, the word on the 1st level has different length than the key (latin1_german2_ci)
2004-06-25 13:11:02 +02:00
ingo@mysql.com
57da928039
Merge
2004-06-25 12:59:47 +02:00
ram@gw.mysql.r18.ru
fe3bb82b2b
Changed a comment.
2004-06-25 15:26:50 +05:00
ingo@mysql.com
958cf857a3
Merge mysql.com:/home/mydev/mysql-4.0
...
into mysql.com:/home/mydev/mysql-4.0-bug3565
2004-06-25 12:14:54 +02:00
ram@gw.mysql.r18.ru
65fe5e7289
a fix (bug #4241 : system_mysql_db_fix.test fails)
2004-06-25 15:09:26 +05:00
serg@serg.mylan
3452445559
remove ^M's
...
compile even without InnoDB
2004-06-25 11:33:03 +02:00
bell@sanja.is.com.ua
4092635155
fixed EXPLAIN behaviour with prepared statements (BUG#4271)
2004-06-25 11:37:43 +03:00
patg@krsna.patg.net
f6ea88e8a3
Many files:
...
new file
2004-06-25 00:43:14 -07:00
dlenev@brandersnatch.localdomain
1013d3c7ec
Small build fix.
...
Add my_time.h to list of headers which should be put ot include/ during make dist.
2004-06-25 10:30:24 +04:00
serg@serg.mylan
db46b47be8
undone
2004-06-25 01:43:41 +02:00
serg@serg.mylan
b511996ff4
workaround for gcc 2.95.3 bug
...
anybody knows how to distinguish 2.95.3 from 2.95.4 (which is ok) ?
2004-06-25 01:25:02 +02:00
serg@serg.mylan
04bd8c9a44
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-06-25 00:56:34 +02:00
serg@serg.mylan
d8984ba396
free open cursors
2004-06-25 00:50:48 +02:00
konstantin@mysql.com
f99224fe2d
One more const method.
2004-06-25 01:30:43 +04:00
konstantin@mysql.com
b6cb8cb5f7
Followup to cleanup in handler interface.
2004-06-25 01:29:30 +04:00
paul@ice.snake.net
737735d81b
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-06-24 16:29:29 -05:00
serg@serg.mylan
8162e97ada
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-06-24 23:29:29 +02:00
konstantin@mysql.com
dc2b5c2ac2
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/kostja/mysql/mysql-4.1-root
2004-06-25 01:29:28 +04:00
serg@serg.mylan
37314708b7
merged
2004-06-24 23:29:28 +02:00
vva@eagle.mysql.r18.ru
dfd200c835
Merge
2004-06-25 02:29:27 +05:00
vva@eagle.mysql.r18.ru
8e651814e9
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
...
into eagle.mysql.r18.ru:/home/vva/work/BUG_1851/mysql-4.1
2004-06-25 02:24:00 +05:00
vva@eagle.mysql.r18.ru
665d1451f2
fixed bug #1851 "mysqldump does not return
...
an error code if the output device is filled"
2004-06-25 01:14:12 +05:00
bell@sanja.is.com.ua
5db861c3e4
parameter of my_yyoverflow made independed from YYSIZE_T (BUG#4204)
2004-06-24 22:15:15 +03:00
konstantin@mysql.com
fccfcb98d5
Previous commit didn't make it (tree fix): I'd forgotten semicolon.
2004-06-24 22:47:05 +04:00
konstantin@mysql.com
998fd5a8f0
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/kostja/mysql/mysql-4.1-root
2004-06-24 22:37:41 +04:00
konstantin@mysql.com
a32bb3c0c4
Fix of broken 4.1 tree:
...
Initially my_time.c was added to sql/ link_sources target only.
As it turns out this target is sometimes not called; instead of it
make calls one hard-coded in top-level Makefile.am.
Now adding linking of my_time.c to the top-level Makefile.am
to (hopefully) cover all cases.
2004-06-24 22:33:40 +04:00
bell@sanja.is.com.ua
88877e6710
Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
2004-06-24 21:29:05 +03:00
