Commit graph

11088 commits

Author SHA1 Message Date
Sinisa@sinisa.nasamreza.org
eb83bb374a Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2004-02-14 15:08:32 +02:00
Sinisa@sinisa.nasamreza.org
158ba5ab5b Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2004-02-14 15:06:09 +02:00
bell@sanja.is.com.ua
59156e2646 fixed test results broken by sombody 2004-02-14 13:48:54 +02:00
bell@sanja.is.com.ua
7626ab603e Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-limit-4.1
2004-02-14 13:06:04 +02:00
vva@eagle.mysql.r18.ru
50fb56399a Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_2592/mysql-4.1
2004-02-14 02:28:19 +04:00
vva@eagle.mysql.r18.ru
48d4e33328 a little optimization in yylex
(case MY_LEX_USER_VARIABLE_DELIMITER for multichar strings)
and my_mbcharlen
2004-02-14 02:26:27 +04:00
vva@eagle.mysql.r18.ru
bdf696d0a4 fixed bug #2705 "mysqldump --tab extra output" 2004-02-14 01:21:46 +04:00
serg@serg.mylan
01c2ca5b8a Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-02-13 15:30:00 +01:00
serg@serg.mylan
26c7003e37 small optimization 2004-02-13 15:27:58 +01:00
serg@serg.mylan
5914e5705c my_atof is deleted
strtod from mit-threads is restored and cleaned up
2004-02-13 15:27:21 +01:00
monty@mysql.com
fb8f27f017 Always use libtool with "--preserve-dup-deps"
Always use all LOAD DATA options in replication.
Fixed problem in mysqlbinlog where LOAD DATA options could be overwritten.
2004-02-13 16:05:09 +02:00
bar@bar.intranet.mysql.r18.ru
d0b456fead Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into bar.intranet.mysql.r18.ru:/usr/home/bar/mysql-4.1
2004-02-13 18:04:08 +04:00
hf@deer.(none)
345dc4d1ab This line missed in the fix #2208 2004-02-13 18:04:07 +04:00
bar@bar.intranet.mysql.r18.ru
3bdb96d33e Bug #2699 UTF8 breaks primary keys for cols > 85 characters 2004-02-13 17:58:02 +04:00
hf@deer.(none)
32039398ef Fix for #2211 (field->def contains invalid values) 2004-02-13 17:20:56 +04:00
hf@deer.(none)
a052909753 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.2211
2004-02-13 11:57:22 +04:00
hf@deer.(none)
c25fc5c664 Another fix for #2208
previous one had error
2004-02-13 11:56:36 +04:00
bell@sanja.is.com.ua
5865312bb6 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-limit-4.1
2004-02-13 09:03:22 +02:00
lenz@mysql.com
01ca544390 Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
2004-02-12 23:28:57 +01:00
vva@eagle.mysql.r18.ru
dc3f0a21db Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_2898/mysql-4.0
2004-02-13 02:28:56 +04:00
vva@eagle.mysql.r18.ru
da662e9d84 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_2898/mysql-4.0
2004-02-13 02:25:50 +04:00
konstantin@mysql.com
b865fb1cf3 manual merge, bug #2247 2004-02-13 00:50:03 +03:00
bell@sanja.is.com.ua
260ea51ab1 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-limit-4.1
2004-02-12 23:50:03 +02:00
vva@eagle.mysql.r18.ru
c57ca85da5 fixed mistake after merge in mysql-test/r/mysqldump.result 2004-02-13 01:50:02 +04:00
bell@sanja.is.com.ua
5ef05f4284 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-limit-4.1
2004-02-12 22:33:30 +02:00
vva@eagle.mysql.r18.ru
689ee0be98 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_2593/mysql-4.1
2004-02-13 00:33:29 +04:00
vva@eagle.mysql.r18.ru
50076a5d09 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_2593/mysql-4.1
2004-02-13 00:31:39 +04:00
vva@eagle.mysql.r18.ru
13e04a85b7 some optimization in append_identifier (sql/sql_show.cc) 2004-02-13 00:28:00 +04:00
vva@eagle.mysql.r18.ru
5b369431f1 fixed copying of color in SEL_ARG::clone (fixed bug #2968) 2004-02-12 23:45:39 +04:00
lenz@mysql.com
09b90901ad - bumped up version number in configure.in from 4.0.18 -> 4.0.19
- Tagged ChangeSet@1.1733 as mysql-4.0.18
2004-02-12 19:33:06 +01:00
serg@serg.mylan
67fbc4d2b7 make all "artificial" syntax errors to report a place where they take place ("...syntax error ... near ...") 2004-02-12 18:37:15 +01:00
serg@serg.mylan
4680c86bff warning: `link_into_queue' declared inline after being called
warning: `unlink_from_queue' declared inline after being called
let's un-inline them, compiler can usually decide better what should be inlined
2004-02-12 18:35:44 +01:00
lenz@mysql.com
0588ac7736 - Replaced obsolete "Copyright" field with "License" in the RPM spec file 2004-02-12 17:12:08 +01:00
lenz@mysql.com
4e42ac4f9e - fixed broken shellcode 2004-02-12 16:51:52 +01:00
lenz@mysql.com
b8866d929d - always use CXX=gcc (not only when using gcc 3) to avoid a dependency
on libstdc++ and exceptions
2004-02-12 15:53:47 +01:00
Sinisa@sinisa.nasamreza.org
96fe6fda95 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2004-02-12 16:48:33 +02:00
hf@deer.(none)
0ac37473f9 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.1438
2004-02-12 16:50:27 +04:00
hf@deer.(none)
5e4a5cb44c Fix for #1438 (mysql_info always returns 0) 2004-02-12 16:47:57 +04:00
acurtis@pcgem.rdg.cyberkinetica.com
a316e2f9e5 Bug#2703
"MySQL server does not detect if garbage chara at the end of query"

Allow the parser to see the garbage characters.
Garbage should cause the parser to report an error.
2004-02-12 12:01:27 +00:00
Sinisa@sinisa.nasamreza.org
7dc2a11f90 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2004-02-11 19:17:27 +02:00
Sinisa@sinisa.nasamreza.org
125fb04b87 merge fixes 2004-02-11 19:15:02 +02:00
dlenev@mysql.com
8e6a2e98ae Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-bg2248
2004-02-11 16:09:33 +03:00
bar@bar.intranet.mysql.r18.ru
7d361a6c20 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into bar.intranet.mysql.r18.ru:/usr/home/bar/mysql-4.1
2004-02-11 16:55:44 +04:00
bar@bar.intranet.mysql.r18.ru
4e77123079 Bug 2701: Function CHARSET() inconsistency
CONVERT3 was removed, it was for test purposes,
and rather harmful.
2004-02-11 16:53:39 +04:00
hf@deer.(none)
77e9444530 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.2208
2004-02-11 16:36:33 +04:00
hf@deer.(none)
f347208ac9 Addition to the fix for #2208
Made code shorter and more correct
2004-02-11 16:35:56 +04:00
dlenev@mysql.com
d38c4fcad0 Manual merge. 2004-02-11 15:10:54 +03:00
guilhem@mysql.com
590652a1bb Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1
2004-02-11 12:33:25 +01:00
guilhem@gbichot2.local
e450acc71c Fix for BUG#2703
"MySQL server does not detect if garbage chars at the end of query":

Detect garbage chars at the end of the query or at the end of a query
for a prepared statement (which happens if mysql_real_query() or mysql_prepare()
were called with a too big 'length' parameter (bigger than the real intended
length of the query: then we receive a query + garbage characters from the
client). This resulted in garbage chars written into the binlog.
Now instead the client receives something like:
'You have an error in your SQL syntax.  Check the manual that corresponds
to your MySQL server version for the right syntax to use near '!stmt'
at line 1' i.e. the server is pointing at the weird tail of the query
(this '!stmt' are the garbage chars sent by the client).
All tests pass, except mysqldump.test and ctype_utf8.test but they failed
before the patch.
2004-02-11 12:32:47 +01:00
bar@bar.intranet.mysql.r18.ru
251bf4ab85 mysqlimport.c, mysqldump.c, mysqlcheck.c, mysql.cc:
No needs to load charset index if the character set is build-in.
2004-02-11 15:15:39 +04:00