tomas@poseidon.ndb.mysql.com
b9506c2324
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-08-31 13:10:35 +02:00
tomas@poseidon.ndb.mysql.com
6b4170ab10
corrected some erroneous ndb error messages
2005-08-31 13:09:18 +02:00
sergefp@mysql.com
04d75ab6e8
Fix group_min_max.test - myisam may return slightly row count estimate on amd64
2005-08-31 13:23:24 +04:00
ramil@mysql.com
a16da25e06
Merge mysql.com:/usr/home/ram/work/4.1.b9613
...
into mysql.com:/usr/home/ram/work/mysql-5.0
2005-08-31 10:25:00 +05:00
kent@mysql.com
01f3a901a9
configure.in:
...
Changed back to 5.0.13-beta
2005-08-31 03:45:04 +02:00
kent@mysql.com
5f7ce18fb1
mysql-test-run.pl:
...
Put back unused old manager dummy arguments, some scripts use them
2005-08-31 03:38:33 +02:00
kent@mysql.com
85ed1e8da7
Makefile.am:
...
Make dist copy of .imtest files not fail the make target, as there are no files yet
2005-08-31 02:25:28 +02:00
jimw@mysql.com
b5c01d7971
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-08-30 14:36:07 -07:00
evgen@moonbone.local
14d0c25fc5
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into moonbone.local:/work/12489-bug-5.0-mysql
2005-08-31 01:07:19 +04:00
evgen@moonbone.local
dc53ac6d1f
Fix bug #12489 wrongly printed strcmp() function results in creation of broken
...
view.
For Item_func_strcmp print() was not defined and for this class was called
print_op of it's parent class. Because of this strcmp() was printed wrongly
and this results int creation of broken view.
Added function Item_func_strcmp::print() which correctly prints strcmp()
function.
2005-08-31 00:54:41 +04:00
anozdrin@mysql.com
e7305b8cab
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-im-tests-fw
2005-08-31 00:29:29 +04:00
evgen@moonbone.local
6ed7255448
manual merge of bug fix#12537
2005-08-30 23:29:47 +04:00
jimw@mysql.com
513e24be9e
Merge mysql.com:/home/jimw/my/mysql-4.1-12828
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-08-30 12:25:50 -07:00
jimw@mysql.com
bdb2fa360a
Merge mysql.com:/home/jimw/my/mysql-4.1-12757
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-08-30 12:25:15 -07:00
jimw@mysql.com
0dc444ec4e
Fix incorrect spellings of "dropped" in source and tests. (Bug #12828 )
2005-08-30 12:24:37 -07:00
paul@kite-hub.kitebird.com
e55126d04d
Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0
2005-08-30 13:49:46 -05:00
SergeyV@selena.
3fdd500288
Fixes bug #11815 . Convert file path to UNIX format to build correct query
...
string while replicating LOAD DATA INFILE statement.
2005-08-30 22:19:15 +04:00
paul@kite-hub.kitebird.com
dfc55d2142
ha_innodb.cc:
...
Reorder out-of-order status variables
2005-08-30 13:17:50 -05:00
paul@kite-hub.kitebird.com
16e879e837
mysqld.cc:
...
Reorder out-of-order status variables
2005-08-30 13:16:40 -05:00
paul@kite-hub.kitebird.com
939c7c687d
set_var.cc:
...
Reorder out-of-order system variables
2005-08-30 13:15:43 -05:00
brian@zim.(none)
2b0c81c984
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zim.(none):/home/brian/mysql/mysql-5.0
2005-08-30 11:07:48 -07:00
brian@zim.(none)
bd806f786e
Fix for bad merge.
2005-08-30 11:04:23 -07:00
paul@kite-hub.kitebird.com
19af7f8973
Manual merge.
2005-08-30 12:12:12 -05:00
paul@kite-hub.kitebird.com
9cedc58427
Merge kite-hub.kitebird.com:/tmp/merge-4.1
...
into kite-hub.kitebird.com:/tmp/merge-5.0
2005-08-30 12:11:11 -05:00
brian@zim.(none)
3091eb3fa4
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zim.(none):/home/brian/mysql/mysql-5.0
2005-08-30 08:28:55 -07:00
brian@zim.(none)
16e30aaf68
Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into zim.(none):/home/brian/mysql/mysql-4.1
2005-08-30 08:28:34 -07:00
sergefp@mysql.com
f29bebe216
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug12720
2005-08-30 16:34:40 +04:00
ramil@mysql.com
dba11de02a
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/ram/work/4.1.b9613
2005-08-30 17:32:53 +05:00
evgen@moonbone.local
d76f9471cb
Fix bug #12537 UNION produces longtext instead of varchar
...
Item::tmp_table_field_from_field_type() and create_tmp_field_from_item()
was converting string field to blob depending on byte-wise length instead of
character length, which results in converting valid varchar string with
length == 86 to longtext.
Made that functions above take into account max width of character when
converting string fields to blobs.
2005-08-30 16:19:53 +04:00
bar@mysql.com
3ff1acb8db
Bug#12363
...
character_set_results is nullable, but value_ptr returns string "NULL"
set_var.cc:
Create Item_null instead of Item_string for NULL values
variables.result, variables.test:
adding test case
2005-08-30 17:11:59 +05:00
ingo@mysql.com
3e06800b7f
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-5000
2005-08-30 12:35:37 +02:00
sergefp@mysql.com
c9aacbf943
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug12720
2005-08-30 14:15:05 +04:00
timour@mysql.com
309c40012d
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
...
into mysql.com:/home/timka/mysql/src/5.0-bug-12672
2005-08-30 12:50:09 +03:00
osku@127.(none)
e912dabd68
Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into 127.(none):/home/osku/mysql-5.0
2005-08-30 12:39:49 +03:00
osku@127.(none)
0848d8c366
Bug #11946 : Review fixes.
2005-08-30 12:39:20 +03:00
ramil@mysql.com
d9658e9e3c
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/ram/work/4.1.b9613
2005-08-30 14:23:06 +05:00
ingo@mysql.com
941f458e56
Merge mysql.com:/home/mydev/mysql-4.1
...
into mysql.com:/home/mydev/mysql-4.1-4100
2005-08-30 11:09:51 +02:00
timour@mysql.com
32907c421e
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
...
into mysql.com:/home/timka/mysql/src/5.0-bug-12672
2005-08-30 11:52:27 +03:00
ingo@mysql.com
2e5d241b62
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-5000
2005-08-30 10:52:11 +02:00
msvensson@neptunus.(none)
8c125455b2
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/bug12527/my50-bug12527
2005-08-30 10:46:07 +02:00
msvensson@neptunus.(none)
002eb51748
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/bug12527/my41-bug12527
2005-08-30 10:42:41 +02:00
msvensson@neptunus.(none)
bb54b30524
Merge neptunus.(none):/home/msvensson/mysql/bug12527/my41-bug12527
...
into neptunus.(none):/home/msvensson/mysql/bug12527/my50-bug12527
2005-08-30 10:40:50 +02:00
osku@127.(none)
312b161409
Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into 127.(none):/home/osku/mysql-5.0
2005-08-30 10:42:51 +03:00
ramil@mysql.com
00e066e201
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/ram/work/4.1.b9613
2005-08-30 12:33:58 +05:00
jonas@eel.(none)
f1ac96544f
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into eel.(none):/home/jonas/src/mysql-5.0-push
2005-08-30 09:02:04 +02:00
jonas@eel.(none)
280f1849ca
Merge eel.(none):/home/jonas/src/mysql-5.0
...
into eel.(none):/home/jonas/src/mysql-5.0-push
2005-08-30 09:00:23 +02:00
jonas@eel.(none)
d61780999b
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into eel.(none):/home/jonas/src/mysql-4.1-push
2005-08-30 08:59:17 +02:00
jonas@eel.(none)
6461071c12
Merge eel.(none):/home/jonas/src/mysql-4.1
...
into eel.(none):/home/jonas/src/mysql-5.0
2005-08-30 08:58:41 +02:00
jonas@eel.(none)
91086d663c
Merge eel.(none):/home/jonas/src/mysql-4.1
...
into eel.(none):/home/jonas/src/mysql-4.1-push
2005-08-30 08:57:30 +02:00
jonas@eel.(none)
4cc90aaab8
bug#12862 - ndb compile error
...
fix typo
2005-08-30 08:56:46 +02:00
