Commit graph

1584 commits

Author SHA1 Message Date
msvensson@neptunus.(none)
bbff8ade1a Merge neptunus.(none):/home/msvensson/mysql/mysqltest_float_result/my51-mysqltest_float_result
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new
2006-02-07 18:17:57 +01:00
konstantin@mysql.com
e3663e7659 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-02 20:54:07 +03:00
tomas@poseidon.ndb.mysql.com
ce8308a503 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql51
2006-02-02 16:19:49 +01:00
konstantin@mysql.com
92b41ba92a Merge mysql.com:/home/kostja/mysql/tmp_merge
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-02 16:57:34 +03:00
msvensson@neptunus.(none)
5e31bff387 Merge neptunus.(none):/home/msvensson/mysql/mysqltest_float_result/my50-mysqltest_float_result
into  neptunus.(none):/home/msvensson/mysql/mysqltest_float_result/my51-mysqltest_float_result
2006-02-02 11:46:57 +01:00
msvensson@neptunus.(none)
01ddf96930 Convert exponent results for MYSQL_TYPE_FLOAT on Windows 2006-02-02 11:45:37 +01:00
tomas@poseidon.ndb.mysql.com
92ffe8cf0d Bug #16753 DD: mysqldump does not support Cluster Disk Data backups 2006-02-02 10:56:04 +01:00
konstantin@mysql.com
065f8066d5 Merge mysql.com:/home/kostja/mysql/mysql-5.0-for_merge
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-02 12:03:35 +03:00
tomas@poseidon.ndb.mysql.com
8c024b9072 Bug #16753 DD: mysqldump does not support Cluster Disk Data backups 2006-02-02 00:52:58 +01:00
msvensson@neptunus.(none)
87967a48e6 Merge neptunus.(none):/home/msvensson/mysql/mysqltest_float_result/my50-mysqltest_float_result
into  neptunus.(none):/home/msvensson/mysql/mysqltest_float_result/my51-mysqltest_float_result
2006-02-01 15:00:35 +01:00
msvensson@neptunus.(none)
102aa5a79f Use common function 'append_field' to output the value of one field to the result.
Fix for extra zero in exponent of double values on windows.
2006-02-01 11:36:32 +01:00
sasha@asksasha.com
9a7690483a post-merge fix 2006-01-31 05:07:48 -07:00
sasha@asksasha.com
144490850a Merge spachev@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  asksasha.com:/reiser-data/mysql-dev/mysql-5.1-new
2006-01-30 20:58:17 -07:00
sasha@asksasha.com
fdefc7e03d #WL3026 - replace_regex in mysqltest 2006-01-30 20:35:33 -07:00
brian@zim.tangent.org
570bffe8c7 Rename of my_strdup_with_lenght to match the more common "strndup" method. Soo its now my_strndup().
my_stat() gettinng the correct parameter list may be next :)
2006-01-25 19:54:42 -08:00
SergeyV@selena.
b4055d2486 Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  selena.:H:/MYSQL/src/#00000-mysql-5.1
2006-01-20 18:40:02 +03:00
SergeyV@selena.
32e68098a9 Post review updates for win32 port of mysqlslap 2006-01-20 18:20:03 +03:00
paul@snake-hub.snake.net
9d3f0364a4 mysqlslap.c:
Fix incorrect option description.
2006-01-19 12:33:51 -06:00
paul@snake-hub.snake.net
8cefc4ce5b mysqlslap.c:
Put options in standard order: --help first, then lexically.
  Rename --number-of-query to --number-of-queries.
