serg@serg.mylan
736530afc8
merged
2005-01-24 21:30:21 +01:00
patg@patrick-galbraiths-computer.local
d6727ff70f
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into patrick-galbraiths-computer.local:/Users/patg/mysql-5.0
2005-01-24 11:31:21 -08:00
serg@serg.mylan
c33f1b6e63
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-01-24 19:45:15 +01:00
serg@serg.mylan
c76405a7ee
merged
2005-01-24 19:41:42 +01:00
ingo@mysql.com
793d9bccfd
Merge mysql.com:/home/mydev/mysql-4.1
...
into mysql.com:/home/mydev/mysql-4.1-4100
2005-01-24 19:23:53 +01:00
tomas@poseidon.ndb.mysql.com
9ec1fda2cf
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-01-24 19:15:44 +01:00
kent@mysql.com
67d246ac2f
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-01-24 16:57:57 +01:00
kent@mysql.com
777595bd61
mysql_client_test.test, mysql-test-run.sh:
...
Let MYSQL_CLIENT_TEST be set with command line from mysql-test-run script
mysql-test-run.sh:
Renamed client_test to mysql_client_test
Support --embedded-server test on installed server
mysql_client_test.test:
Renamed client_test to mysql_client_test
Use env var CLIENT_TEST with full name, it differs when run with --embedded-server
Rename: mysql-test/t/client_test.test -> mysql-test/t/mysql_client_test.test
2005-01-24 16:56:17 +01:00
bell@sanja.is.com.ua
6d71acf01e
fixed way of forward reference detection to support literal constant (BUG#8025)
2005-01-24 17:17:19 +02:00
serg@serg.mylan
79240013b2
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-01-24 15:50:13 +01:00
bell@sanja.is.com.ua
2371c992de
check that row elements have the same dimention that SELECT list elements in comporison between rows and subqueries added (BUG#8022)
2005-01-24 15:56:57 +02:00
bell@sanja.is.com.ua
76ae5caca0
fixed column number fetchinmg for subqueries. (BUG#8020)
...
fixed cols() method call (it have to be called only after fix_fields())
2005-01-24 14:25:44 +02:00
tomas@poseidon.ndb.mysql.com
eba78e5ef6
ndb_restore.result, mysql-test-run.sh:
...
added ndb_restore test
ndb_restore.result, ndb_restore.test:
new file
2005-01-24 13:06:27 +01:00
ingo@mysql.com
c4a0eb142b
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-5000
2005-01-24 10:48:52 +01:00
ingo@mysql.com
47c4009149
Merge mysql.com:/home/mydev/mysql-4.1
...
into mysql.com:/home/mydev/mysql-4.1-4100
2005-01-24 10:47:52 +01:00
tomas@poseidon.ndb.mysql.com
a551510cfd
mysql-test-run.sh:
...
backported access to ndb_mgm from 5.0
2005-01-24 10:47:51 +01:00
ingo@mysql.com
5f23207d95
Merge mysql.com:/home/mydev/mysql-4.0
...
into mysql.com:/home/mydev/mysql-4.0-4000
2005-01-24 10:08:45 +01:00
bell@sanja.is.com.ua
5e36e83164
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2005-01-23 21:58:24 +02:00
igor@rurik.mysql.com
14eceb4b98
Manual merge
2005-01-22 03:12:44 -08:00
igor@rurik.mysql.com
0b61a16fd2
Merge rurik.mysql.com:/home/igor/dev/mysql-4.0-0
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-01-22 02:42:54 -08:00
igor@rurik.mysql.com
8527f256c0
select_found.result, select_found.test:
...
Added a test case for bug #7945 .
sql_select.cc:
Fixed bug #7945 . If DISTINCT is used only with constants
in a query with GROUP BY, we can apply an optimization
that set LIMIT to 1 only in the case when there is
no SQL_CALC_FOUND_ROWS.
2005-01-22 02:40:27 -08:00
tomas@poseidon.ndb.mysql.com
bca11d8729
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-01-21 17:50:58 +01:00
ingo@mysql.com
c7563247d1
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-5000
2005-01-21 14:57:57 +01:00
bar@mysql.com
ecd8252e56
merge bug##7943: Wrong prefix lengths reported on UTF-8 columns
2005-01-21 16:55:17 +04:00
bell@sanja.is.com.ua
938acb3291
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2005-01-21 14:54:27 +02:00
bar@mysql.com
2f6e0864ad
Bug#7943: Wrong prefix lengths reported on UTF-8 columns
...
SHOW KEYS FROM t1 now displays number of characters in Sub_part,
not number of bytes, to be compatible with SHOW CREATE TABLE.
2005-01-21 16:49:20 +04:00
tomas@poseidon.ndb.mysql.com
a5b0a5352a
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-01-21 12:18:24 +01:00
tomas@poseidon.ndb.mysql.com
0735fc89a4
enabled adding option to ndb_mgm in mysql test run
2005-01-21 12:15:14 +01:00
ingo@mysql.com
da091f2c22
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-5000
2005-01-21 12:14:16 +01:00
ingo@mysql.com
565c2fdb6c
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-5000
2005-01-21 09:53:31 +01:00
ram@gw.mysql.r18.ru
84f0b1eeee
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into gw.mysql.r18.ru:/usr/home/ram/work/5.0.b6999
2005-01-21 12:10:19 +04:00
joreland@mysql.com
b3a6628599
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0
2005-01-21 08:41:39 +01:00
tomas@poseidon.ndb.mysql.com
72dc9ff915
moved START_AND_EXIT check so it can actually be used
...
fix as not to overwrite previoulsy set flags in configure
2005-01-21 08:41:38 +01:00
patg@pc248.lfp.kcls.org
1da60b9f45
-Added quote_data and needs_quotes (moved from federated handler.
...
-New tests and results
logging_ok:
Logging to logging@openlogging.org accepted
ha_federated.h:
removed quote_data and type_quote (now in the Field class)
ha_federated.cc:
moved quote_data and type_quote to field class
field.h:
new methods quote_data and needs_quotes declared
field.cc:
new field class methods quote_data and needs_quotes (per Monty's request)
federated.test:
more tests, joins, index tests
have_federated_db.require:
new name of federated system var
federated.result:
new test results for federated handler
have_federated_db.inc:
changed name of variable in test due to change in vars
sql_analyse.cc:
over-ridden append_escaped to take (String *, char *, uint) per requirements of 'create_where_from_key' method in federated handler.
mysql_priv.h:
define over-ridden append_escaped to take arguments from 'create_where_from_key' method in federated handler
ha_federated.cc:
implemented "create_where_from_key" to deal properly with two-byte prefix and multi keys. Initial testing shows it works, but I still need to move quoting to field class and also look at changes per Segei's suggestions.
2005-01-20 18:36:40 -08:00
tomas@poseidon.ndb.mysql.com
b1877967d1
ndb_autodiscover.result, ndb_autodiscover.test:
...
removed this since it easily gives errors if previous tests fail
2005-01-20 21:26:58 +01:00
joreland@mysql.com
abd6afa9af
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0
2005-01-20 20:51:20 +01:00
tomas@poseidon.ndb.mysql.com
39c9f50ac9
mysql-test-run.sh:
...
skip ndbcluster start failure if --force given
2005-01-20 20:27:17 +01:00
joreland@mysql.com
de2bbb3018
Merge mysql.com:/home/jonas/src/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-5.0
2005-01-20 19:54:17 +01:00
ingo@mysql.com
9bf63b1436
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-5000
2005-01-20 16:41:09 +01:00
ingo@mysql.com
f5d36349a9
Merge mysql.com:/home/mydev/mysql-4.1
...
into mysql.com:/home/mydev/mysql-4.1-4100
2005-01-20 16:20:34 +01:00
ingo@mysql.com
d39d19005f
Merge mysql.com:/home/mydev/mysql-4.0
...
into mysql.com:/home/mydev/mysql-4.0-4000
2005-01-20 16:17:33 +01:00
tomas@poseidon.ndb.mysql.com
86197400bc
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2005-01-20 15:37:27 +01:00
tomas@poseidon.ndb.mysql.com
dd6958eb20
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-01-20 15:21:00 +01:00
kent@mysql.com
7885d70b88
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-01-20 14:16:29 +01:00
tomas@poseidon.ndb.mysql.com
ac53ecce1c
added variable NDB_MGM to be able to run the management client in tests
...
added testcase for Bug#8035
added option to wait for not-started
Bug#8035
2005-01-20 13:45:42 +01:00
bar@mysql.com
6b5c7c7290
Merge mysql.com:/usr/home/bar/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-5.0
2005-01-20 16:08:27 +04:00
bell@sanja.is.com.ua
3bd203d3f6
fixed problem with distinct select with grouping and subqueries (BUG#7946)
2005-01-20 13:56:22 +02:00
kent@mysql.com
f4cdb433c6
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-01-20 12:40:42 +01:00
bar@mysql.com
ca48cfbfcc
item_cmpfunc.cc:
...
Bug#7834 Illegal mix of collations in IN operator
IN was the first function supporting
character set convertion.
agg_arg_charsets() was written afterwards,
which is more flexible.
Now IN just reuses this function.
2005-01-20 15:38:56 +04:00
ram@gw.mysql.r18.ru
dfe8132fb4
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into gw.mysql.r18.ru:/usr/home/ram/work/5.0.b6999
2005-01-20 14:22:02 +04:00