Commit graph

791 commits

Author SHA1 Message Date
guilhem@mysql.com
34aefdf31e Fix for BUG#3214 "mysqlbinlog --read-from-remote-server --position prints wrong positions"
I am fixing it here in 4.1, not in 4.0, as it goes with another change
which I did in 4.1 (fix for BUG#3204
""mysqlbinlog --read-from-remote-server this_binlog.001" prints all binlogs").
2004-03-18 20:53:33 +02:00
guilhem@mysql.com
32feac3093 Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1
2004-03-18 19:31:06 +02:00
guilhem@mysql.com
244304fdbb Fix for BUG#3204 ""mysqlbinlog --read-from-remote-server this_binlog.001" prints all binlogs":
we now detect that the server is sending us a log which we did not request
by testing the info in the fake Rotate event.
I also changed code to not print the fake Rotate which describes the
log we asked for (it's always the first received event but old masters
may not send it).
2004-03-18 19:29:07 +02:00
monty@mysql.com
19d0a60eca Don't change server suffix if given to configure
Portability fixes
2004-03-18 01:48:46 +02:00
monty@mysql.com
53c810cda4 merge fixes (use old code) 2004-03-18 00:16:04 +02:00
monty@mysql.com
44667503b7 After merge fixes 2004-03-17 10:30:40 +02:00
monty@mysql.com
350b433569 merge with 4.0 2004-03-16 22:41:30 +02:00
vva@eagle.mysql.r18.ru
f91acaf9c0 roll back change in client/mysqladmin.c for bug
#3160 '"mysqladmin password" doesn't work if --skip-grant-tables'
because we can't find out the mysql.user.host properly

now mysqladmin just print an advice error-message in this case
2004-03-16 22:54:25 +04:00
vva@eagle.mysql.r18.ru
e970ff9e87 Merge bk@gate:/home/bk/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_3160/mysql-4.1
2004-03-16 19:35:46 +04:00
vva@eagle.mysql.r18.ru
28ebb5a680 fixed bug #3160 '"mysqladmin password" doesn't work if --skip-grant-tables' 2004-03-16 19:30:22 +04:00
vva@eagle.mysql.r18.ru
58f6936b5e Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_2082/mysql-4.1
2004-03-16 18:30:06 +04:00
vva@eagle.mysql.r18.ru
50cb1793bf Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_2082/mysql-4.1
2004-03-16 18:28:23 +04:00
vva@eagle.mysql.r18.ru
414fb616e3 fixed a lot of warnings in processing of
Q_QUERY_VERTICAL/Q_QYERY_HORIZONTAL in client/mysqltest.c 
(changed switch to ?:)
2004-03-16 18:26:00 +04:00
vva@eagle.mysql.r18.ru
8d5430ef73 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_2709/mysql-4.1
2004-03-16 17:14:09 +04:00
vva@eagle.mysql.r18.ru
189761bcd3 actions for bug
#2709 Affected Rows for ON DUPL. KEY undocumented, perheps illogical 
1. added COPY_INFO::updated to work with it in
   'insert .. on duplicate' instead of COPY_INFO::deleted