2006-01-18 20:27:07 -06:00
serg@serg.mylan
87f685edef Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2006-01-17 21:12:24 +01:00
msvensson@neptunus.(none)
8b243b3799 Fix for connection not being added to connection pool if "disable_abort_on_error" was used. 2006-01-17 19:02:42 +01:00
serg@serg.mylan
ae3d815b41 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2006-01-16 18:09:04 +01:00
SergeyV@selena.
94b26428c3 Changes to make mysqlslap buildable and runable on win32. 2006-01-16 19:35:01 +03:00
SergeyV@selena.
c0bf54d568 Fixes problem introduced by non-portable thread library definition in client
makefile.am. Instead of adding lpthread directly it is added $CLIENT_THREAD_LIBS,
which is evaluated during configure.
2006-01-16 17:28:24 +03:00
sasha@asksasha.com
aa234851f0 patch for replace_regex in mysqltest 2006-01-13 12:25:51 -07:00
anozdrin@mysql.com
acbacd921f Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/alik/MySQL/devel/5.1-bug15110
2006-01-13 19:46:38 +03:00
tomas@poseidon.ndb.mysql.com
fb52fe5cf5 fix compile error on hp-ux setenv->putenv
print slave port as well
2006-01-13 17:44:37 +01:00
anozdrin@mysql.com
b1705ae5c4 Merge BUG#15110 from 5.0 into 5.1.
Merge mysql.com:/home/alik/MySQL/devel/5.0-bug15110
into  mysql.com:/home/alik/MySQL/devel/5.1-bug15110
2006-01-13 19:09:27 +03:00
tomas@poseidon.ndb.mysql.com
e648a8fe52 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/v7
2006-01-13 03:17:09 +01:00
brian@zim.tangent.org
0f50bfa486 Fixed bug #16167
Added --use-threads option for porting to Windows.
2006-01-12 12:27:25 -08:00
tomas@poseidon.ndb.mysql.com
4b731ddfb4 wl2325 wl2324 2006-01-12 19:51:02 +01:00
brian@zim.tangent.org
ca560db79f Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.tangent.org:/home/brian/mysql/slap-5.1
2006-01-12 09:55:22 -08:00
brian@zim.tangent.org
19dbafc28c Adding a --use-threads options which I believe will allow it to be ported to windows. 2006-01-11 21:30:52 -08:00
msvensson@neptunus.(none)
4b913614fc Merge neptunus.(none):/home/msvensson/mysql/wl2930_fixup/my50-wl2930_fixup
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-01-11 11:24:57 +01:00
msvensson@neptunus.(none)
4bcc1845eb Merge neptunus.(none):/home/msvensson/mysql/wl2930_fixup/my50-wl2930_fixup
into  neptunus.(none):/home/msvensson/mysql/wl2930_fixup/my51-wl2930_fixup
2006-01-11 11:21:23 +01:00
msvensson@neptunus.(none)
f60f757689 Add comments that groups and describes the inits 2006-01-11 11:10:58 +01:00
msvensson@neptunus.(none)
f4ad824df9 Remove obsolete comment 2006-01-11 11:07:17 +01:00
msvensson@neptunus.(none)
2f48e4f1dc Fix problem with strange printout of line numbers, detected on aix52, but existing on all platforms, just being masked by init of vars to zero. 2006-01-11 11:06:26 +01:00
msvensson@neptunus.(none)
d42d399464 Disable code for "let" to assign each column from query to it's own variable 2006-01-11 00:24:57 +01:00
anozdrin@mysql.com
b04b851ef9 Fix for BUG#15110: mysqldump --triggers: does not include DEFINER clause
There are two main idea of this fix:
  - introduce a common function for server and client to split user value
    (<user name>@<host name>) into user name and host name parts;
  - dump DEFINER clause in correct format in mysqldump.
2006-01-11 02:07:40 +03:00
msvensson@neptunus.(none)
4a000ba857 Merge neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930-small_fix
into  neptunus.(none):/home/msvensson/mysql/wl2930/my51-wl2930-integration
2006-01-10 16:00:37 +01:00
msvensson@neptunus.(none)
a09473e652 Fix for crashing mysqltest 2006-01-10 15:56:30 +01:00
msvensson@neptunus.(none)
5a9b31e940 Merge neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930-integration
into  neptunus.(none):/home/msvensson/mysql/wl2930/my51-wl2930-integration
2006-01-10 14:56:46 +01:00
msvensson@neptunus.(none)
b10bed08ce Fix mysqltest crash problem 2006-01-10 14:55:39 +01:00
msvensson@neptunus.(none)
e17d969618 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
into  neptunus.(none):/home/msvensson/mysql/wl2930/my51-wl2930-integration
2006-01-10 08:00:17 +01:00
msvensson@neptunus.(none)
e0d3410a3e Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930-integration
2006-01-09 20:12:18 +01:00
paul@snake-hub.snake.net
da8030ff7a mysqlbinlog.cc:
Put options in standard order: help first, then lexically,
  then variables.
2006-01-04 13:37:59 -06:00
serg@serg.mylan
30c09d6dc0 merged 2006-01-03 18:12:03 +01:00
serg@serg.mylan
14f94dc0ca many warnings (practically safe but annoying) corrected 2006-01-03 17:54:54 +01:00
knielsen@mysql.com
06a49eca23 Fix memory problem: Both the allocation and pointer arithmetics on the
head_sptr array was wrong.
2006-01-03 11:09:18 +01:00