monty@mysql.com
7d8f8bc77b
Changed prototype of killed_ptr() to make it more portable
...
Applied patches for Netware
2004-05-26 19:12:49 +03:00
monty@mysql.com
2709f91947
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-05-26 02:23:59 +03:00
monty@mysql.com
7c10c0ac00
Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1
2004-05-26 00:02:06 +03:00
monty@mysql.com
92c15122da
Added new header files
2004-05-26 00:01:23 +03:00
joreland@mysql.com
94c0611e6b
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1
2004-05-25 22:31:44 +02:00
joreland@mysql.com
6df7573c74
Bug#3882
2004-05-25 22:24:23 +02:00
monty@mysql.com
390d9898f9
merge with 4.0 to get Netware patches and fixes for libmysqld.dll
2004-05-25 22:54:00 +03:00
monty@mysql.com
2397f7081a
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/tmp/skr99/mysql-4.0
2004-05-25 22:38:43 +03:00
hf@deer.(none)
32ce3dcb4b
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into deer.(none):/home/hf/work/mysql-4.0
2004-05-26 00:38:42 +05:00
hf@deer.(none)
640728a051
Proposed fix for bug #3818 (libmysqld.dll leads to program's crash)
...
configurations added to build the libraries with USE_TLS flag to be
used for libmysqld
2004-05-26 00:27:00 +05:00
monty@mysql.com
96b6f0a686
Remove not needed sql_olap.cc from Makefile.am
2004-05-25 22:08:59 +03:00
monty@mysql.com
ca8dbc24ee
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/tmp/skr99/mysql-4.0
2004-05-25 22:01:50 +03:00
monty@mysql.com
f2e1e3ce4c
Added patches from Novell
2004-05-25 22:00:14 +03:00
marko@hundin.mysql.fi
7ee9540976
InnoDB cleanup and possible bug-fix: Remove srv0que
2004-05-25 20:12:09 +03:00
monty@mysql.com
9b43d595d6
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-05-25 19:51:15 +03:00
konstantin@mysql.com
4eaac5fa56
changed comment for LONG_DATA_COMMAND
2004-05-25 19:52:05 +04:00
monty@mysql.com
472e7e6cb6
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-05-25 16:02:18 +03:00
monty@mysql.com
4c23abc953
Merge with 4.0 to get fixes for project files
2004-05-25 16:01:37 +03:00
monty@mysql.com
03ade8c589
Fixed VC++ project files
2004-05-25 15:53:29 +03:00
bar@bar.intranet.mysql.r18.ru
391d5629f6
Preparation for user-defined Unicode collations:
...
weights data now comes from a static variables
but from the charset structure.
2004-05-25 17:40:20 +05:00
bar@bar.intranet.mysql.r18.ru
d0c761e66b
sql_string.h:
...
Not used code.
,
sql_string.cc:
Not used code.
2004-05-25 16:05:33 +05:00
bar@bar.intranet.mysql.r18.ru
3f8996f88d
1. Some optimization when conversion is not needed.
...
2. One now must pass length argument into append(const char *str, uint length),
length is not calculated internally anymore.
2004-05-25 15:54:03 +05:00
monty@mysql.com
2bcb2d9081
Removed references to BDB and InnoDB from 'classic' release
2004-05-25 13:26:24 +03:00
monty@mysql.com
050ec675db
fixed typos
2004-05-25 13:17:33 +03:00
patg@krsna.patg.net
115e769be2
Merge
2004-05-24 19:06:33 -07:00
patg@krsna.patg.net
775f8042c9
logging_ok:
...
Logging to logging@openlogging.org accepted
Do-compile:
1. Option to ensure that logs are moved and then backed up on each host prior to a build
2. Option to run build with flag "--without-ndbcluster"
2004-05-24 17:20:22 -07:00
monty@mysql.com
2f407809e2
Merge with 4.0 to get typo-fix
2004-05-25 02:57:51 +03:00
monty@mysql.com
0652547c77
Fixed typo
2004-05-25 02:49:43 +03:00
monty@mysql.com
af44187bff
Merge with 4.0 to get fixes for Windows project files
2004-05-25 02:47:25 +03:00
monty@mysql.com
0babddff40
New MYSQL_SERVER_SUFFIX usage (for easier compilation)
...
Update of VC++ project files.
2004-05-25 02:28:44 +03:00
dlenev@brandersnatch.localdomain
f23af5e6a2
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-macosx
2004-05-25 02:31:15 +04:00
dlenev@brandersnatch.localdomain
a5fab72bc4
Fix for sporadically failures of innodb.test on Darwin 7.3
...
which occured because we were not lowering case of file names
for temporary tables altough handler assumes so if
lower_case_table_names==2. Now we are lowering case for them.
2004-05-25 02:30:09 +04:00
konstantin@mysql.com
f207b33a7b
Support for character set conversion in binary protocol: another go
...
after Monty's review.
- Item_param was rewritten.
- it turns out that we can't convert string data to character set of
connection on the fly, because they first should be written to the binary
log.
To support efficient conversion we need to rewrite prepared statements
binlogging code first.
2004-05-25 02:03:49 +04:00
guilhem@mysql.com
912bf99387
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2004-05-24 18:47:49 +02:00
guilhem@mysql.com
50a2d97102
Fix for BUG#3871: a slave must always replicate a statement, even if it examines more than 4G rows,
...
so we set SQL_BIG_SELECTS to 1.
2004-05-24 18:46:49 +02:00
vva@eagle.mysql.r18.ru
1b61cb6d0f
Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into eagle.mysql.r18.ru:/home/vva/work/TASK_ALTER_INFO/mysql-4.1
2004-05-24 21:01:35 +05:00
vva@eagle.mysql.r18.ru
e2488c0378
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
...
into eagle.mysql.r18.ru:/home/vva/work/TASK_ALTER_INFO/mysql-4.1
2004-05-24 20:58:57 +05:00
monty@mysql.com
1acbfeafc6
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-05-24 15:59:22 +03:00
marko@hundin.mysql.fi
86d011dfee
InnoDB cleanup: sync0arr.c: sync_array_cell_print(): Remove unused variable str
2004-05-24 15:43:34 +03:00
monty@mysql.com
eca917b79c
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-05-24 15:00:12 +03:00
dlenev@brandersnatch.localdomain
b6d976e419
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-macosx
2004-05-24 15:48:53 +04:00
dlenev@brandersnatch.localdomain
0e6217e999
Fix for bug which caused temp_table.test fail on Darwin 7.3
...
The code in mysql_create_table() code assumes that if lower_case_names==2 then table alias
should contain unchanged table name, and this was not true for temporary tables which
had 'tmp-table' constant as alias. Now we are using table name as alias for such tables.
2004-05-24 15:48:19 +04:00
monty@mysql.com
56c0258536
After merge fixes
...
Remove compiler warnings
Update windows project files
2004-05-24 14:42:34 +03:00
dlenev@brandersnatch.localdomain
b5b4c88455
Fix of small syntax error - added missing backslash that prevented building of mysqlbinlog.
2004-05-24 14:38:55 +04:00
hf@deer.(none)
7afbe31db4
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.3691
2004-05-24 14:49:47 +05:00
hf@deer.(none)
098d8dd01f
Fix for bug #3691 (libmysqld reports error 2 on CREATE DATABASE
...
but database is created)
handling of CREATE DATABASE errors changed
2004-05-24 12:23:52 +05:00
guilhem@mysql.com
ce1e1f4cb6
mysqlbinlog: new option --to-last-log. This option has effect only if --read-from-remote-server.
...
It causes mysqlbinlog to not stop after the end of the requested binlog, and instead read
until the end of the last binlog of mysqld (beware of endless loops if you pipe this
into the same mysqld).
I.e. it enables back (at customer's request) what we considered (and I still do)
as BUG#3204, but now with an option instead of being the default behaviour.
The default behaviour is still to stop after the end of the requested binlog,
whether --read-from-remote-server or not.
2004-05-23 17:42:12 +02:00
serg@serg.mylan
5b4f809706
Merge bk-internal:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-05-23 14:11:10 +02:00
serg@serg.mylan
41f4f0317f
bug in repair_by_sort of fulltext indexes that contained identical
...
(as of mi_compare_text) words with different lengths.
bug #3835
2004-05-23 14:01:52 +02:00
dlenev@brandersnatch.localdomain
c095ce828e
Fix for bug which caused grant.test fail on darwin7.3. We were converting db and table
...
names to lower case using latin1 instead of utf-8 in sql_acl.cc if lower_case_table_names
was on. Also replaced in other such places system_charset_info with files_charset_info
for consistency.
2004-05-22 23:41:58 +04:00