jimw@mysql.com
09aaba03cf
Merge mysql.com:/home/jimw/my/mysql-4.1-7887
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-01-24 12:47:19 -08:00
jimw@mysql.com
fa1098618e
Set lower_case_file_system when it is being tested to check if
...
lower_case_tables_names=2 is sensible. Related to Bug #7887 .
2005-01-24 12:31:14 -08:00
serg@serg.mylan
736530afc8
merged
2005-01-24 21:30:21 +01: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
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
serg@serg.mylan
1ca9d6497b
remove the entry from the list, before freeing
2005-01-24 18:38:46 +01:00
serg@serg.mylan
24468e48f3
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-01-24 18:06:01 +01:00
kent@mysql.com
878e99e65d
my_global.h:
...
Bug#7145 Added cast to doublestore() and ARM
2005-01-24 17:10:03 +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
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
serg@serg.mylan
67ba2e367a
fixes/cleanups according to Coverity report
2005-01-24 15:48:25 +01:00
jan@hundin.mysql.fi
620116a7e1
Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/jan/mysql-4.1
2005-01-24 14:23:28 +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
tomas@poseidon.ndb.mysql.com
5f06976ba8
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2005-01-24 10:52:28 +01:00
tomas@poseidon.ndb.mysql.com
0a59f6aad0
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-01-24 10:48:51 +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
tomas@poseidon.ndb.mysql.com
58be9694dd
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2005-01-24 10:37:54 +01:00
tomas@poseidon.ndb.mysql.com
aafc5e7fcd
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-01-24 10:34:55 +01:00
tomas@poseidon.ndb.mysql.com
241a18585b
remmoved inline in NdbRecAttr methods including memcpy
2005-01-24 10:33:39 +01:00
tomas@poseidon.ndb.mysql.com
618934cf27
use select for sleep instead of nanosleep for portability reasons
...
added make of mgmapi_logevent_example
2005-01-24 10:03:00 +01:00
jan@hundin.mysql.fi
a37a3cd69c
Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/jan/mysql-4.1
2005-01-24 09:55:41 +02:00
joreland@mysql.com
e33633c1b7
Merge mysql.com:/home/jonas/src/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-23 20:15:02 +01:00
joreland@mysql.com
1e25035419
ndb - Add includes to test prg as memcpy is introduced in NdbRecAttr
2005-01-23 20:13:42 +01:00
joreland@mysql.com
3133592cbc
Merge mysql.com:/home/jonas/src/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-23 17:48:58 +01:00
joreland@mysql.com
4cfa6aa284
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-23 17:48:05 +01:00
tomas@poseidon.ndb.mysql.com
0a0867168b
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-01-23 12:13:34 +01:00
tomas@poseidon.ndb.mysql.com
e38381f241
backported from 5.0 extra option to ndb_waiter
2005-01-23 12:12:50 +01:00
kent@mysql.com
f15c329005
Merge mysqldev@production.mysql.com:/data0/mysqldev/my/mysql-4.1-lenz
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-01-22 19:33:04 +01: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
heikki@hundin.mysql.fi
944c29ce4a
Merge hundin.mysql.fi:/home/heikki/mysql-4.1
...
into hundin.mysql.fi:/home/heikki/mysql-5.0
2005-01-22 04:49:35 +02:00
heikki@hundin.mysql.fi
e30b5f86e5
fil0fil.c:
...
Fix a race condition that could cause the assertion space->n_pending_flushes == 0 to fail in fil0fil.c, in fil_space_free(), in DROP TABLE or in ALTER TABLE
2005-01-22 04:45:22 +02:00
heikki@hundin.mysql.fi
a0263e8661
log0recv.c:
...
Remove superfluous fprintf about log record application in InnoDB startup
2005-01-21 23:47:44 +02:00
heikki@hundin.mysql.fi
3df04944e4
fil0fil.c:
...
Add a missing newline to an error print
2005-01-21 23:36:00 +02:00
heikki@hundin.mysql.fi
324e5688b4
dict0load.c:
...
Fix a compilation error reported by Paul Dubois; I forgot to compile 5.0 after the merge
os0thread.c:
test
2005-01-21 22:03:08 +02:00
tomas@poseidon.ndb.mysql.com
7a8d763305
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-01-21 19:40:30 +01:00
tomas@poseidon.ndb.mysql.com
61b50b577e
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-01-21 19:33:54 +01:00
tomas@poseidon.ndb.mysql.com
04a23e22d4
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-01-21 18:07:22 +01:00
timour@mysql.com
b04675c89a
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
...
into mysql.com:/home/timka/mysql/src/5.0-dbg
2005-01-21 19:02:12 +02:00
tomas@poseidon.ndb.mysql.com
e291e98d2d
Bug#8070
...
corrected possible unalignment in NdbRecAttr access methods
2005-01-21 17:57:44 +01:00
timour@mysql.com
75195cff33
Merge tkatchaounov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/timka/mysql/src/4.1-virgin
2005-01-21 18:56:18 +02: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
heikki@hundin.mysql.fi
d1d68b1413
Merge hundin.mysql.fi:/home/heikki/mysql-4.1
...
into hundin.mysql.fi:/home/heikki/mysql-5.0
2005-01-21 18:16:02 +02:00
heikki@hundin.mysql.fi
d6706798d2
fil0fil.c:
...
Fix bug #8021 :Windows error number 87 with multiple tablespaces after mysqld restart; still has to be tested on Windows that this now works
2005-01-21 17:59:23 +02:00
heikki@hundin.mysql.fi
9a03676b69
dict0dict.c:
...
Fix bug #7831 : ALTER TABLE ... ADD CONSTRAINT PRIMARY KEY ... complained about bad foreign key definition
2005-01-21 17:54:50 +02:00
timour@mysql.com
e19c6a856d
Manual merge of the fix for BUG#4285 from 4.1
2005-01-21 17:41:11 +02:00
timour@mysql.com
36f1e91b69
Merge of fix for BUG#4258 from 4.1.
...
Needs additional manual merge.
2005-01-21 17:38:36 +02:00