2. added affected rows to output of "info:" in mysqltest.c
2004-03-15 21:36:16 +04:00
gluh@gluh.mysql.r18.ru
7e2bb11d2a Fix for bug#3041 --safe-updates option declaration anomaly 2004-03-15 19:47:51 +04:00
guilhem@mysql.com
cf94cd506f Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2004-03-12 22:03:27 +01:00
guilhem@mysql.com
c421527dee Force mysqlbinlog to require an argument if --local-load is used
(--local-load alone means "I want files to be prepared for LOAD 
DATA INFILE, in the default temp directory", and mysqlbinlog already
does this without --local-load).
2004-03-12 22:01:29 +01:00
Sinisa@sinisa.nasamreza.org
37817f60cc Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2004-03-11 22:27:17 +02:00
jani@ua72d24.elisa.omakaista.fi
2bf78563f7 Fixed error in version. 2004-03-11 20:12:16 +02:00
vva@eagle.mysql.r18.ru
bb6aee84ef Merge 2004-03-11 22:01:25 +04:00
vva@eagle.mysql.r18.ru
3c1ba83296 fixed bug #2591 "mysqldump quotas names inconsistently" 2004-03-11 18:46:27 +04:00
Sinisa@sinisa.nasamreza.org
67a5ccc5a6 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2004-03-11 15:41:09 +02:00
jani@ua72d24.elisa.omakaista.fi
3b5a46939f Small fixes. 2004-03-11 15:41:07 +02:00
Sinisa@sinisa.nasamreza.org
7e5a43af85 mysqldump.c:
reverting fix
2004-03-11 15:35:08 +02:00
vva@eagle.mysql.r18.ru
a135907547 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_2874/mysql-4.0
2004-03-10 23:35:40 +04:00
vva@eagle.mysql.r18.ru
faa9c92765 fixed BUG #2874 "Grant table bug" and
added tests for testing structure of mysql db
2004-03-10 22:54:07 +04:00
Sinisa@sinisa.nasamreza.org
0bbbdb0530 mysqldump.c:
This is to fix mysqldump problem when local-infile option is present under [client] options header.  It will not start. This must be fixed as other programs use that option under [client] options header.
2004-03-09 17:00:00 +02:00
paul@ice.snake.net
ae18d8d64c Patch for #3068: [Prompt without seconds when set from INI file].
(Fix hours/seconds always to display with two digits.)
2004-03-08 15:52:06 -06:00
vva@eagle.mysql.r18.ru
2501a54d31 corrected spelling error horisontal->horizontal
into client/mysqltest.c
2004-03-06 20:00:54 +04:00
vva@eagle.mysql.r18.ru
a8bbcc52a9 - added commands --query_vertical and --query_horisontal to client/mysqltest.cc
- get my_strtod to return inf
- get Field_float::store(double) and Field_double::store(float) to set null for 
nan value 
(as extra serg's recomendations to fix for patch on 
 Bug #2082 'mysqldump converts "inf" to null')
2004-03-06 03:00:21 +04:00
jani@ua72d24.elisa.omakaista.fi
58a978b900 Fixed Bug#2491, INSERT DELAYED causes binary log unusable by mysqlbinlog (replication is ok)
Setting insert delayed threads = 0 at mysql_init_command.
2004-03-04 17:58:36 +00:00
vva@eagle.mysql.r18.ru
b097995293 Fixed bug #2082 'mysqldump converts "inf" to NULL' and
added commands vertical_results and horisontal_results to client/mysqltest.c
2004-03-04 21:08:14 +04:00
monty@mashka.mysql.fi
6fbf1efdc2 Indented comment properly 2004-03-04 10:57:30 +02:00
harrison@corona.lordblink.com
ab1786129c Fix up history in readline implementation.
Two things changed:
1. Repeated queries are only stored once in the history.
2. Multiline queries are stored in a concated format in the history, 
   in addition to pieces. 
(Push approved by serg)
2004-03-03 15:54:37 -05:00
ulli@morbus.(none)
709a5d6a8b fix for bug #2905 -
"mysqladmin.c & co fail to use MYSQL_PORT as the default value of the TCP/IP port"
2004-02-26 19:09:49 +01:00
serg@serg.mylan
3d750efcb1 do not look for string characters "'` inside comments - bug#539 2004-02-26 01:05:04 +01:00
arjen@bitbike.com
fafc130b61 Inserted comment about lost root pwd procedure in Docs relying on command order in mysqladmin. 2004-02-25 09:46:43 +10:00
Sinisa@sinisa.nasamreza.org
74dc9f16bb A fix for double free of memory in mysqlbinlog. 2004-02-23 14:02:32 +02:00
serg@serg.mylan
4866ca228d typo fixed 2004-02-21 14:32:22 +01:00
monty@mashka.mysql.fi
e347f63192 Max open files handling moved to my_set_max_open_files()
This ensures that my_file_info takes this the max number of files into account and one can now use --open-files-limit on windows to increase number of used files up to 2048
2004-02-19 19:33:09 +02:00
monty@mysql.com
050af89dd8 Merge with public tree 2004-02-16 10:31:05 +02:00
monty@mysql.com
d1d48a9dd5 Merge with 4.0 to get fix for mysqlbinlog 2004-02-16 10:15:52 +02:00
monty@mysql.com
f43093ec0e After merge fixes
Added more DBUG statements
Ensure that we are comparing end space with BINARY strings
Use 'any_db' instead of '' to mean any database. (For HANDLER command)
Only strip ' ' when comparing CHAR, not other space-like characters (like \t)
2004-02-16 10:03:25 +02:00
vva@eagle.mysql.r18.ru
bdf696d0a4 fixed bug #2705 "mysqldump --tab extra output" 2004-02-14 01:21:46 +04:00
monty@mysql.com
fb8f27f017 Always use libtool with "--preserve-dup-deps"
Always use all LOAD DATA options in replication.
Fixed problem in mysqlbinlog where LOAD DATA options could be overwritten.
2004-02-13 16:05:09 +02:00
bar@bar.intranet.mysql.r18.ru
251bf4ab85 mysqlimport.c, mysqldump.c, mysqlcheck.c, mysql.cc:
No needs to load charset index if the character set is build-in.
2004-02-11 15:15:39 +04:00
monty@mysql.com
ce14578909 Merge with 4.0.18 2004-02-11 00:06:46 +01:00
vva@eagle.mysql.r18.ru
fd03264469 Merge 2004-02-10 18:56:43 +04:00
monty@mysql.com
079edf3313 Code cleanups 2004-02-10 12:03:08 +01:00