Commit graph

16762 commits

Author SHA1 Message Date
tomas@poseidon.ndb.mysql.com
681b6e9562 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-11-07 09:43:09 +00:00
tomas@poseidon.ndb.mysql.com
11d7ba905c wrong copyright 2004-11-07 09:42:27 +00:00
kent@mysql.com
f9715d06dc mysql_test_run_new.c:
Included header fnmatch.h on Unix
  Changed C++ comments to C comments
  Corrected indentation of code written on Windows
  Split up lines to fit into 80 columns
  Initiated some variables to avoid warnings
  Added __attribute__((unused)) to unused function parameters
  Replace tab characters with space
  Put space after 'for', 'while' etc
  Added value to 'return' from non void function removef()
  On Unix strlwr() was incorrectly declared and a no op,
  replaced it with a macro that does nothing
  Split several statements on the same line
  Other minor changes to conform to coding standard
2004-11-06 14:01:27 +01:00
bell@sanja.is.com.ua
7eae926e26 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-view-5.0
2004-11-06 12:46:46 +02:00
brian@avenger.(none)
aaac120d72 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
into avenger.(none):/export/brian/mysql/archive-5.0
2004-11-05 23:17:48 -08:00
brian@avenger.(none)
73addb4de3 Remove build errors introduced by 5.0 changes.
Removed duplicate code where defaults in handler.h will work just as well.
2004-11-05 22:49:15 -08:00
igor@rurik.mysql.com
ca355c8a46 join_outer.result, join_outer.test:
Added cases for bugs #6307 and #6460.
sql_select.cc:
  Fixed the problem of bug reports #6307 and #6460.
  The reported wrong result sets were due to the fact that
  the added call of the fix_fields method for the built
  AND condition that joined WHERE and ON conditions
  broke ON expression, as it removed extra AND levels
  in the built condition. 
  It looks like that no attributes of the built condition
  are needed, so we don't have to call fix_fields here.
2004-11-05 22:15:24 -08:00
tomas@poseidon.ndb.mysql.com
898541e4b5 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-11-05 23:59:38 +00:00
tomas@poseidon.ndb.mysql.com
362febbf29 removed a bunch of "dead" files from the ndb src tree 2004-11-05 23:59:06 +00:00
jani@a193-229-222-105.elisa-laajakaista.fi
bfdf57ef31 Fixed a typo that caused segmentation fault when using
--defaults-extra-file option.
2004-11-05 23:58:30 +02:00
konstantin@mysql.com
97a5fe8e65 Fix the client_test failure (due to failing cursors tests after the merge). 2004-11-05 22:39:19 +03:00
konstantin@mysql.com
fe5889dee5 A fix and test case for Bug#6102 "Server crash with prepared statement
and blank after function name".
Crop fruits of copy-paste programming: pre-caching of stored functions
wasn't performed for prepared statements just because implementation
of prepared statements is done as an add-on to the main execution flow, 
and the preload was originally implemented for main execution branch
only (mysql_execute_command).
2004-11-05 22:02:07 +03:00
konstantin@mysql.com
eeeb342b3c A fix and test case for the bug reported by Reggie: if character set
of client equals to character set of connection, possibly required
conversion to character set of column is not performed
(prepared statements, data is supplied using placeholders).
2004-11-05 21:02:12 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
862978dde5 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.0
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0
2004-11-05 18:59:40 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
083a2f5613 Changed default.c so that it now checks for my.ini and then
my.cnf from the default directories.
2004-11-05 18:59:19 +02:00
bar@mysql.com
954f88db9f mysqldump.c:
in 4.1: Dump only VARBINARY() in hex,
  while VARCHAR() COLLATE xxx_bin as a string.
2004-11-05 20:35:56 +04:00
bar@mysql.com
b911810af7 mysqldump.c:
Dump VARCHAR(n) BINARY in HEX if --hex-blob too.
2004-11-05 20:33:56 +04:00
bell@sanja.is.com.ua
064b02203f new lock for multiupdate:
- open and create derived tables
- detect which tables should be locked for write
- lock and fill derived tables
some unitialized variables fixed
2004-11-05 17:29:47 +02:00
joerg@mysql.com
16b280b11d Ensure that even the (relatively new) "mysql-test/Makefile.am" gets into the source tar-ball. 2004-11-05 15:50:53 +01:00
joerg@mysql.com
5e2b6e3035 Change "Bootstrap" so that it will not fail on BK source trees of other versions;
this is important because this 4.0 "Bootstrap" is the one generally used on host "build".
2004-11-05 15:22:03 +01:00
timour@mysql.com
660e1236b5 WL#1972 "Evaluate HAVING before SELECT"
- more tests, post-review changes, bug-fixes, simplifications, and improved comments
2004-11-05 15:48:44 +02:00
joerg@mysql.com
e93450d442 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1
2004-11-05 11:22:33 +01:00
bar@mysql.com
813b2f3357 user_var.result, user_var.test:
My previous change that "set @a=NULL" doesn't change charset
  fixed 'Bug #6321' as well. Prove with a new test that
  FIELD(<uservariable content NULL>, ...) now works fine too.
2004-11-05 14:07:12 +04:00
joerg@mysql.com
f7553251dc The new "Bootstrap" pushed in 4.0 with changeset "joerg:1.2057" is used for building
_all_ versions. It tries to remove "Docs/Images/Makefile*" as part of the actions to
correct bug number 6350. If the source tree does not contain a dummy file matching
that pattern, this "rm" will fail, and so "Bootstrap" will fail.
The "Makefile.am" introduced with this changeset is identical to the one that will
arrive here when "joerg:1.2057" is propagated from 4.0,
so this separate introduction here is just to allow "Bootstraps" in the meantime.
2004-11-05 10:42:37 +01:00
bar@mysql.com
5543f312b0 As it is wrong and confusing to associate any
character set with NULL, @a should be latin2
after this query sequence:

   SET @a=_latin2'string';
   SET @a=NULL;

