Commit graph

1685 commits

Author SHA1 Message Date
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
msvensson@neptunus.(none)
fe2ec19039 WL#2930 mysqltest++
- Updated after valgrinding
2005-12-08 16:48:37 +01:00
msvensson@neptunus.(none)
d80516aa96 Fix memory leak 2005-12-07 14:52:37 +01:00
msvensson@neptunus.(none)
600a74b0d4 WL#2930
- Updated after review
2005-12-06 21:28:13 +01:00
knielsen@mysql.com
17cab43fcf Bug#15097: Missing \n in header printed by mysql --help when HAVE_READLINE
is not defined.
2005-12-05 12:12:08 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
d88d8081da Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
2005-12-04 15:34:47 +02:00