magnus@neptunus.(none)
6469a109da
Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
...
into neptunus.(none):/home/magnus/mysql/mysql-4.1-ndb
2004-09-30 17:08:49 +02:00
magnus@neptunus.(none)
4faaed98ed
Merge fixes
2004-09-30 16:12:28 +02:00
tomas@poseidon.ndb.mysql.com
148fc3ca7b
added configuration warnings for arbitration and node groups
2004-09-30 14:12:27 +00:00
marko@hundin.mysql.fi
1bd65d7715
InnoDB: implement innodb_max_purge_lag
2004-09-30 15:54:19 +03:00
dlenev@mysql.com
28f933fe10
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dlenev/src/mysql-4.1-bg4302
2004-09-30 16:30:34 +04:00
dlenev@brandersnatch.localdomain
0aa589d099
Final solution for bug# 4302 "Ambiguos order by when renamed column is
...
identical to another in result"
According to SQL standard queries like
"select t1.a as col from t1, t2 order by a" should return an error if
both tables contain field a.
2004-09-30 16:28:17 +04:00
magnus@neptunus.(none)
9e4ba7dac2
WL#1424 Added more advanced test cases for autodiscovery
2004-09-30 14:20:14 +02:00
marko@hundin.mysql.fi
9f92688b64
Made innodb_autoextend_increment accessible as a global variable.
2004-09-30 12:31:41 +03:00
tomas@poseidon.ndb.mysql.com
9bd6a0b977
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge
2004-09-30 08:44:11 +00:00
jan@hundin.mysql.fi
2be1005bcf
Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/jan/mysql-4.1
2004-09-29 08:22:37 +03:00
tomas@poseidon.ndb.mysql.com
caa8bbaeec
cosmetic
2004-09-28 23:42:34 +00:00
tomas@poseidon.ndb.mysql.com
2c50746090
multiple servers for cluster
2004-09-28 23:40:20 +00:00
tomas@poseidon.ndb.mysql.com
03e0606b66
Merge
2004-09-28 19:22:04 +00:00
tomas@poseidon.ndb.mysql.com
be795aefd9
mysql-test-run.sh:
...
test
2004-09-28 19:12:44 +00:00
tomas@poseidon.ndb.mysql.com
d5b47c7933
ha_ndbcluster.cc:
...
testing foce send
2004-09-28 19:11:50 +00:00
konstantin@mysql.com
07700678b0
Some of the recently pushed prepared statements
...
tests were disabled due to failures caused by floating point conversion
issues on optimized builds).
2004-09-28 21:44:42 +04:00
kent@mysql.com
314e4e286e
Merge mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/users/kboortz/daily/work/mysql-4.1-vax
2004-09-28 19:44:41 +02:00
tomas@poseidon.ndb.mysql.com
80b2b102b4
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
2004-09-28 17:44:40 +00:00
tomas@poseidon.ndb.mysql.com
1568b72d9c
ha_ndbcluster.cc:
...
typo
2004-09-28 17:41:58 +00:00
tomas@poseidon.ndb.mysql.com
0a9730beb4
set correct lockmode in all reads...
...
move lockmode from scan operation to operation
added read tuple with lock mode
2004-09-28 17:35:07 +00:00
tomas@poseidon.ndb.mysql.com
20ba684ea6
added 2 masters for ndb tests
2004-09-28 17:04:30 +00:00
kent@mysql.com
f0c44a5cc1
mysql-test-run.sh:
...
Make timer an option
2004-09-28 18:25:57 +02:00
kent@mysql.com
43d3516cc6
Merge mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/users/kboortz/daily/work/mysql-4.1-vax
2004-09-28 16:43:05 +02:00
tomas@poseidon.ndb.mysql.com
00180412d1
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
2004-09-28 14:39:27 +00:00
kent@mysql.com
155e1ec330
client_test.test:
...
Run client_test as a testcase
new file
mysql-test-run.sh:
More clearly report failure if --force, also exit 1
client_test.c:
Use MAXPATHLEN in test_frm_bug()
Renable test cases disabled for running from mysql-test-run
mysqltest.c:
Don't check errno from popen, may not be set
2004-09-28 16:27:50 +02:00
konstantin@mysql.com
dcaba14f7e
Give store_for_compare a more meaningful name, cleanup and comment the
...
call.
2004-09-28 15:29:38 +04:00
tomas@poseidon.ndb.mysql.com
13cb28259f
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
2004-09-28 11:06:42 +00:00
kent@mysql.com
c3fdbf0f73
Merge mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/users/kboortz/daily/work/mysql-4.1-es
2004-09-28 10:34:26 +02:00
mskold@mysql.com
18d5e9b45c
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1-ndb
2004-09-28 10:34:26 +02:00
tomas@poseidon.ndb.mysql.com
459111c487
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
2004-09-28 08:34:25 +00:00
mskold@mysql.com
1b9d0b340d
Adjusted so auto_increment value after bulk insert will be exactly +1 after last (if no parallel inserts)
2004-09-28 09:53:14 +02:00
kent@mysql.com
0841e2c444
mysql-test-run.sh:
...
Embarrassing typo
2004-09-28 09:14:18 +02:00
magnus@shellback.(none)
19787199ec
Correct merge problem
2004-09-28 08:53:21 +02:00
rburnett@build.mysql.com
476705df18
Merge build.mysql.com:/home/bk/mysql-4.0
...
into build.mysql.com:/users/rburnett/mysql-4.0
2004-09-27 23:22:08 +02:00
tomas@poseidon.ndb.mysql.com
8e653fcb04
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
2004-09-27 16:11:58 +00:00
kent@mysql.com
0061da910d
mysql-test-run.sh:
...
Added timing output for each test case.
Added --embedded-server option.
mysqltest.c:
Added 'start_timer', 'end_timer' commands
Makefile.am:
Include mysys/my_getsystime.c to get time function in mysqltest
Many files:
new file
2004-09-27 17:01:26 +02:00
jan@hundin.mysql.fi
7d9766b107
Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/jan/mysql-4.1
2004-09-27 10:46:02 +03:00
tomas@poseidon.ndb.mysql.com
1379567be1
removed init on ConfigRetriever
...
added some debug printouts
some changes in ndbcluster_init to make start of mysqld first work
2004-09-27 00:24:23 +00:00
dlenev@mysql.com
4ff9f1f558
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/dlenev/src/mysql-4.0-bg4131-3
2004-09-27 00:50:29 +04:00
dlenev@mysql.com
263b33e12d
Fix for bug #4131 "TIMESTAMP columns missing minutes and seconds when
...
using GROUP BY"
Now we are setting Field_timestamp::field_length to 19 in open_table()
if we are in new mode (and we are restoring it back when we are coming
back to normal mode). This also should solve potential problems with
some of LOAD DATA INFILE and SELECT * INTO in this mode.
2004-09-27 00:50:00 +04:00
bar@noter.intranet.mysql.r18.ru
010f4242b7
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into noter.intranet.mysql.r18.ru:/root/mysql-4.1
2004-09-26 21:55:17 +05:00
bar@noter.intranet.mysql.r18.ru
29b8c6b1e0
bug #5723 length(varchar utf8 field) returns verying results
2004-09-26 21:52:20 +05:00
magnus@shellback.(none)
e5ff827178
Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
...
into shellback.(none):/home/magnus/mysql/mysql-4.1-ndb
2004-09-26 17:49:02 +02:00
mskold@mysql.com
f29939c453
Setting MODE_NO_AUTO_VALUE_ON_ZERO at copying in copy_data_between_tables
2004-09-26 17:11:28 +02:00
bell@sanja.is.com.ua
75b628b89d
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2004-09-26 17:31:06 +03:00
bell@sanja.is.com.ua
10a081a05a
postreview fix
2004-09-26 17:26:32 +03:00
magnus@shellback.(none)
94b305b226
Merge
2004-09-26 16:21:15 +02:00
magnus@shellback.(none)
059941db21
WL#1424 Updated after review
...
* Changed the implementation of ndbcluster_find_files to be more efficient, using only one mutex lock
* Moved ha_find_files to end of mysql_find_files so that it can be passed the list that we are interested to find.
2004-09-26 16:11:24 +02:00
brian@brian-akers-computer.local
4ed0b1c200
Two cleanups for IRIX build.
2004-09-26 15:58:10 +02:00
hartmut@mysql.com
5c8eb70667
added --without-man option similar to --without-docs
...
(part of BUG#5379)
2004-09-26 15:27:13 +02:00