mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-21 14:32:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
31923 commits 2783 branches 343 tags 1.6 GiB
Commit graph

1707 commits

Author SHA1 Message Date
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
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
jani@a193-229-222-105.elisa-laajakaista.fi
669a12fdb0 A set of Netware related patches. 2005-12-04 15:02:06 +02:00
jimw@mysql.com
beed6147ad Merge mysql.com:/home/jimw/my/mysql-4.1-13318 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-12-01 12:21:29 -08:00
jimw@mysql.com
5f7e5b46c6 Merge mysql.com:/home/jimw/my/mysql-4.1-5792 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-11-28 10:52:52 -08:00
jimw@mysql.com
000d89b5e0 Fix values printed by mysqldump for empty blob fields when 
--hex-blob is used. (Bug #13318)
 2005-11-23 17:31:44 -08:00
bell@sanja.is.com.ua
db8f03ebe8 Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug7-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge-5.0
 2005-11-23 01:28:32 +02:00
bell@sanja.is.com.ua
7bd691f11e Recursion support made for SP (BUG#10100). 2005-11-23 01:11:19 +02:00
kent@mysql.com
9b14ee2ebc Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-distcheck
 2005-11-22 01:17:06 +01:00
joerg@mysql.com
84bc725fb9 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/M50/mysql-5.0
 2005-11-21 18:31:36 +01:00
joerg@mysql.com
b3b124f9e4 Merge the last 5.0.16 (Unix, Windows) and 5.0.16a (Netware) changes to the general tree. 2005-11-21 15:49:34 +01:00
aivanov@mysql.com
9a7efe36c6 Fixed BUG #14554: mysqldump does not separate "ROW" and trigger 
statement for tables created in the IGNORE_SPACE sql mode.
 2005-11-21 13:36:48 +03:00
kent@mysql.com
bcdd552d6e Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-distcheck
 2005-11-19 11:20:52 +01:00
kent@mysql.com
bd80dc6c2e Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck
 2005-11-19 11:11:09 +01:00
jamppa@suse9-x86.mysql.com
a50cc250ff Netware specific changes for 5.0.16a 2005-11-18 18:25:46 +01:00
jimw@mysql.com
f8ce7bc01e Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-11-17 13:37:30 -08:00
jimw@mysql.com
2ffc7ff2a2 Update out-of-date URLs in 'help' text of mysql client. (Bug #14801) 2005-11-11 15:23:04 -08:00
kent@mysql.com
b269caecb1 Additional "make distcheck" changes specific to 5.0 2005-11-09 11:56:04 +02:00
msvensson@neptunus.(none)
a6031b6425 Formatting improved 2005-11-04 12:15:49 +01:00
msvensson@neptunus.(none)
4f26b44318 Remove trailing whitespace 2005-11-04 12:00:34 +01:00
kent@mysql.com
4742f585b1 Merge 2005-11-04 02:17:11 +01:00
kent@mysql.com
ee0b6db191 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck
 2005-11-04 01:15:35 +01:00
msvensson@neptunus.(none)
39b2fb2b3c Reapplying patch 
Check for NULLs only if we don't replace column results,
  get real results after all checks.
  (see bug #14254: func_crypt.test fails on FreeBSD with --ps-protocol).

Remove two FIXME's
 2005-11-03 19:32:19 +01:00
msvensson@neptunus.(none)
32f6ece388 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930
 2005-11-03 19:20:47 +01:00
msvensson@neptunus.(none)
718839a1c1 WL#2930 Adding view and cursor 'protocols' to mysqltest 
- Part2, actually adding the new functionality
 2005-11-03 19:00:37 +01:00
tim@siva.hindu.god
198ead8f4e merge 2005-11-02 08:46:13 +13:00
evgen@moonbone.local
bbe58c7e26 Manually merged 2005-11-01 19:47:53 +03:00
pem@mysql.com
1137a376a7 Fixed bugs in client/mysqltest.c which made lots of "connect" commands in tests fail. 2005-10-31 19:31:05 +01:00
pem@mysql.com
81437a7286 Removed C++-isms from client/mysqltest.c 2005-10-31 17:51:48 +01:00
msvensson@neptunus.(none)
de07ac0c5a Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930
 2005-10-31 13:36:03 +01:00
ramil@mysql.com
afbd0fafd3 Check for NULLs only if we don't replace column results, 
get real results after all checks.
(see bug #14254: func_crypt.test fails on FreeBSD with --ps-protocol).
 2005-10-31 16:28:45 +04:00
msvensson@neptunus.(none)
e5eb7cbf29 WL#2930 Adding view and cursor 'protocols' to mysqltest 
- Cleanup of mysqltest.c before extending it
 2005-10-31 12:25:08 +01:00
jani@ua141d10.elisa.omakaista.fi
da64397b69 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
 2005-10-31 12:20:54 +02:00
jani@ua141d10.elisa.omakaista.fi
44aea416f9 Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
 2005-10-31 11:54:36 +02:00
msvensson@neptunus.(none)
531b847f23 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-10-31 09:14:58 +01:00
paul@frost.snake.net
19544bd01c Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  frost.snake.net:/Users/paul/bk/mysql-5.0
 2005-10-28 14:26:22 -05:00
msvensson@neptunus.(none)
68fa03258a Merge neptunus.(none):/home/msvensson/mysql/bug12985/my50-bug12985 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-10-28 11:45:30 +02:00
msvensson@neptunus.(none)
be6f7a3f82 Merge neptunus.(none):/home/msvensson/mysql/ssl_test/my50-ssl_test 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-10-28 11:00:54 +02:00
msvensson@neptunus.(none)
22c0d6489c After reiview fix 
- Use msg argument to determine if param is required or not in safe_get_param
 2005-10-28 10:58:57 +02:00
tim@siva.hindu.god
c704130389 BUG#14358: in mysql.cc, don't neglect to strip delimiter off lines < 9 characters long. 2005-10-28 12:13:34 +13:00
monty@mysql.com
a9b1ff4095 Add DROP TABLE before trying to create view (in mysqldump) 
Cleaned up xxxx_gis.test's and made gis_generic.inc independent of ndb
(Note that archive_gis.test fails, but this is independent of this patch)
 2005-10-27 22:45:18 +03:00
patg@krsna.patg.net
7243b7bb49 BUG# 12123 
Made change to mysqlimport to set character_set_database to binary to 
make importing various charsets/columns work correctly.
 2005-10-25 14:50:08 -07:00
paul@frost.snake.net
ea8ab2a114 Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  frost.snake.net:/Users/paul/bk/mysql-5.0
 2005-10-25 12:50:03 -05:00
pgalbraith@mysql.com
feca138e46 This cset fixes BUG# 12838, 14061, 12129 
mysqldump.result:
  BUG# 12838
      New test results for mysqldump -x on a DB with views
mysqldump.test:
  sqldump.test:
      BUG# 12838
      New test to run mysqldump -x on a DB with views
mysqldump.c:
  BUG# 12838
      Removed/Changed code which created tables to be put into the dump
      (For loading views of views) by creating temp tables and then using
      the CREATE TABLE information in those temp tables. The problem with this
      is that when mysqldump -x is called, it locks all tables, so the
      temp tables could not be created, causing the mysqldump to exit with
      failure. The code was changed to use SHOW FIELDS to get the column
      names and type to build CREATE TABLE text used to create these tables
      that views need in the dump.
 2005-10-25 19:04:31 +02:00
lars@mysql.com
fbcf26777e Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 
into  mysql.com:/users/lthalmann/bk/mysql-5.0-hexdump
 2005-10-24 17:23:45 +02:00
paul@frost.snake.net
e1f77e5cc8 Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  frost.snake.net:/Users/paul/bk/mysql-5.0
 2005-10-21 06:40:52 -05:00
kent@mysql.com
70c816c801 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-10-20 23:23:33 +02:00
paul@frost.snake.net
5d2c1d4cc2 mysqldump.c: 
Slight change to help message.
 2005-10-19 14:40:10 -05:00
lars@mysql.com
1aae3e1da1 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 
into  mysql.com:/users/lthalmann/bk/mysql-5.0-hexdump
 2005-10-19 19:42:14 +02:00
lars@mysql.com
4ccb1c6e36 mysqlbinlog --hexdump patch 4: 
Rename last_event_info to print_event_info to better reflect the new semantics
 2005-10-19 19:31:24 +02:00
patg@krsna.patg.net
b310e430f9 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test2
 2005-10-18 18:53:54 -07:00
patg@krsna.patg.net
f1bd9c0d0a Changeset: 
Changed option text in mysqldump.c
mysqldump.c:
  Changed text to read "+00:00" as opposed to "UTC" (per what the code does)
 2005-10-18 18:51:07 -07:00
reggie@ugeek.(none)
600c7df8f1 readd the my_cgets call that SergeyV originally put in 2005-10-18 17:53:09 -05:00
msvensson@neptunus.(none)
0684dc1342 Bug #12985 Do-mysqlclient-test: Can't find -lyassl when linking 
- Use yassl_includes and yassl_libs instead of openssl_includes and openssl_libs 
   to avoid that mysql_config returns that libyassl and libtaocrypt are needed for linking.
 2005-10-18 15:43:59 +02:00
gluh@eagle.intranet.mysql.r18.ru
7ccf861242 Fix for bug#13783 mysqlcheck tries to optimize and analyze information_schema 
'information_schema' is excluded from list of databases for mysqlcheck command
 2005-10-18 14:25:03 +05:00
patg@krsna.patg.net
1423db9f0c BUG# 13052 Changed text in options to TIMESTAMP 2005-10-17 12:30:01 -07:00
bar@mysql.com
e7fa41ebf7 mysql.cc: 
After merge fix.
 2005-10-14 14:19:15 +05:00
bar@mysql.com
aec79cc463 Merge mysql.com:/usr/home/bar/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-5.0
 2005-10-14 14:17:15 +05:00
bar@mysql.com
48238e1b90 Merge mysql.com:/usr/home/bar/mysql-4.1.b13487 
into  mysql.com:/usr/home/bar/mysql-4.1
 2005-10-14 14:07:22 +05:00
patg@krsna.patg.net
d86f40650f BUG# 13146 
Re-application of patch to clean 5.0 tree. Fixed issue with ANSI quotes 
when dumping triggers
 2005-10-13 13:42:56 -07:00
jimw@mysql.com
b6dcc55969 Fix being able to set default TCP port for command-line utilities 
by using MYSQL_TCP_PORT variable. (Bug #5792)
 2005-10-13 12:28:43 -07:00
patg@krsna.patg.net
a46dd41255 BUG# 13052 
Clean application of patch - 
- Added --tz-utc to fix issue of dumping timestamp values between 
servers with different global time zone settings, particularly 
with regard to the day of DST changeover, which without this fix,
 would dump duplicate timestamp values.
 2005-10-12 22:44:42 -07:00
lars@mysql.com
082a0bc46c Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 
into  mysql.com:/users/lthalmann/bk/mysql-5.0-hexdump
 2005-10-12 23:40:54 +02:00
lars@mysql.com
48457e0852 mysqlbin --hexdump patch 3 2005-10-12 23:37:21 +02:00
lars@mysql.com
0378009b5b Fix of incompatible types 
len and packet_error needs to be of same type for (len == packet_error) to
check failures
 2005-10-12 19:31:24 +02:00
msvensson@neptunus.(none)
7d29c2a4a1 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/ssl_test/my50-ssl_test
 2005-10-12 13:59:00 +02:00
msvensson@neptunus.(none)
0ac28d3187 Always test ssl and compress 
- Updated after review
 2005-10-12 13:56:07 +02:00
monty@mysql.com
f5fdf3e87a Reviewing new pushed code 
- CHAR() now returns binary string as default
- CHAR(X*65536+Y*256+Z) is now equal to CHAR(X,Y,Z) independent of the character set for CHAR()
- Test for both ETIMEDOUT and ETIME from pthread_cond_timedwait()
  (Some old systems returns ETIME and it's safer to test for both values
   than to try to write a wrapper for each old system)
- Fixed new introduced bug in NOT BETWEEN X and X
- Ensure we call commit_by_xid or rollback_by_xid for all engines, even if one engine has failed
- Use octet2hex() for all conversion of string to hex
- Simplify and optimize code
 2005-10-12 00:58:22 +03:00
lars@mysql.com
7a94010da9 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 
into  mysql.com:/users/lthalmann/bk/mysql-5.0-hexdump
 2005-10-11 21:46:40 +02:00
monty@mysql.com
17d7ba931d Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2005-10-08 03:37:23 +03:00
gluh@mysql.com
041eab4663 4.1 -> 5.0 merge 2005-10-07 14:26:32 +05:00
monty@mysql.com
78e828d32f Review of code pushed since last 5.0 pull: 
Ensure that ccache is also used for C programs
mysql: Ensure that 'delimiter' works the same way in batch mode as in normal mode
mysqldump: Change to use ;; (instead of //) as a stored procedure/trigger delimiter
Fixed test cases by adding missing DROP's and rename views to be of type 'v#'
Removed MY_UNIX_PATH from fn_format()
Removed current_db_used from TABLE_LIST
Removed usage of 'current_thd' in Item_splocal
Removed some compiler warnings
A bit faster longlong2str code
 2005-10-06 17:54:43 +03:00
guilhem@mysql.com
8a291efb75 The "exit" command of mysqltest is quite useful when writing tests for 4.1 so I'm porting it from 5.0 to 4.1. 2005-10-05 12:21:53 +02:00
msvensson@neptunus.(none)
cb96f195c8 Improved testing of ssl and compression 
- Added show status variable "compression" for checking that compression is turned on.
 - Updated show status variable "have_openssl" to be set to DISABLED if server supports ssl but it's not turned on to accept incoming ssl connections.  
 - Setup server to accept ssl connections from clients ig that is supported by server
 - New tests 
   - ssl - Run with ssl turned on
   - ssl_compress - Run with ssl and compression turned on
   - compress - Run with compression turned in 
 - Updated test 
   - openssl_1, rpl_openssl1 - Changed to run if server supports ssl
 2005-10-04 15:43:55 +02:00
georg@lmy002.wdf.sap.corp
f846bc32c1 Windows compilation fix: Added typecast (const char* to char *) 2005-10-04 10:54:58 +02:00
kent@mysql.com
fe26e59d70 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-10-04 04:03:48 +02:00
konstantin@mysql.com
1831d62a5c Fix -ansi -pedantic compilation failure. 2005-10-03 19:44:53 +04:00
kent@mysql.com
aef1f4cd2e Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-09-30 22:37:55 +02:00
msvensson@neptunus.(none)
92b1d080c9 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/bug13231/my50-bug13231
 2005-09-30 16:51:35 +02:00
kent@mysql.com
7b2e04d5a2 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
 2005-09-30 16:37:02 +02:00
kent@mysql.com
21cf818a8d Many files: 
New VC7 project files
des_key_file.cc:
  Visual C++ wants '"' for local include
mysql.cc:
  Cast my_cgets() argument for VC6 and VC7
dummy.cpp:
  Added to convince VS .Net generate a lib for mysqlserver
 2005-09-30 14:03:55 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
43b544a968 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-icc
 2005-09-30 12:36:23 +03:00
guilhem@mysql.com
fd9a6f9750 Tell the user that this ROLLBACK is added by mysqlbinlog (so that he does not wonder if it's present in binlog). This was brought up by Salle - thanks Salle. 2005-09-30 10:58:24 +02:00
lars@mysql.com
bf19d02b27 mysqlbinlog --hexdump additional patch 2 
- Fixes related to Guilhems review
- Special printing of event header
 2005-09-30 00:12:14 +02:00
lars@mysql.com
d81d57d408 mysqlbinlog --hexdump augments each log entry with byte information 2005-09-29 10:42:23 +02:00
kent@mysql.com
656b0cc15a Merge 2005-09-29 03:20:31 +02:00
kent@mysql.com
844d964f2d Many files: 
Prefix regex functions/types with "my_" as our
  library is not compatible with normal regex lib.
my_regex.h:
  Rename: regex/regex.h -> regex/my_regex.h
 2005-09-29 02:08:24 +02:00
lenz@mysql.com
6e10a589e1 Merge mysql.com:/space/my/mysql-4.1 into mysql.com:/space/my/mysql-5.0 2005-09-28 23:05:42 +02:00
lenz@mysql.com
972d85af8b - compile fix: don't use C++ - style comments in .c files! 2005-09-28 23:04:35 +02:00
bar@mysql.com
ceb541e4bc Bug#13487 Japanese data inside a comment causes the syntax error 
mysql.cc:
  Fixed not to copy multibyte characters to the
  target string if we are inside a comment.
 2005-09-28 15:46:09 +05:00
msvensson@neptunus.(none)
fbf4a5e079 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-09-28 11:34:53 +02:00
patg@krsna.patg.net
ac924f6b4f BUG #7815 - Post-review fixes required for push. 2005-09-27 09:40:51 -07:00
msvensson@neptunus.(none)
1105d4293d Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/fix_mysqltest/my41-fix_mysqltest
 2005-09-27 16:48:41 +02:00
patg@krsna.patg.net
8864a9b3c4 BUG #7815 
Changes per serg to http://lists.mysql.com/internals/30281

Re-enabled --delayed-insert
 2005-09-26 22:43:09 -07:00
monty@mysql.com
ea6d5f9ec3 Fixed error found during review of new pushed code 2005-09-25 21:22:23 +03:00
kent@mysql.com
095efe48a5 Makefile.am, configure.in: 
Enable "make distcheck" to work
 2005-09-24 15:51:45 +02:00
kent@mysql.com
0cfed79ea5 Makefile.am: 
Revert to shell test script for test targets
mysqltest.c:
  Windows pclose() returns error code in low byte
mysql_config.sh:
  Remove -Xa -xstrconst from --cflags for Sun C++
 2005-09-24 02:42:38 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
8d3036c35e Some minor fixes revealed as warnings by 
Intel compiler.
 2005-09-23 21:28:56 +03:00
msvensson@neptunus.(none)
4f03ab4943 Bug #13384 mysqltest, no protocol when script contains only lines with eval 2005-09-22 21:52:04 +02:00
msvensson@neptunus.(none)
4700631aa8 Bug #13384 mysqltest, no protocol when script contains only lines with eval 2005-09-22 21:24:57 +02:00
serg@serg.mylan
306aa15391 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0-merged
 2005-09-21 17:42:44 +02:00
msvensson@neptunus.(none)
0581a7f23c Bug #13231 mysqltest: fails to dectect when mysql_next_result fails 
- Added functionality to check errors returned from mysql_next_result
 - Exit from mysqltest when and unexpected error occurs.
 - The above fixes reveal problems with rpl000009, sp-error and query_cache-
 - Fix sp-error by adding an expected error
 - Fix rpl000009 by not sending "ok" from mysql_create_db when called with silent flag from load_master_data
 - Fix query_cache in separate patch
 2005-09-21 15:28:28 +02:00
lars@mysql.com
ed7eac5973 Added clarification comment regarding added ROLLBACK to mysqlbinlog output 2005-09-21 14:27:41 +02:00
serg@serg.mylan
a083ff160e merged 2005-09-21 13:53:22 +02:00
SergeyV@selena.
c2f734ce42 Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  selena.:H:/MYSQL/src/#12929-mysql-4.1
 2005-09-20 20:11:38 +04:00
msvensson@neptunus.(none)
523d2aad94 BUG#12959 mysqltest crashes if testcase passed with -x option 
- Enable testcases after help from Serg
 2005-09-20 14:11:58 +02:00
msvensson@neptunus.(none)
913f0bd610 Improved output 2005-09-20 12:13:17 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
468610635b Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
 2005-09-19 20:56:14 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
7c57c41a06 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-09-19 19:33:59 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
a8bdf632d3 Fixed Bug#13275 mysqltest empty file bug 2005-09-19 18:45:22 +03:00
msvensson@neptunus.(none)
c18980aeb6 Clean up printout of line numbers 2005-09-19 12:24:59 +02:00
SergeyV@selena.
2e9e0b33c5 Fixes bug #12929. Uses my_cgets instead of _cgets function, thus eliminating 
a restriction to 255 chars for editable buffer.
 2005-09-16 01:56:16 +04:00
tulin@dl145c.mysql.com
a8eb0f176b enabled mysqldump hex-blob option for bit fields 2005-09-14 15:46:31 +02:00
monty@mishka.mysql.fi
8b028bae87 Removed compiler warnings 2005-09-14 04:40:18 +03:00
serg@serg.mylan
43ff196ada after pull review - many bugs in mysqldump --routines 2005-09-13 19:32:37 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
01ce8a8aa9 Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
 2005-09-12 20:18:49 +03:00
monty@mishka.mysql.com
0965bfa832 Review fixes since last pull 
Fix for bug #13025; Server crash in filesort because wrong call to handler::position()
 2005-09-12 18:48:17 +03:00
patg@radha.local
f41aa04b59 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  radha.local:/Users/patg/mysql-build/mysql-5.0.bug12597
 2005-09-10 01:50:38 +02:00
patg@radha.local
15bbf4d215 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  radha.local:/Users/patg/mysql-build/mysql-5.0.bug12597
 2005-09-09 21:03:11 +02:00
patg@radha.local
06d1582b98 BUG #12597 This is a complete patch (2nd) containing fixes per Serg's review 2005-09-09 00:03:07 +02:00
patg@radha.local
4171c7435a Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  radha.local:/Users/patg/mysql-build/mysql-5.0.bug9056
 2005-09-08 22:29:13 +02:00
patg@radha.local
4cb63e6b8b BUG #9056 Changes to patch #2 per Serg's review 2005-09-08 19:45:25 +02:00
hartmut@mysql.com
052e9262ee Merge mysql.com:/home/hartmut/projects/mysql/dev/4.1 
into  mysql.com:/home/hartmut/projects/mysql/dev/5.0
 2005-09-08 00:57:02 +02:00
hartmut@mysql.com
1e1872464b Merge mysql.com:/home/hartmut/projects/mysql/dev/4.0 
into  mysql.com:/home/hartmut/projects/mysql/dev/4.1
 2005-09-08 00:50:03 +02:00
msvensson@neptunus.(none)
5c8d457ec8 Backport fixes for mysqltest.test from 5.0 2005-09-06 22:03:12 +02:00
msvensson@neptunus.(none)
b39f23d2b7 Bug #12984 mysqltest.test: different output from "exec NonExistsinfComamdn" 
- Common error handling regardless of --ps-protocol or not.
 2005-09-06 15:41:13 +02:00
msvensson@neptunus.(none)
9c1c075da1 Detect comment with command using extra delimiter 2005-09-06 12:33:36 +02:00
msvensson@neptunus.(none)
acd68dbf41 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/bug12959/my50-bug12959
 2005-09-05 17:03:25 +02:00
msvensson@neptunus.(none)
7f848c1784 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/bug12959/my41-bug12959
 2005-09-05 17:01:15 +02:00
msvensson@neptunus.(none)
e21d8c50bf Merge neptunus.(none):/home/msvensson/mysql/bug12959/my41-bug12959 
into  neptunus.(none):/home/msvensson/mysql/bug12959/my50-bug12959
 2005-09-05 16:51:31 +02:00