mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-24 07:44:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
17514 commits 2778 branches 343 tags 1.6 GiB
Commit graph

1050 commits

Author SHA1 Message Date
pem@mysql.com
bf45960eef Merge 4.1 -> 5.0 2004-05-07 18:52:06 +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
pem@mysql.comhem.se
d42b145817 Post-merge fixes, some quite complex. client/mysqlbinlog.cc and sql/log_event.cc 
merged manually by guilhem.
 2004-04-28 12:08:54 +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
pem@mysql.com
dfd59e296e Merge 4.1 -> 5.0. 2004-04-07 19:07:44 +02: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
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