I.e. the second query should not change the charset
to the current default value, but should keep the
original value assigned during the first query.
In order to do it, we don't copy charset
from the argument if the argument is NULL
and the variable has previously been initialized.
2004-11-05 13:37:36 +04:00
joerg@mysql.com
ff1e31532a The new "Bootstrap" pushed in 4.0 with changeset "joerg:1.2057" is used for building
_all_ versions. It tries to remove "Docs/Images/Makefile*" as part of the actions to
correct bug number 6350. If the source tree does not contain a dummy file matching
that pattern, this "rm" will fail, and so "Bootstrap" will fail.
The "Makefile.am" introduced with this changeset is identical to the one that will
arrive in the 5.0 tree when "joerg:1.2057" is propagated from 4.0 via 4.1 to here,
so this separate introduction here is just to allow "Bootstraps" in the meantime.
2004-11-05 10:23:23 +01:00
mskold@mysql.com
4fa3d8eb0d Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-11-05 08:52:44 +01:00
igor@rurik.mysql.com
c3293b875b Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
into rurik.mysql.com:/home/igor/mysql-4.1
2004-11-04 22:16:00 -08:00
bar@mysql.com
ae5c3ae0ba ps.result, ctype_ucs.result, ctype_ucs.test, ps.test:
Bug #6351 make test failure "Unknown character set"
  UCS2 related tests were moved into ctype_ucs.
2004-11-05 10:12:33 +04:00
bar@mysql.com
630ea6e63c client_priv.h:
Backport --hex-blob to 4.0
2004-11-05 09:23:53 +04:00
bar@mysql.com
0a375d4b72 libmysql.c:
After-merge clean-up
2004-11-05 09:07:07 +04:00
bar@mysql.com
d8503ba39e Merge 2004-11-05 09:05:59 +04:00
bar@mysql.com
e9c50b8773 libmysql.def, libmysql.c:
Clean-ups
2004-11-05 09:00:04 +04:00
bar@mysql.com
7253d4c4f6 mysqldump.c:
- 'mysqldump --help' comment that --xeh-blob
    doesn't work with --extended-inserts was removed.
    It does work now. Thanks to Lachlan
    who noticed this wrong help message.
  - Switched to use the recently introduced
    mysql_hex_string() instead of slow sprintf().
    Thanks to Sinisa for the idea.
  - 'mysqldump --hex-blob' dumps in HEX not only
    BLOBs but also BINARY(x) columns. 
    Thanks to Paul.
2004-11-05 08:54:52 +04:00
bar@mysql.com
27fcb9f6af libmysql.def, libmysql.c:
Minor clean-ups
2004-11-05 08:44:40 +04:00
igor@rurik.mysql.com
951927ec30 Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2004-11-04 20:43:26 -08:00
igor@rurik.mysql.com
4df18b1aae func_in.result, func_in.test:
Added a case for bug #6365.
item_cmpfunc.cc:
  Fixed bug #6365 : Server crashed when list of values
  in IN predicate contains NULL while the tested field is
  of the character type and not of the default set;
  e.g. when f in 'f IN (NULL,'aa') belongs to binary
  character set, while the default character set is latin1.
2004-11-04 20:39:52 -08:00
bar@mysql.com
1a6889bb5c mysqladmin.c:
Missing initialized for "lengths" element.
  ,
2004-11-05 08:08:38 +04:00
konstantin@mysql.com
c1dc0975c6 A test case for Bug#4172 "Floating point conversion looses precision
(prepared staements)": adding the test case to close the bug
(the bug was fixed along with other conversion incompatibilities 
in 4.1.7)
2004-11-05 00:45:41 +03:00
joreland@mysql.com
b593c0cc8e Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2004-11-04 21:15:03 +01:00
brian@avenger.(none)
2fd0ae5178 Merge bk://mysql.bkbits.net/mysql-5.0
into avenger.(none):/export/brian/mysql/mysql-5.0
2004-11-04 10:29:49 -08:00
konstantin@mysql.com
3196273590 Fix for Bug#6408 "configure checking for custom zlib fails because
code check is wrong".
2004-11-04 21:26:36 +03:00
guilhem@mysql.com
76f51406ce Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2004-11-04 19:19:51 +01:00
guilhem@mysql.com
1869cd9f83 Fix for BUG##5714 "Insert into MyISAM table and select ... for update]":
the fact that the transaction log is empty does not mean we're not in a transaction
(it could be BEGIN; SELECT * FOR UPDATE FROM ibtable: then we don't want to commit now, even if
the statement is a MyISAM update).
With a testcase.
2004-11-04 19:19:23 +01:00
tim@siva.hindu.god
a20399c0ae Merge siva.hindu.god:/opt/home/tim/m/40/bk
into siva.hindu.god:/opt/home/tim/m/40/a
2004-11-04 10:29:24 -07:00
wax@mysql.com
aa391cebb2 Merge mysql.com:/home/wax/mysql/mysql-4.1
into mysql.com:/home/wax/mysql/mysql-4.1mysqltest
2004-11-04 21:25:52 +05:00
wax@kishkin.ru
ff32313dd5 autocommit and changed name mysql_test_run_new 2004-11-04 21:25:51 +05:00
wax@mysql.com
26f3926efd autocommit 2004-11-04 21:25:50 +05:00
wax@mysql.com
bf2685a690 autocommit 2004-11-04 21:25:49 +05:00
marko@hundin.mysql.fi
21b9be3a19 Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/marko/j/mysql-4.1
2004-11-04 18:25:48 +02:00