Commit graph

841 commits

Author SHA1 Message Date
konstantin@mysql.com
f08bbd1f12 assert.h needed for my_dbug.h now is included in my_dbug.h, where it for
some reason wasn't included before.
A lot of files cleaned up from #include <assert.h>
2004-06-10 23:58:39 +04:00
bar@bar.intranet.mysql.r18.ru
0860e3bfe4 mysqldump.c:
Dump could fail to load because of --default-character-set command line option.
  More safe dump is now produces, --default-character-set doesn't matter.
2004-06-07 18:12:23 +05:00
monty@mysql.com
70c2256d2f Merge with 4.0 to get fixes for netware 2004-06-02 00:09:14 +03:00
greg@mysql.com
3b313f14f2 Fix applied to allow building of 4.0.20 for NetWare 2004-06-01 19:35:09 -01:00
dlenev@brandersnatch.localdomain
03b705ff44 Made my_snprintf() behavior snprintf() compatible when printing %x arguments (it should
produce hex digits in lower case). (fixed version)

Replaced _dig_vec array with two _dig_vec_upper/_dig_vec_lower arrays.
Added extra argument to int2str function which controls case of digits you get.
Replaced lot of invocations of int2str for decimal radix with more optimized int10_to_str()
function.
Removed unused my_itoa/my_ltoa functions.
2004-05-27 17:54:40 +04:00
monty@mysql.com
f693787063 Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1 2004-05-27 02:51:28 +03:00
monty@mysql.com
833ec1653e netware files should always be in 'make dist'
use opt_net_buffer_length instead of net_buffer_length
2004-05-27 02:47:04 +03:00
monty@mysql.com
61a6557307 merge with 4.0 to get windows fixes 2004-05-27 00:30:28 +03:00
hf@deer.(none)
78f58ff384 Fix to make Windows compilation smoother 2004-05-26 21:40:27 +05:00
monty@mysql.com
390d9898f9 merge with 4.0 to get Netware patches and fixes for libmysqld.dll 2004-05-25 22:54:00 +03:00
monty@mysql.com
ca8dbc24ee Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/tmp/skr99/mysql-4.0
2004-05-25 22:01:50 +03:00
monty@mysql.com
f2e1e3ce4c Added patches from Novell 2004-05-25 22:00:14 +03:00
dlenev@brandersnatch.localdomain
b5b4c88455 Fix of small syntax error - added missing backslash that prevented building of mysqlbinlog. 2004-05-24 14:38:55 +04:00
guilhem@mysql.com
ce1e1f4cb6 mysqlbinlog: new option --to-last-log. This option has effect only if --read-from-remote-server.
It causes mysqlbinlog to not stop after the end of the requested binlog, and instead read
until the end of the last binlog of mysqld (beware of endless loops if you pipe this
into the same mysqld).
I.e. it enables back (at customer's request) what we considered (and I still do)
as BUG#3204, but now with an option instead of being the default behaviour.
The default behaviour is still to stop after the end of the requested binlog,
whether --read-from-remote-server or not.
2004-05-23 17:42:12 +02:00
hf@deer.(none)
418dffe205 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.3744
2004-05-21 22:00:12 +05:00
hf@deer.(none)
0379682ea6 Addition to the fix for bug #3791 (libmysqld mysql segfaults if can's find
errormsg.sys)
Cleanups added
2004-05-21 17:23:27 +05:00
monty@mysql.com
332f124bc6 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-05-19 05:09:41 +03:00
monty@mysql.com
21f1bca789 Portability fixes
Fixed wrong number of warnings/duplicates for machines with high-byte-first
2004-05-19 05:09:10 +03:00
serg@serg.mylan
d9ec0f2b90 after merge fix 2004-05-18 09:56:45 +02:00
hf@deer.(none)
5bca8fd46d Proposed fix for #3791 (embedded: mysql segfaults if cannot find
errmsg.sys)
2004-05-17 12:07:58 +05:00
monty@mysql.com
cd3dab49cc Merge with 4.0.20 2004-05-17 01:52:13 +03:00
guilhem@mysql.com
a039062ef3 Replication testsuite: making the master-slave synchronization less likely to fail,
by adding sleep-and-retries (max 4 times) if MASTER_POS_WAIT() returns NULL
in sync_with_master and sync_slave_with_master.
The problem showed up only today, in MySQL 5.0 in rpl_server_id2.test,
but may affect 4.x as well, so fixing it here. Note that I am also fixing
5.0 too, with the same exact patch, because I don't want to leave 5.0 broken
until the next 4.0->4.1->5.0 merge.
2004-05-14 23:08:03 +02:00
serg@serg.mylan
5a0cbfea99 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-05-10 18:22:31 +02:00
ingo@mysql.com
19156a3ac7 Merge mysql.com:/home/mydev/mysql-4.0
into mysql.com:/home/mydev/mysql-4.0-bug2831
2004-05-07 10:42:08 +02:00
jani@a80-186-24-72.elisa-laajakaista.fi
6bc03b14d9 Fixed a problem with option --where, which earlier was not dynamic. One was not able
to use long query strings with it.
Bug#3633
2004-05-07 01:02:57 +03:00
serg@serg.mylan
4c5ac98f09 mysqldump: help text corrected 2004-05-06 20:45:25 +02:00
ingo@mysql.com
ba0697c658 Fix a forgotten skip of space at line begin for the 'system' command. 2004-05-06 16:15:46 +02:00
serg@serg.mylan
395dc08219 don't let -B increment opt_silent twice 2004-05-06 15:13:23 +02:00
serg@serg.mylan
803279f0c7 mysql.cc:
allow several -e on the command line
  clarify --help text
  make -B to work as advertised
  in force mode execute the rest of multi-statement line in case of error in one statement
