kent@mysql.com/kent-amd64.(none)
226a5c833f
Many files:
...
Changed header to GPL version 2 only
2006-12-23 20:17:15 +01:00
patg@radha.patg.net
2e538b4192
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into radha.patg.net:/Users/patg/mysql-build/mysql-5.1-arch-merge
2006-12-22 08:57:32 -05:00
istruewing@chilla.local
dee46f9100
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2006-12-21 18:41:01 +01:00
msvensson@pilot.mysql.com
045a953909
Merge bk-internal:/home/bk/mysql-5.1-ndb
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-ndb
2006-12-21 17:38:44 +01:00
istruewing@chilla.local
ea353c72a6
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2006-12-21 17:13:38 +01:00
msvensson@pilot.mysql.com
a498886d74
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.1
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-ndb
2006-12-21 15:12:15 +01:00
joerg@trift2.
1341cf1827
Merge trift2.:/MySQL/M50/clone-5.0
...
into trift2.:/MySQL/M51/tmp-5.1
2006-12-21 12:18:28 +01:00
gkodinov/kgeorge@rakia.gmz
a0f48f0f5c
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into rakia.gmz:/home/kgeorge/mysql/autopush/B23578-5.0-opt
2006-12-21 11:50:01 +02:00
tsmith/tim@siva.hindu.god
ab4c0f3b81
Merge siva.hindu.god:/usr/home/tim/m/bk/50-build
...
into siva.hindu.god:/usr/home/tim/m/bk/51-build
2006-12-20 15:46:36 -07:00
joerg@trift2.
7f0cb242bc
Merge trift2.:/MySQL/M50/upward-5.0
...
into trift2.:/MySQL/M51/push-5.1
2006-12-20 19:24:04 +01:00
mskold/marty@linux.site
753f661bc4
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2006-12-20 17:08:05 +01:00
tomas@poseidon.
dd2c9ea102
Bug #21806 : wrong ndb binlog behaviour when cluster disconnects/restarts
...
- latest gci is reinitialized to 0 at reconnect, ndb binlog thread needs to wait until valid gci is retrieved
2006-12-20 15:34:45 +01:00
mskold/marty@mysql.com/linux.site
f55af1eade
ndb_dd_ddl.test, ndb_dd_ddl.result, ha_ndbcluster.cc:
...
bug#24667 After ALTER TABLE operation ndb_dd table becomes regular ndb: disallowed TABLESPACE declaration for STORAGE MEMORY
Makefile:
Rename: storage/ndb/ndbapi-examples/mgmapi_logevent_dual/Makefile -> storage/ndb/ndbapi-examples/mgmapi_logevent2/Makefile
mgmapi_logevent2.cpp:
Rename: storage/ndb/ndbapi-examples/mgmapi_logevent_dual/mgmapi_logevent_dual.cpp -> storage/ndb/ndbapi-examples/mgmapi_logevent_dual/mgmapi_logevent2.cpp
Makefile:
Rename mgmapi_logevent_dual to mgmapi_logevent2
mgmapi_logevent2.cpp:
Rename: storage/ndb/ndbapi-examples/mgmapi_logevent_dual/mgmapi_logevent2.cpp -> storage/ndb/ndbapi-examples/mgmapi_logevent2/mgmapi_logevent2.cpp
2006-12-20 15:15:26 +01:00
mskold/marty@linux.site
226e2be1b1
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2006-12-20 13:36:40 +01:00
joerg@trift2.
d9ff6ef3fa
Merge trift2.:/MySQL/M50/push-5.0
...
into trift2.:/MySQL/M50/clone-5.0
2006-12-20 11:17:31 +01:00
joerg@trift2.
90fc044fc2
Fix silly typos in the disabling of "im_daemon_life_cycle" (bug#24415).
2006-12-20 11:13:16 +01:00
joerg@trift2.
c9572a10c4
Merge mysqldev@production.mysql.com:/data0/mysqldev/my/build-200612151202-5.0.32/mysql-5.0-release
...
into trift2.:/MySQL/M50/clone-5.0
2006-12-20 10:58:16 +01:00
joerg@trift2.
f9802fd47d
Disable test "im_deamon_life_cycle", Bug#24425, see note: [19 Dec 23:17] Trudy Pelzer
2006-12-20 10:54:41 +01:00
df@kahlann.erinye.com
e55331b4ed
Merge dev:my/build-200612151202-5.0.32/mysql-5.0-release
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-release
2006-12-20 09:44:47 +01:00
tsmith/tim@siva.hindu.god
84a0873d05
Merge siva.hindu.god:/usr/home/tim/m/bk/50-24200
...
into siva.hindu.god:/usr/home/tim/m/bk/50-release
2006-12-19 17:43:56 -07:00
tsmith/tim@siva.hindu.god
0d5dc51438
Added innodb_rollback_on_timeout option to restore the 4.1
...
InnoDB timeout behavior (Bug #24200 )
2006-12-19 16:57:51 -07:00
tsmith/tim@siva.hindu.god
2bc45899c0
Bug #24947 : REPEAT function returns NULL when passed a field as the count parameter
...
Handling of large signed/unsigned values was not consistent, so some string functions could return bogus results.
The current fix is to simply patch up the val_str() methods for those string items.
It would be good clean this code up in general, to make similar problems much harder to make. This is left as an exercise for the reader.
2006-12-19 15:54:12 -07:00
mskold/marty@mysql.com/linux.site
3587ee8e4e
bug#24667 After ALTER TABLE operation ndb_dd table becomes regular ndb: ALTER TABLE must specify STORAGE explicitely to change it, + post review changes
2006-12-19 23:20:43 +01:00
istruewing@chilla.local
d17a8096a9
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2006-12-19 17:12:06 +01:00
mskold/marty@mysql.com/linux.site
dab48d5df2
bug#24667 After ALTER TABLE operation ndb_dd table becomes regular ndb: copy tablespace from old table in copying alter table
2006-12-19 15:53:46 +01:00
df@kahlann.erinye.com
cf1fd5427c
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
2006-12-19 15:31:10 +01:00
df@kahlann.erinye.com
6b27694ac8
remove hard-coded socket paths from some tests
2006-12-19 15:10:15 +01:00
skozlov/ksm@mysql.com/virtop.localdomain
74a5079fa0
WL#2862 ndb_sp.test - removed unnecessary line
2006-12-19 16:17:57 +03:00
gkodinov/kgeorge@macbook.gmz
8e0367918c
Bug #23578 : Corruption prevents Optimize table from working properly with a
...
spatial index
While executing OPTIMIZE TABLE on MyISAM tables the server re-creates the
index file(s) in order to sort them physically by the key. This cannot be
done for R-tree indexes as it makes no sense.
The server was not checking the type of the index and was accessing an
R-tree index as if it was a B-tree.
Fixed by preventing sorting the index file if it contains an R-tree index.
2006-12-19 15:04:26 +02:00
patg@radha.patg.net
9fa4590c67
WL# 3031
...
The final testcase needing new error codes. Really.
2006-12-19 08:02:55 -05:00
holyfoot/hf@mysql.com/deer.(none)
76ab2a81df
bug #22451 (Partitions: duplicating results with ENGINE=FEDERATED)
...
As presently PARTITIONS + FEDERATED just doesn't work i added error message
to inform user about that.
Should be enabled again after releted WL's completion.
2006-12-19 16:37:50 +04:00
anozdrin/alik@alik.
ba7a03759b
Fix for BUG#24293: '\Z' token is not handled correctly in views.
...
If SELECT-part of CREATE VIEW statement contains '\Z',
it is not handled correctly.
The problem was in String::print().
Symbol with code 032 (26) is replaced with '\z',
which is not supported by the lexer.
The fix is to replace the symbol with '\Z'.
2006-12-19 15:32:02 +03:00
istruewing@chilla.local
6649a3874f
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2006-12-19 12:41:39 +01:00
istruewing@chilla.local
f3f5eb5cf6
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into chilla.local:/home/mydev/mysql-4.1-axmrg
2006-12-19 10:40:53 +01:00
patg@radha.patg.net
62ee86dbfd
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-arch
...
into radha.patg.net:/Users/patg/mysql-build/mysql-5.1-arch-clean
2006-12-18 21:08:39 -05:00
patg@radha.patg.net
237a9482b9
WL# 3031
...
- Added more test results for hard-coded error numbers
- Fix for windows
2006-12-18 16:39:50 -05:00
baker@bk-internal.mysql.com
b1d173f510
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2006-12-18 17:57:34 +01:00
df@kahlann.erinye.com
5ad288f18b
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
2006-12-18 13:44:57 +01:00
df@kahlann.erinye.com
4a98f36e59
Use a temporary directory for sockets if the socket path becomes too long.
2006-12-18 13:44:21 +01:00
holyfoot/hf@mysql.com/deer.(none)
3f2ef81771
bug #24502 (reorganize partition closes connection)
...
when REORGANIZE creates new partition, no_subparts for that partition
isn't set right (call handler::set_partitions_defaults always returns 1)
Normally the number of subpartitions should be inherited from the
table.
2006-12-18 14:39:23 +04:00
skozlov/ksm@mysql.com/virtop.localdomain
1f10aa10d9
fix for commit 1.2368
2006-12-18 12:52:59 +03:00
skozlov/ksm@mysql.com/virtop.localdomain
4843e335fc
fix for commit 1.2368
2006-12-18 09:46:44 +03:00
skozlov/ksm@mysql.com/virtop.localdomain
5b7c2c91c1
WL#2862
2006-12-17 23:08:04 +03:00
patg@radha.patg.net
2301aff234
WL #3031
...
Yet another test result that needed to be regenerated due to new error
messages. This test only runs via ./mysql-test-run.pl --ps-protocol --mysqld=--binlog-format=row rpl_extraCol_innodb
2006-12-15 09:42:41 -05:00
gkodinov/kgeorge@macbook.gmz
d56d3a6971
Bug #15439 : UDF name case handling forces DELETE FROM mysql.func to remove
...
the UDF
When deleting a user defined function MySQL must remove it from both the
in-memory hash table and the mysql.proc system table.
Finding (and removal therefore) from the internal hash table is case
insensitive (or whatever the default charset is), whereas finding and
removal from the system table is case sensitive.
As a result if you supply a function name that is not in the same character
case to DROP FUNCTION the server will remove the function only from the
in-memory hash table and will keep the row in mysql.proc system table.
This will cause inconsistency between the two structures (that is fixed
only by restarting the server).
Fixed by using the name in the precise case (from the in-memory hash table)
to delete the row in the mysql.proc system table.
2006-12-15 11:38:30 +02:00
mskold/marty@linux.site
8753c50e37
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2006-12-15 09:59:26 +01:00
mskold/marty@linux.site
10f8e9fbb8
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2006-12-15 09:06:15 +01:00
mskold/marty@mysql.com/linux.site
532fe009b8
bug#19956 Problems with VARCHAR primary key and BLOB fields:added test case
2006-12-15 09:03:21 +01:00
patg@radha.patg.net
860c27db19
BUG #25074
...
mysql_upgrade test gives inconsitent results
2006-12-14 10:07:17 -05:00
df@kahlann.erinye.com
02d6bcaae0
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
2006-12-14 13:32:27 +01:00