cmiller@zippy.(none)
a1e78b3d36
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zippy.(none):/home/cmiller/work/mysql/mysql-5.0__ready
2006-04-11 16:39:09 -04:00
msvensson@neptunus.(none)
0d98d97170
Remove #if 0
2006-04-07 14:21:00 +02:00
msvensson@neptunus.(none)
1452892816
Incorporate a patch to write a timestamp for every new line of the test that is executed.
...
This makes it possible make a graph (with for example gnuplot) of a test run and spot where most time is consumed.
Add the new code inside an "#if 0" until it's portable.
2006-04-05 11:47:12 +02:00
cmiller@zippy.(none)
0db6176bfc
Bug#18265: mysql client: No longer right-justifies numeric columns
...
Also fixes a new bug for which "NULL" wasn't printed (because the
data it represents has length zero). (Discovered my Paul DuBois.)
2006-04-04 17:35:07 -04:00
ian@zim.(none)
a66aace3e9
Fix for bug #16855
2006-03-27 17:45:06 -08:00
msvensson@shellback.(none)
8f1ed3c463
Dump result to .log file at test failure
2006-03-23 21:48:31 +01:00
msvensson@shellback.(none)
4602e426dc
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0
2006-03-23 18:58:53 +01:00
msvensson@shellback.(none)
5ebda1d2f6
Update after merge, function renamed
2006-03-23 16:21:20 +01:00
msvensson@shellback.(none)
e6bf664c62
Merge shellback.(none):/home/msvensson/mysql/mysqltestrun_pl/my50-mysqltestrun_pl
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0
2006-03-23 15:30:21 +01:00
msvensson@shellback.(none)
5ec7aa3aaf
Dump reject file before mysqltest in 'die'
...
Makes it easier to see what happened before the failure
2006-03-23 15:04:46 +01:00
msvensson@neptunus.(none)
0811648e31
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/bug11835/my50-bug11835
2006-03-20 21:35:05 +01:00
anozdrin@mysql.com
41423cd05c
Fix version of DEFINER-clause in mysqldump.
...
Now DEFINER-clause in stored routines is expected to appear
in 5.0.20 release, not in 5.0.19. as it was supposed before.
2006-03-10 22:23:04 +03:00
msvensson@neptunus.(none)
31804060aa
Improve mysqltest
...
Add comment's for enable/disable_query_log and enable/disable_result_log
Update comment for "check_result"
Add check in "handle_error" that detects if the server crashed when running a "require" query to check if a certain feature is available
2006-03-10 12:08:53 +01:00
anozdrin@mysql.com
d5e641fec7
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-rt
2006-03-07 21:47:41 +03:00
msvensson@neptunus.(none)
48bef14042
Fix missing call to init_tmp_sh_file
2006-03-07 14:34:20 +01:00
anozdrin@mysql.com
d9d4dc5ef8
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-rt
2006-03-07 14:28:09 +03:00
msvensson@neptunus.(none)
647a940649
Enable ifdef for windows specific functions
2006-03-07 08:57:57 +01:00
msvensson@neptunus.(none)
456b2d6b14
Improve error message for faulty usage of "inc" and "dec"
2006-03-07 07:50:04 +01:00
msvensson@neptunus.(none)
f2ce7dc787
Fix typo
2006-03-06 22:18:04 +01:00
msvensson@neptunus.(none)
0cc14310e8
Remove unused var
...
Reduce code
2006-03-06 22:08:34 +01:00
msvensson@neptunus.(none)
a336f48552
Win fixes
...
- Use tmp sh file both in system and popen
2006-03-06 22:05:39 +01:00
msvensson@neptunus.(none)
3f935b2777
Merge bk-internal:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-03-06 12:00:51 +01:00
dlenev@mysql.com
0fb4a6645e
Merge mysql.com:/home/dlenev/src/mysql-5.0-bg17866-2
...
into mysql.com:/home/dlenev/src/mysql-5.0-merges
2006-03-04 23:58:48 +03:00
cmiller@zippy.(none)
599c710a5b
Bug#16859 involves truncating column data at NUL characters. Instead, the
...
client will now substitute spaces for NULs, so that the grid isn't messed up
due to silently consumed NULs and that the full field is shown.
2006-03-03 16:26:38 -05:00
paul@snake-hub.snake.net
1442be9798
Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-clone
...
into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0-clone
2006-03-03 14:37:43 -06:00
paul@snake-hub.snake.net
f3cf52832d
mysqltest.c:
...
Typos.
2006-03-03 14:34:30 -06:00
paul@snake-hub.snake.net
f3c7e2d3ed
mysqltest.c:
...
Better fix for do_sleep().
2006-03-03 13:57:49 -06:00
msvensson@neptunus.(none)
21cc7c9555
Windows fixes
...
- Use pipes "|"
- Improved system command, create a temporary .sh faile that is executed with cygwins sh(bash)
This makes the Windows version behave exactly as the Lunix version(well almost...)
- Give unix path to DBUG, trace files is no produced if running ./mysql-test-run.pl --debug"
2006-03-03 14:55:05 +01:00
msvensson@neptunus.(none)
f601d26961
Remove superfluous DBUG_PRINT
2006-03-02 17:33:34 +01:00
msvensson@neptunus.(none)
52d51e5e26
Make the "system" command become executed in a bash shell in cygwin.
2006-03-02 16:28:45 +01:00
anozdrin@mysql.com
fbb5920399
Implementation of WL#2897: Complete definer support in the stored routines.
...
The idea is to add DEFINER-clause in CREATE PROCEDURE and CREATE FUNCTION
statements. Almost all support of definer in stored routines had been already
done before this patch.
NOTE: this patch changes behaviour of dumping stored routines in mysqldump.
Before this patch, mysqldump did not dump DEFINER-clause for stored routines
and this was documented behaviour. In order to get full information about stored
routines, one should have dumped mysql.proc table. This patch changes this
behaviour, so that DEFINER-clause is dumped.
Since DEFINER-clause is not supported in CREATE PROCEDURE | FUNCTION statements
before this patch, the clause is covered by additional version-specific comments.
2006-03-02 15:18:49 +03:00
msvensson@neptunus.(none)
e4b6f64a16
Make do_block return void, return value never used.
2006-03-02 11:10:29 +01:00
msvensson@neptunus.(none)
ff391e9fe1
Fix unsigned warning on windows
2006-03-02 11:08:43 +01:00
paul@snake-hub.snake.net
67e4580e29
mysqltest.c:
...
expand tab
2006-02-28 15:11:44 -06:00
paul@snake-hub.snake.net
d8a6e41c6b
Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1
...
into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
2006-02-28 15:09:45 -06:00
paul@snake-hub.snake.net
d6654fe9cb
mysql-test-run.sh:
...
Fix URLs.
README:
Fix URL.
mysqltest.result:
Update test result for real_sleep error message.
mysqltest.c:
Fix do_sleep() to print correct command name for real_sleep.
2006-02-28 15:08:16 -06:00
paul@snake-hub.snake.net
7ff2ede8c9
mysqltest.c:
...
Fix reference to incorrect (non-existent) options in comment.
2006-02-28 14:04:21 -06:00
paul@snake-hub.snake.net
486bd42b06
Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1
...
into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
2006-02-28 14:01:16 -06:00
paul@snake-hub.snake.net
fc8ed82da4
mysqltest.c:
...
Correct/clarify comments.
2006-02-28 14:00:17 -06:00
paul@snake-hub.snake.net
a052ef7d82
mysqltest.c:
...
Fix typos.
2006-02-28 12:19:30 -06:00
paul@snake-hub.snake.net
a2c639d813
Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1
...
into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
2006-02-28 12:10:38 -06:00
paul@snake-hub.snake.net
6d4dc91bbf
mysqltest.c:
...
Fix typos.
2006-02-28 12:01:24 -06:00
msvensson@neptunus.(none)
90e5ca96be
Look for and "convert" paths that start with $MYSQL_TMP_DIR
2006-02-26 19:54:09 +01:00
paul@snake-hub.snake.net
b11c033f49
mysqltest.c:
...
Rearrange out of order options in option struct.
2006-02-23 13:54:55 -06:00
msvensson@neptunus.(none)
36a1d6392b
Change snprintf to my_snprintf
2006-02-23 16:08:28 +01:00
msvensson@neptunus.(none)
269ab365aa
Aix52 build fix
2006-02-23 14:06:29 +01:00
msvensson@neptunus.(none)
5c4bf37259
Merge fixup
2006-02-23 10:35:53 +01:00
msvensson@neptunus.(none)
f80555880a
Merge neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my50-mysqltest_replace
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-23 10:30:31 +01:00
msvensson@neptunus.(none)
ec91a79c9f
Add new parameter to do_eval so that only unescaped variables in input string is expanded and rest of string is left untouched.
2006-02-23 10:11:57 +01:00
msvensson@neptunus.(none)
a699a2ea1b
Merge neptunus.(none):/home/msvensson/mysql/bug14871/my50-bug14871
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-21 15:05:58 +01:00
msvensson@neptunus.(none)
c293324eb0
Bug#14871 mysqldump: invalid view dump output
...
- Add comments with embeded veriosn info around the parts of the view syntax that are only supported by a certain version of MySQL Server
2006-02-21 13:21:17 +01:00
msvensson@neptunus.(none)
40fe710394
Merge neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my50-mysqltest_replace
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-21 09:40:18 +01:00
msvensson@neptunus.(none)
6006c9ac36
Merge neptunus.(none):/home/msvensson/mysql/bug13809/my50-bug13809
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-21 09:11:03 +01:00
msvensson@neptunus.(none)
3764d3dab1
Merge neptunus.(none):/home/msvensson/mysql/bug16795/my50-bug16795
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-21 08:55:13 +01:00
msvensson@neptunus.(none)
ae174fbef8
Fix typo
2006-02-20 12:05:45 +01:00
paul@snake-hub.snake.net
22f630f59a
mysqlcheck.c:
...
Tweak --check-upgrade help text.
2006-02-17 08:32:52 -06:00
msvensson@neptunus.(none)
b951068d62
Replace win filename s with unix equivalent
...
Evaluate commands passed to "exec" and "system" to expand any $variables before executing command.
2006-02-17 12:07:45 +01:00
holyfoot@deer.(none)
053d90a234
WL#2645 (CHECK TABLE FOR UPGRADE)
...
necessary implementation in the server
mysql_upgrade script added
2006-02-17 10:52:32 +04:00
paul@snake-hub.snake.net
a9cda1edd3
mysqlcheck.c:
...
Fix out of order options.
2006-02-16 10:00:14 -06:00
msvensson@neptunus.(none)
3fc22ca4b9
Bug#13809 mysql-test: --replace_result option works on Windows incorrect
2006-02-16 00:53:55 +01:00
msvensson@neptunus.(none)
cac0931b8c
Add possibility to have a negative expression in "if" and "while" in mysqltest
2006-02-15 22:43:42 +01:00
jimw@mysql.com
e75a62aeae
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2006-02-15 07:36:33 -08:00
msvensson@neptunus.(none)
56ef2e28e4
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-15 12:02:20 +01:00
jimw@mysql.com
d70c47b2a9
Merge mysql.com:/home/jimw/my/mysql-4.1-16389
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2006-02-14 18:12:30 -08:00
msvensson@neptunus.(none)
fed5a68ea8
Merge neptunus.(none):/home/msvensson/mysql/bug17280/my50-bug17280
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-14 15:34:30 +01: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
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
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)
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)
01ddf96930
Convert exponent results for MYSQL_TYPE_FLOAT on Windows
2006-02-02 11:45:37 +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)
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
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
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
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)
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)
a09473e652
Fix for crashing mysqltest
2006-01-10 15:56:30 +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
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
msvensson@neptunus.(none)
43a559ac70
Improved error message for failing with wrong error
2005-12-29 09:48:43 +01:00
stewart@mysql.com
efbdf7b225
Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main
...
into mysql.com:/home/stewart/Documents/MySQL/5.0/main
2005-12-28 00:57:18 +11:00
paul@snake-hub.snake.net
f5cc3fd619
mysql.cc:
...
Typo in help message.
2005-12-20 12:47:44 -06:00
msvensson@neptunus.(none)
94d05ebc37
Avoid implicit commits by using a different connection when creating/dropping sp's and views.
2005-12-20 17:06:20 +01:00
msvensson@neptunus.(none)
90bbcc9b4d
Store the each column from a multi column result set into a separate variable.
2005-12-20 15:34:58 +01:00
msvensson@neptunus.(none)
b38a183d62
Remove confusing printouts from expected to fail "system" commands
2005-12-13 18:47:34 +01:00
msvensson@neptunus.(none)
b5d805b2d6
Remove confusing printout
2005-12-13 18:10:53 +01:00
msvensson@neptunus.(none)
36c86a4df6
Fix tests after merge
...
Straighten out and comment behaviour for --require and --result in run_query
2005-12-13 18:07:13 +01:00
paul@snake-hub.snake.net
c708d9140f
mysqltest.c:
...
Put options in proper order.
2005-12-12 12:15:25 -06:00
msvensson@neptunus.(none)
4bcb012bbc
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930-integration
2005-12-12 12:43:33 +01:00
msvensson@neptunus.(none)
8aeb3a1fba
Fix warnings for running with --view_protocol
2005-12-09 18:51:45 +01:00