Commit graph

12107 commits

Author SHA1 Message Date
bar@bar.intranet.mysql.r18.ru
f16dac0492 Use Windows code page 1252 instead of real ISO 8859-1 2004-05-11 13:32:01 +05:00
miguel@hegel.local
6fcfc63962 Removing VC++ compiler warnings 2004-05-10 22:25:51 -03:00
miguel@hegel.local
feb5d24d04 Fix VC++ compiler error (function redifinition) for embedded server 2004-05-10 20:55:52 -03:00
monty@mysql.com
87e7438709 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-05-10 23:48:03 +03:00
monty@mysql.com
c290af955a Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-05-10 17:38:05 +03:00
monty@mysql.com
4ef7918e18 Add read_rnd_buffer_size in my.cnf example files
Remove wrong redefine of vio_reset() (to compile libmysqld on windows)
2004-05-10 17:37:38 +03:00
tomas@mc05.(none)
6fffe59077 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mc05.(none):/space/tomas/mysql-4.1
2004-05-10 16:01:49 +02:00
tomas@mc05.(none)
b84ca2ed36 Makefile:
slim make for ndb
2004-05-10 14:39:54 +02:00
tomas@mc05.(none)
718efc3964 make warning fixes for ndb 2004-05-10 14:25:32 +02:00
marko@hundin.mysql.fi
34f2da9221 Merge marko@build.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/marko/j/mysql-4.1
2004-05-10 15:14:39 +03:00
tomas@mc05.(none)
62565bede8 more slim make of ndb tree 2004-05-10 14:10:04 +02:00
tomas@mc05.(none)
345328036f fix compiler warnings in ndb 2004-05-10 11:50:17 +02:00
marko@hundin.mysql.fi
1c407e4391 Merge marko@build.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/marko/j/mysql-4.1
2004-05-07 16:01:47 +03:00
georg@beethoven.local
c745ae9503 Added additional parameter userdata for mysql_set_local_infile_handler
to allow binding of userland functions in PHP.
2004-05-07 14:50:10 +02:00
marko@hundin.mysql.fi
11f9ec1dc5 Merge marko@build.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/marko/j/mysql-4.1
2004-05-07 12:48:01 +03:00
ingo@mysql.com
5c4f83bbd9 Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-wl1687
2004-05-07 11:13:58 +02:00
bar@bar.intranet.mysql.r18.ru
df8e3eac45 ctype-win1250ch.c, ctype-czech.c:
Czech collations were renamed to _cs
Index.xml:
  Czech collation were renamed to _cs
2004-05-07 10:24:12 +05:00
monty@mysql.com
523c2935c9 Portablity fix for system with case insenstive table names. (Without this ALTER TABLE can fail for InnoDB) 2004-05-07 06:34:44 +03:00
monty@mysql.com
9e71351122 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-05-07 01:44:07 +03:00
monty@mysql.com
939ea71ecd Portability fixes
Change strtoll -> my_strtoll10()
Fixed bug in my_strntoul() and my_strntol() where we got different values on 32 and 64 bit systems (Bug #3472)
2004-05-07 01:43:17 +03:00
miguel@hegel.local
be8f7641ff Merge miguel@bk-internal.mysql.com:/home/bk/mysql-4.1
into hegel.local:/home/miguel/bk/mysql-4.1
2004-05-06 18:48:34 -03:00
miguel@hegel.local
1106c26bea Windows VC++ compiler compatibility 2004-05-06 18:46:31 -03:00
bell@sanja.is.com.ua
cd24221017 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-all_any-4.1
2004-05-07 00:33:06 +03:00
bell@sanja.is.com.ua
c5d8497ee0 postreview fixes 2004-05-07 00:32:44 +03:00
bell@sanja.is.com.ua
a31452c512 fake_select_lex should be prepared during PS preparation to work correctly
item_list for fake_select will be created only once
(problem reported by valgrind in test_union2 fixed)
2004-05-07 00:08:21 +03:00
lenz@mysql.com
a0540f3c6f Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
2004-05-06 21:40:22 +02:00
lenz@mysql.com
a320e554e6 - removed duplicate file ..\strings\strxnmov.c from the mysqlclient.dsp
that was accidently added by the last BK auto merge
2004-05-06 21:37:43 +02:00
konstantin@mysql.com
b58df2e9d4 mysql_stmt_reset now expects ok/error packet from server. 2004-05-06 22:44:00 +04:00
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
miguel@hegel.local
510b5d9608 Windows VC++ compability fix 2004-05-06 13:28:16 -03:00
ingo@mysql.com
784c9526ec WL#1687 - Optimize UNION DISTINCT ... UNION ALL (again).
HEAP: Copies the key count to a backup variable and sets the key count to zero.
That way, no HEAP function will ever try to touch any index.
Re-enabling is done by copying back the backup variable.
To avoid memory leak at table close, disable deletes all index trees.
Re-enabling must be done with empty indexes and data anyway. Otherwise,
the indexes would need to be repaired, wich HEAP is not capable of.
MyISAM: Only the key_map is cleared and set.
Re-enabling must be done with empty indexes and data. Otherwise, repair needs
to be done which will enable all keys persistently.
The former implementation disabled only non-unique keys and maked this persistent.
The new implementation additionally can disable all keys, but only without
making this persistent. Re-enabling all keys can be done without repair,
if data file and indexes are empty.
2004-05-06 15:53:01 +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
marko@hundin.mysql.fi
007e6210d4 Merge marko@build.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/marko/j/mysql-4.1
2004-05-06 09:53:50 +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