Commit graph

1849 commits

Author SHA1 Message Date
kent@mysql.com
d60b10d565 mysqlimport.c:
Removed C++ comment, changed types for pthread_create() usage
2006-02-13 20:21:15 +01:00
brian@zim.tangent.org
f76c047305 Made mysqlimport link against mysys so that it could make use of the safe mutex functions. 2006-02-13 04:48:14 -08:00
brian@zim.tangent.org
a33a7e274f Cleanup's from Kostja's review. Plus I added a bit more documentation to the --lock-tables option. If selected it disables threads (since you can't quite do it with threads). 2006-02-13 04:04:53 -08:00
msvensson@neptunus.(none)
e486d81a52 Merge neptunus.(none):/home/msvensson/mysql/bug14013/my50-bug14013
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-13 10:56:45 +01:00
brian@zim.tangent.org
7f3d7af7ae Adding thread support for mysqlimport. You can now specify a number of threads to use and it will thread the loading of the database. Anyone who has had to go through the pain of loading the database will immediatly get the reason for this. 2006-02-13 00:45:59 -08:00
msvensson@neptunus.(none)
5000951ab4 Bug#14013 mysql_stmt_store_result() bombs if a cursor is open
- Add code to 'mysql_stmt_store_result' to allow it to be called on 
   a prepared statement with open server side cursor.
 - Add tests to mysql_client_test that uses 'mysql_stmt_store_result'
2006-02-10 14:50:29 +01:00
aelkin@mysql.com
14ced05e55 BUG#16217 fix partly backported from 5.0. It is different in mysqlbinlog part.
This changeset is assumed to stay in 4.1.
2006-02-10 15:12:27 +02:00
knielsen@mysql.com
abcf6ccebb Changes to make testsuite run in CMake build tree. 2006-02-10 13:29:01 +01:00
msvensson@neptunus.(none)
4217699e56 Bug#17280 mysqltest, --echo sometimes does not expand $variables
- Evaluate all variables in the text before printing it to result file
2006-02-10 12:11:16 +01:00
aelkin@mysql.com
dd2a44c497 BUG#16217 forced to introduce a separate mysql client command to adopt its
internal charset to one associated with currently being handled query. 
To note such a query can come from interactive client either.

There was a discussion within replication team and Monty who's suggestion won.
It avoids straightforward parsing of all `set' queries that could affect client side 
character set. 
According to the idea, mysql client does not parse `set' queries but rather cares of
`charset new_cs_name' command.
This command is generated by mysqlbinlog in form of exclaiming comment (Lars' suggestion)
so that enlightened clients like `mysql' knows what to do with it.

Interactive human can switch between many multi-byte charsets during the session 
providing the command explicitly. 
To note that setting new internal mysql's charset does not
trigger sending any `SET' sql statement to the server.
2006-02-09 16:23:09 +02:00
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)
c9b7317ff9 Merge neptunus.(none):/home/msvensson/mysql/mysqltest_float_result/my50-mysqltest_float_result
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-02 11:47:01 +01: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
jimw@mysql.com
970aa54bd6 Fix mysqldump crash when encountering a VIEW (when used against a
5.0 or later server, obviously). (Bug #16389)
2006-02-01 12:28:39 -08:00
msvensson@neptunus.(none)
df5a947ba7 Merge neptunus.(none):/home/msvensson/mysql/mysqltest_float_result/my50-mysqltest_float_result
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-01 15:02:36 +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
msvensson@neptunus.(none)
b758b690a1 Bug #15302 LOAD DATA FROM MASTER -> Packets out of order (Found: 2, expected 1)
- Change "mysql_create_db" to not call "send_ok" if in silent mode i.e. called from "load_master_data"
 - Change mysqltest to detect when there aren't as many warnings available as was reported.
2006-01-31 12:47:22 +01: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