pem@mysql.com
db127864f6
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/pem/work/mysql-4.1
2004-05-06 20:21:53 +02:00
pem@mysql.comhem.se
d02d105916
Fixed (portability) bug in handler.h, and tried to silence cast warnings on some platforms.
2004-05-06 19:55:12 +02:00
monty@mysql.com
d5165650db
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-05-06 19:50:48 +03:00
lenz@mysql.com
f39c4012a3
- Windows compile fixes: added some missing files to the Windows Project
...
files, fixed linking of myisam_ftdump
2004-05-06 18:31:09 +02:00
monty@mysql.com
28673669a4
Merge with 4.0 to get security patch for check_grant_colum
2004-05-06 13:42:26 +03:00
konstantin@mysql.com
57feb6625a
Few cleanups to client_test.c
2004-05-06 13:49:20 +04:00
monty@mysql.com
f2991bc410
Merge mysql.com:/home/my/mysql-3.23 into mysql.com:/home/my/mysql-4.0
2004-05-06 11:42:35 +03:00
monty@mysql.com
a16c829c04
Remove not used variable
2004-05-06 11:42:23 +03:00
monty@mysql.com
c150453b42
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-05-06 04:41:09 +03:00
monty@mysql.com
f6dc9169e2
Fixed wrong key usage which caused wrong result for some "WHERE primary_key=constant" queries where MySQL could use 'only index' (Bug #3666 )
...
The bug was introduced in a patch in the 4.1.2 source tree.
2004-05-06 04:40:45 +03:00
sergefp@mysql.com
ec33d794d8
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/dbdata/psergey/mysql-4.1-code-cleanup
2004-05-06 01:06:18 +04:00
bell@sanja.is.com.ua
5030d28035
fixed test results
2004-05-05 23:29:35 +03:00
bell@sanja.is.com.ua
ae85306e19
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-ndb-4.1
2004-05-05 23:19:13 +03:00
guilhem@mysql.com
cd18476e34
Replication:
...
as the I/O thread filters on the server id, we must test replicate_same_server_id in it (on top of in the SQL thread).
2004-05-05 22:01:41 +02:00
guilhem@mysql.com
f7f7e725d6
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2004-05-05 21:51:26 +02:00
guilhem@mysql.com
d20230bcbe
very minor changes: a STOP SLAVE in a replication test to get rid of a non critical message in slave.err,
...
and a comment update
2004-05-05 21:50:51 +02:00
bell@sanja.is.com.ua
26f0825cae
merge
2004-05-05 22:30:01 +03:00
monty@mysql.com
4e2b94dea6
After merge fixes
2004-05-05 21:46:16 +03:00
monty@mysql.com
6827fe4086
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-05-05 21:24:45 +03:00
monty@mysql.com
a5d8b846fa
after merge fixes
2004-05-05 21:24:21 +03:00
bell@sanja.is.com.ua
62fca61bc4
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-ndb-4.1
2004-05-05 21:24:13 +03:00
bell@sanja.is.com.ua
c5c35c667e
caching of queries with isammerge tables forbiden using general way
...
SQL_SELECT_LIMIT as default will be applied only for SELECT statement if there was not explicit LIMIT clause
correct table list passed to class constructor of select_update
2004-05-05 21:21:41 +03:00
sergefp@mysql.com
7c3376229e
Make Item_param::val_int and Item_param::val_str follow the used convention and return 0 if null_value==1.
2004-05-05 20:04:25 +04:00
monty@mysql.com
d21d49a32a
Merge with 4.0.19
2004-05-05 17:05:24 +03:00
miguel@hegel.local
4d8235b849
Merge miguel@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into hegel.local:/home/miguel/bk/mysql-4.1
2004-05-05 10:55:39 -03:00
miguel@hegel.local
634a024fa9
Fixes for prior commit
2004-05-05 10:54:11 -03:00
marko@hundin.mysql.fi
d15b0b577d
InnoDB portability fix: new function os_file_set_eof()
2004-05-05 15:54:28 +03:00
monty@mysql.com
e51887b050
Portability fix
2004-05-05 14:40:44 +03:00
ram@gw.mysql.r18.ru
949c01bfa2
a fix (Bug #3435 : STDDEV|VARIANCE(constant) returns constant if no rows)
2004-05-05 16:06:01 +05:00
monty@mysql.com
104fdf607d
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-05-05 12:40:59 +03:00
monty@mysql.com
82c50dc49d
Delete Items created during Prepared Stat (memory leak bug) (Bug #3451 )
2004-05-05 12:40:33 +03:00
monty@mysql.com
7e3cf5958c
Fixed crashing bug with alter table when table was in use (Bug #3643 )
...
We didn't use 'only index' for tables of type 'const'. (Bug #3497 )
2004-05-05 12:31:17 +03:00
marko@hundin.mysql.fi
fc7ae6a222
InnoDB: Truncate "<datadir>/innodb.status.<pid>" to its actual size
...
(Bug #3596 )
2004-05-05 11:50:58 +03:00
marko@hundin.mysql.fi
09fc359480
InnoDB: os0file.c: Lock files exclusively (Bug #3608 )
2004-05-05 11:40:17 +03:00
bell@sanja.is.com.ua
e9492cca05
avoid using ndb tables in query cache
2004-05-05 11:22:10 +03:00
marko@hundin.mysql.fi
10db9f4bea
Merge marko@build.mysql.com:/home/bk/mysql-4.0
...
into hundin.mysql.fi:/home/marko/l/mysql-4.0
2004-05-05 10:15:43 +03:00
miguel@hegel.local
8d1480f7c5
Windows fixes for VC++ compiler compability
2004-05-05 02:59:17 -03:00
greg@mysql.com
a2a1e43c30
Fixes to Windows project files for 4.0.19
2004-05-04 21:47:39 -01:00
Sinisa@sinisa.nasamreza.org
ee627d2510
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2004-05-04 23:05:37 +03:00
Sinisa@sinisa.nasamreza.org
68cb444c62
Fix for a multi table updates when one of the tables is not updated
...
but used in a nested query.
2004-05-04 23:04:05 +03:00
dlenev@brandersnatch.localdomain
f1c8e165a5
After merge fix.
...
Now test_bug1664() uses new statement checking macros.
2004-05-04 20:02:55 +04:00
dlenev@brandersnatch.localdomain
2c30359aa4
Manual merge of bugfix for Bug #1664 .
2004-05-04 19:13:18 +04:00
dlenev@brandersnatch.localdomain
c7fbcbca7a
Fix for remaining issues described in Bug #1664
...
"mysql_send_long_data() API call is completely broken".
Now we are resetting some members (long_data_supplied/null_value...) of Item_param to its
initial state after each execution of prepared statement. We also manipulating
Item_param::maybe_null/null_value only via Item_param::set_* setters which makes code a bit
more robust.
2004-05-04 19:08:19 +04:00
guilhem@mysql.com
5fcd62a13a
useless fixes for --report-password and --show-slave-auth-info (almost undocumented options),
...
just for beauty of truth.
2004-05-04 16:35:31 +02:00
guilhem@mysql.com
8ffa47c0d1
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2004-05-04 15:49:22 +02:00
guilhem@mysql.com
a5aeb8f7fa
Fix for Bug#3357 "If the statement is long, the error message is trunc and important info is lost";
...
in hard-coded replication messages, always put small-length info (error codes, explanation of the error) at the beginning,
so that it is not cut by truncation if the query is very long (which happens if the query goes first).
2004-05-04 15:48:40 +02:00
Sinisa@sinisa.nasamreza.org
b58127689e
union.result:
...
fixing typo
union.test:
fixing type
2004-05-04 16:48:34 +03:00
bell@sanja.is.com.ua
af25c817fe
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-prep-4.1
2004-05-04 16:42:39 +03:00
bell@sanja.is.com.ua
c2f194f243
repetable test replaced with inline function
2004-05-04 16:37:04 +03:00
serg@serg.mylan
4fcff3d2f1
don't rely on readdir() returning . and .. first
2004-05-04 14:36:23 +02:00