2004-05-05 22:47:09 +02:00
monty@mysql.com
a5d8b846fa after merge fixes 2004-05-05 21:24:21 +03:00
monty@mysql.com
104fdf607d Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-05-05 12:40:59 +03:00
monty@mysql.com
59ddd8c738 Fix to handle unsigned data in prepared statements (Bug #3447)
Fixed security problem that password was temporarly reset when someone changed GRANT for a user. (Bug #3404)
Fixed problem with PROCEDURE analyse() and impossible WHERE (Bug #2238)
Don't auto-repair tables in mysqlcheck if table type doesn't support 'check' command.
2004-05-04 15:02:38 +03:00
serg@serg.mylan
d2d08960a2 note that --[skip-]opt include --set-charset
make --set-charset affect only what's going into *dump* not client-server communication
2004-05-01 11:07:42 +02:00
monty@mishka.local
4999203fbd Fixed results for previous patch
Ensure that mysqldump doesn't give an error about missing Index.xml when it's not needed
2004-04-27 17:32:40 +03:00
monty@mishka.local
e9cfe01db0 After merge fixes
Changed 'SHOW FIELD STATUS' to use 'Engine' instead of 'Type'
2004-04-27 15:33:40 +03:00
monty@mishka.local
21fd1d270e Merge with 4.0 2004-04-26 15:53:31 +03:00
bar@bar.intranet.mysql.r18.ru
950a2ebab1 Fixed charsetnr sent to the client 2004-04-06 19:57:33 +05:00
vva@eagle.mysql.r18.ru
7b68b26623 fixed Bug #3361 "mysqldump quotes DECIMAL values" 2004-04-05 23:18:16 +05:00
jani@rhols221.adsl.netsonic.fi
77411610ea Fixed a non-critical bug, but which affected how indent program indents
the code.
2004-04-05 16:28:16 +03:00
jani@rhols221.adsl.netsonic.fi
faea057f9b Added option --set-charset (disable with --skip-set-charset) to mysqldump.
Marked --no-set-names as deprecated, the name is misleading and --no- in front
makes it cumbersome to use with --disable or --skip prefixes.
The old option will still work for the time being.
2004-03-31 05:36:29 +03:00
monty@mysql.com
ddafa2cc16 simple optimzation
Portability fixes
2004-03-31 03:32:38 +03:00
monty@mysql.com
34df0b3d1c Force clients to recompile if client lib changes (Bug #3009) 2004-03-30 22:13:25 +03:00
monty@mysql.com
f602829c75 Fix to get correct metadata when using temporary tables to create result. (Bug #2654) 2004-03-30 19:24:28 +03:00
gluh@gluh.mysql.r18.ru
9832571c1e Fix bug #3181: insert_test client test missing mysql_init 2004-03-29 18:10:59 +05:00
monty@mysql.com
e0e0314d60 Merge with 4.0 2004-03-25 23:29:45 +02:00
paul@teton.kitebird.com
389ab9fc5d "automagically" is not a word. 2004-03-22 09:38:57 -06:00
monty@mysql.com
b6e5c23c26 Ensure that we use unix file format (no \r\n) for all new files
Portability fixes
2004-03-20 12:48:14 +02:00
monty@mysql.com
b49b24d94a Added test to show bug in current union implementation
After merge fixes
Portability fixes
2004-03-19 18:33:38 +02:00
monty@mysql.com
933278a52b merge with 4.0 (to get compiler error fixes for innodb) 2004-03-19 15:17:56 +02:00
monty@mysql.com
b7fc7188d0 Portability fixes
Removed \r from new tests
Fixes to get new sustem_mysql_db... tests to work
2004-03-19 14:52:48 +02:00