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

886 commits

Author SHA1 Message Date
serg@serg.mylan
5d4077cc0b clarify -F help text a bit 2004-02-04 16:50:33 +01:00
monty@mysql.com
268521a61d Give error if locked table is used twice in query. This fixes strange error message when doing LOCK TABLES t1 WRITE; INSERT TABLE t1 SELECT * from t1 (Bug #2296) 2004-02-03 09:46:48 +01:00
ram@gw.mysql.r18.ru
f231d9826b just tried to find all 'skipp' and replace it with 'skip'. 2004-02-02 20:25:39 +04:00
jani@rhols221.adsl.netsonic.fi
d12020880d Fixed Bug#2281, --quote is now enabled by default. Can be disabled 
with --disable-quote

Added --compatible=ansi mode.

Fixed a non-reported bug in compatible mode; there was a check for
/*!41000 */ at this part of the code, while it obviously should have been
/*!40100 */. So the mysqldump compatiple mode made for 4.0.1 will not work
until 4.10 or later server is released :P Fixed into 4.0.2.
 2004-01-15 04:26:57 +02:00
jani@rhols221.adsl.netsonic.fi
46aea13f20 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into rhols221.adsl.netsonic.fi:/home/my/bk/mysql-4.1
 2004-01-14 17:49:17 +02:00
jani@rhols221.adsl.netsonic.fi
44c5a57cd0 Fixed a non-debug version compilation error and warning. 2004-01-14 17:48:38 +02:00
serg@serg.mylan
e883ae0915 compilation error fixed 2004-01-14 16:42:08 +01:00
jani@rhols221.adsl.netsonic.fi
2efb415121 - Added missing documentation to some mysql.cc options. 
- Fixed Bug#2346
- Fixed Bug#2378
- Fixed bug in pager (no Bug#ID (?))
- Added support for new special situations option type, GET_DISABLED.
  See handling of --debug in mysql.cc. compiled wihtout debugging, as an
  example.
 2004-01-14 04:58:37 +02:00
Sinisa@sinisa.nasamreza.org
704284d4a1 mysqldump.c: 
Fix for UNLOCK TABLES bug #2242
 2004-01-06 19:23:30 +02:00
jani@rhols221.adsl.netsonic.fi
5ec1adee44 Fixed Bug#2205. 2004-01-05 21:45:14 +02:00
jani@rhols221.adsl.netsonic.fi
934f08c5d1 Fixed Bug#1472, mysql \h output out of order. 2003-12-30 17:58:39 +02:00
monty@mysql.com
c1dd070ba7 Some small portability fixes. 
Added support for lower_case_table_names=2, which is to be used on case insensitive file systems.
This tells MySQL to preserve the used case of filenames and database names to make it esier to move files between cases sensitive can case insensitive file systems (like Windows and Linux)
 2003-12-30 13:14:21 +02:00
monty@mysql.com
0279dc4234 Portability fixes found during 5.0 test compilation 
Fixed bug in ORDER BY on a small column (Bug #2147)
Fixed error from pthread_mutex_destroy() when one had wrong errmsg file
 2003-12-21 19:39:32 +02:00
monty@mysql.com
d4c32db181 merge with 4.0.18 2003-12-19 16:42:17 +02:00
monty@mysql.com
eeff10e4c1 merge 2003-12-19 16:34:48 +02:00
monty@mysql.com
031390a9a4 Fixes after merge with 4.0 
Cleaned up embedded library access and query cache handling
Changed min stack size to 128K (to allow longer MyISAM keys)
Fixed wrong priority for XOR (should be less than NEG to get -1^1 to work)
 2003-12-19 16:25:50 +02:00
ram@gw.mysql.r18.ru
33ca68a205 MYSQL_UNIVERSAL_CLIENT_CHARSET definition has been added. 2003-12-19 14:12:29 +04:00
jani@rhols221.arenanet.fi
c1bde7d8bd Removed unneccessary sprintf call and a variable. 2003-12-18 13:56:13 +02:00
monty@mysql.com
6e58a7c49e Code cleanup 2003-12-18 01:13:52 +02:00
monty@mysql.com
e0cc6799ec Merge with 4.0.17 2003-12-17 17:35:34 +02:00
jani@rhols221.adsl.netsonic.fi
5678574922 Fixed parenthesis needed by valgrind-max. 2003-12-16 16:03:39 +02:00
monty@mysql.com
56f0abf7bb Portability fixes (mostly test suite) 
Make ENGINE= an alias for TYPE= (Compabiltiy with 4.1)
Fix when using symlinked data files and realpath() is not working
 2003-12-16 13:20:17 +02:00
jani@rhols221.adsl.netsonic.fi
90a2456faf Some minor code clean up. 2003-12-16 11:44:22 +02:00
jani@rhols221.adsl.netsonic.fi
96555b5f90 Added support for multi statement tests. Use mysqltest internal 
command delimiter to change the default delimiter (;) to something
else, a string upto 16 characters is allowed. Separate the sub
queries with ';' and end the whole statement with your own delimiter.
 2003-12-16 06:09:44 +02:00
monty@mysql.com
cde713023a Cleanup 2003-12-16 02:23:40 +02:00
monty@mysql.com
d47deebb58 Extend max_allowed_packet to 2G in mysql and mysqldump (Bug #2105) 
Don't dump data for MRG_ISAM or MRG_MYISAM tables. (Bug #1846)
Ensure that 'lower_case_table_names' is always set on case insensitive file systems. (Bug #1812)
One can now configure MySQL as windows service as a normal user. (Bug #1802)
Database names is now compared with lower case in ON clause when lower_case_table_names is set. (Bug #1736)
IGNORE ... LINES option didn't work when used with fixed length rows. (Bug #1704)
Change INSERT DELAYED ... SELECT... to INSERT .... SELECT (Bug #1983)
Safety fix for service 'mysql start' (Bug #1815)
 2003-12-14 06:39:52 +02:00
vva@eagle.mysql.r18.ru
700de3ebec changed %ld on %lu for output of mysql_thread_id(&mysql) 
as is thread_id has type ulong
(bug #1951 thread id is printed as "signed" instead of "unsigned" in 'mysql')
 2003-12-12 17:18:48 -04:00
serg@serg.mylan
fddab846d4 chk_del() should not check key delete-chain 
make a test for -inf more portable (-Inf)
 2003-12-11 16:47:50 +01:00
ram@gw.mysql.r18.ru
0395a3dd46 Added --comments mysqldump option (default value is 1). 
Fixed mysqldump test.
 2003-12-11 17:37:45 +04:00
serg@serg.mylan
6a7a91ba4d mysqldump version updated 2003-12-11 12:02:26 +01:00
ram@gw.mysql.r18.ru
361fe81035 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0 
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b2005
 2003-12-10 18:41:12 +04:00
monty@mysql.com
6a95123971 Added checking of return value from my_once_alloc() in charset 
Added checking of return value from malloc() in reg_init()
 2003-12-10 00:00:20 +02:00
ram@gw.mysql.r18.ru
ab1c17b943 Fix for the bugs: 
#2005 Long decimal comparion bug.                                               
#2055 mysqldump should replace "-inf" numeric field values with "NULL"
 2003-12-09 17:33:29 +04:00
ram@gw.mysql.r18.ru
4d1f521f21 Fix for the bug #1994: mysqldump does not correctly dump UCS2 data. 2003-12-09 15:28:58 +04:00
monty@mysql.com
f266cdabab Portability fixes (for binary build) 
Added --protocol to mysqlbinlog
 2003-12-01 13:13:16 +02:00
konstantin@oak.local
2e8cf31abc Second part of WL #519: 
Client option secure-auth deployed on all possible layers:
- mysql client command-line and config file option
- mysql_options option MYSQL_SECURE_AUTH
- mysql_real_connect will automatically take into account that option if
  mysql->options.my_cnf_file/my_cnf_group is set
 2003-11-28 13:11:44 +03:00
monty@mysql.com
8aeb63dd3b Update VC++ files 
Portability fixes
After merge fixes
 2003-11-21 01:53:01 +02:00
jani@ua167d18.elisa.omakaista.fi
0b1bae4677 Added error reporting if one of the multi queries failed. 2003-11-20 20:06:51 +02:00
jani@rhols221.adsl.netsonic.fi
cc2916c459 Added multi command support for mysql client. 2003-11-20 14:33:07 +02:00
monty@mashka.mysql.fi
cab1dc628c CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS 
New multi-key-cache handling. This was needed becasue the old one didn't work reliable with MERGE tables.
ALTER TABLE table_name ... CHARACTER SET  ... now changes all char/varchar/text columns to the given character set
(One must use ALTER TABLE ... DEFAULT CHARACTER SET ... to change the default character set)
Fixed that have_compress is detected properly (fixes problems with func_compress.test on platforms without zlib)
New syntax for CACHE INDEX ('keys' is optional if no index name is given and one mentions the key cache name only ones)
Removed compiler warnings
Added mysql_set_server_option() to allow clients like PHP to easaily set/reset the multi-statement flag.
 2003-11-18 13:47:27 +02:00
monty@narttu.mysql.fi
4e4725377d Merge with 4.0 2003-11-04 09:40:36 +02:00
ram@gw.mysql.r18.ru
3dba5c6cc1 WL #1279: Add table description to xml dump 
changes after montys review
 2003-11-03 16:49:39 +04:00
ram@gw.mysql.r18.ru
0a357809be WL #1279: Add table description to xml dump (SCRUM) 
Bug #1707: mysqldump -X does't quote field and table names
code cleanup
 2003-10-30 14:58:30 +04:00
vva@eagle.mysql.r18.ru
e93d5845d9 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0 
into eagle.mysql.r18.ru:/home/vva/work/BUG_1348/mysql-4.0
 2003-10-25 16:31:49 -04:00
vva@eagle.mysql.r18.ru
a6d788d115 added quotas for database names 
(fixed bug #1348)
 2003-10-24 17:26:26 -04:00
guilhem@mysql.com
c93f69e9dd Fix for Bug #1595 "mysqlbinlog can't read a password from the console". 
** I already fixed it in 3.23; I fix it in 4.0 separately because the
code is a bit different (so the changeset 1.1422 of 3.23 should not be
merged here) **
Make mysqlbinlog prompt for the password if
mysqlbinlog -p
instead of printing the usage().
This makes mysqlbinlog behave like other clients.
This new code was almost copied from mysqldump.
Note that before, one could use
  mysqlbinlog -p pass
and now one must use
  mysqlbinlog -ppass
(putting a space will ask for the password).
 2003-10-21 12:22:24 +02:00
monty@mashka.mysql.fi
e87c9f5ff8 merge with 4.0 2003-10-16 03:08:40 +03:00
serg@serg.mylan
f77336e69d do not add DROP TABLE and LOCK TABLES to the dump in --xml mode 2003-10-14 12:19:54 +02:00
serg@serg.mylan
f3e7012d6e Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2003-10-14 00:27:04 +02:00
monty@narttu.mysql.fi
246febee42 merge with 4.0 to get fix for mysqlbinlog 2003-10-08 12:05:27 +03:00
monty@narttu.mysql.fi
d9ff665102 Fixes after merge 2003-10-08 12:01:58 +03:00
monty@narttu.mysql.fi
d00d9110ba Fixed test case that my last patch to mysqlbinlog broke. 
Changed --remote to --read-from-remote-server (mysqlbinlog)
 2003-10-08 10:23:54 +03:00
monty@narttu.mysql.fi
a278a77475 Fix for option 'R' (connect to remote server) in mysqlbinlog 2003-10-08 01:30:10 +03:00
serg@serg.mylan
9d198d35bf merged 2003-10-07 20:41:07 +02:00
monty@narttu.mysql.fi
1f8e38d03a Merge with 4.0 to get fix for mysqlbinlog 2003-10-07 21:41:06 +03:00
monty@narttu.mysql.fi
b82b76f480 Simple cleanups 2003-10-07 15:44:31 +03:00
monty@narttu.mysql.fi
6056cfadfc Merge with 4.0.16 2003-10-07 15:42:26 +03:00
monty@mishka.mysql.fi
a5c83b05bd Move init_compiled_charsets to own file 
Remove dependency of charsets (in my_init) to get smaller binaries when charsets are not used
Simple code cleanup
 2003-10-06 22:56:34 +03:00
ram@gw.mysql.r18.ru
9df504d277 Fix for the bug #1336 mysql.cc assumes DATABASE() doesn't return NULL 2003-10-06 15:47:17 +05:00
serg@serg.mylan
0ce865b6b4 Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2003-10-06 09:24:12 +02:00
dlenev@mysql.com
573e5bffbf Added resetting of replace_result patterns after --exec command in mysqltest (in order to be consistent with ordinary query execution). 2003-09-29 23:10:30 +04:00
monty@narttu.mysql.fi
89f30200bc Removed random chars after filename for LOAD DATA INFILE (in mysqlbinlog) 
Add quoting for use `database` for mysqlbinlog
Removed test ins0000001
Add support for --replace for exec in mysqltest
Don't refer to install dir in mysqlbinlog.result
 2003-09-29 12:31:35 +03:00
serg@serg.mylan
8c7c4de0b4 enum options renamed to avoid possible name conflicts 2003-09-29 11:21:17 +02:00
ram@gw.mysql.r18.ru
5e07599ebe #1169: Add --exec command to mysqltest 2003-09-24 16:13:47 +05:00
monty@narttu.mysql.fi
45a41e85e3 Code cleanup of new patches 2003-09-23 17:06:44 +03:00
dlenev@mysql.com
c4384241ec Bugfix for bug #1340, style fix before push 2003-09-19 20:34:58 +04:00
dlenev@mysql.com
3c55dbe3db Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/dlenev/src/mysql-4.0-bg-1340
 2003-09-19 20:34:57 +04:00
vva@eagle.mysql.r18.ru
d623fc83b1 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0 
into eagle.mysql.r18.ru:/home/vva/work/BUG_1073/mysql-4.0
 2003-09-19 12:34:56 -04:00
dlenev@mysql.com
69aed374a5 Fix for bug #1340 (More careful checks if we met proper Create_file_log_event before Append or Exec event we are processing now) 2003-09-19 16:43:56 +04:00
hf@deer.(none)
a2dbfaefa3 SCRUM 
embedded library
hash_insert renamed to my_hash_insert to avoid name intersection
with another libraries
is there better idea?
 2003-09-19 14:44:31 +05:00
hf@deer.(none)
0e059dcb74 SCRUM: 
embedded library
I decided to get rid of #define mysql_some_function in mysql.h
It puzzles users and makes problems with dynamic libraries

Finally, there are only two functions left, that are covered with
the #define-s and it won't hurt performance at all
 2003-09-18 18:28:42 +05:00
jani@rhols221.adsl.netsonic.fi
33250a01ba Fixed Bug#1291, client displays wrong prompt when in the middle of 
backticks.
 2003-09-17 21:41:36 +03:00
guilhem@mysql.com
d1cd9bd498 Fix for BUG#1258 (Trying to use the mysqlbinlog with -h and -u option gives segmentation 
fault). Fix is just initializing "host" (and "user") with 0, not a string.
 2003-09-12 15:48:48 +02:00
monty@mashka.mysql.fi
7538242e4f merge with 4.1 tree 2003-09-11 20:31:40 +03:00
monty@mashka.mysql.fi
73f66f68fd merge with 4.0.15 2003-09-11 20:24:14 +03:00
monty@mashka.mysql.fi
45aa92c574 After merge fixes. 
Note that mix_innodb_myisam_binlog and union fails after this patch (Will be fixed shortly by maintaners of this code)
 2003-09-11 19:06:23 +03:00
vva@eagle.mysql.r18.ru
579edcd481 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0 
into eagle.mysql.r18.ru:/home/vva/work/BUG_1184/mysql-4.0
 2003-09-08 12:47:40 -04:00
vva@eagle.mysql.r18.ru
7ee7ce5556 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0 
into eagle.mysql.r18.ru:/home/vva/work/BUG_1184/mysql-4.0
 2003-09-08 12:46:16 -04:00
vva@eagle.mysql.r18.ru
00aee0ba4b Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0 
into eagle.mysql.r18.ru:/home/vva/work/BUG_1056/mysql-4.0
 2003-09-08 12:15:17 -04:00
ram@mysql.r18.ru
0caa462b77 #1169: Add --exec command to mysqltest 2003-09-08 10:53:51 +05:00
vva@eagle.mysql.r18.ru
2ef05e3747 fixed Bug #1184 (change type of opt_ignore_lines to longlong) 2003-09-06 18:59:04 -04:00
vva@eagle.mysql.r18.ru
d45ff0e314 added space after first '--' in the long '----....' comment line in mysqldump 
just to make it compatible with the manual
(fixed bug #1056)
 2003-09-06 15:06:08 -04:00
monty@mashka.mysql.fi
1d79895402 after merge fixes 2003-09-05 08:16:13 +03:00
monty@mashka.mysql.fi
439b84afe4 Merge with 3.23 2003-09-05 06:56:28 +03:00
monty@narttu.mysql.fi
4b3b4b9250 merge 2003-09-03 19:53:08 +03:00
monty@narttu.mysql.fi
a6e3ee6bef Better quoting patch for mysqldump 2003-09-03 18:48:10 +03:00
kostja@oak.local
36dd82c1d5 merge commit, hope that none of bar and dlenev changes were 
lost.
 2003-09-03 14:12:10 +04:00
serg@serg.mylan
04112b9f89 proper obligatory quoting of identifiers in mysqldump<->server communication (unrelated from command-line options) 2003-09-02 18:30:34 +02:00
vva@eagle.mysql.r18.ru
0f1cf03905 fixed bug #1073 
(Replication LOAD DATA INFILE mysqlbinlog doesn't cleanup tmp files)
 2003-09-01 11:15:53 -04:00
monty@narttu.mysql.fi
77a70a0a24 merge with 4.0.15 2003-08-29 13:44:35 +03:00
monty@narttu.mysql.fi
a2a1e97226 Portability fixes 2003-08-28 22:18:02 +03:00
ram@mysql.r18.ru
3e9c55590a Fix for the bug #1125 mysqldump -X creates invalid XML 2003-08-28 19:27:46 +05:00
monty@narttu.mysql.fi
fe9dc5e711 Add column names for metadata when running mysql with -T 
Change metadata info so that that MIN() and code MAX() reports that they can return NULL. Bug #324
 2003-08-27 10:26:03 +03:00
monty@narttu.mysql.fi
66b160c253 vio ssl structure renames (to get rid of ending _) 
Added TCP/IP read/write timeout for windows
Check on windows if second server is started with same TCP/IP port
 2003-08-27 02:51:39 +03:00
guilhem@mysql.com
9676fdcbcd Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/mysql_src/mysql-4.0
 2003-08-22 15:42:22 +02:00
guilhem@mysql.com
759a3c1e3c 2 minor edits, plus 
fix for BUG#1113 "INSERT into non-trans table SELECT ; ROLLBACK" does not send warning"
and
fix for BUG#873 "In transaction, INSERT to non-trans table is written too early to binlog".
Now we don't always write the non-trans update immediately to the binlog;
if there is something in the binlog cache we write it to the binlog cache
(because the non-trans update could depend on a trans table which was modified
earlier in the transaction); then in case of ROLLBACK, we write the binlog
cache to the binlog, wrapped with BEGIN/ROLLBACK.
This guarantees that the slave does the same updates.
For ROLLBACK TO SAVEPOINT: when we execute a SAVEPOINT command we write it
to the binlog cache. At ROLLBACK TO SAVEPOINT, if some non-trans table was updated,
we write ROLLBACK TO SAVEPOINT to the binlog cache; when the transaction
terminates (COMMIT/ROLLBACK), the binlog cache will be flushed to the binlog
(because of the non-trans update) so we'll have SAVEPOINT and ROLLBACK TO
SAVEPOINT in the binlog.

Apart from this rare case of updates of mixed table types in transaction, the
usual way is still clear the binlog cache at ROLLBACK, or chop it at
ROLLBACK TO SAVEPOINT (meaning the SAVEPOINT command is also chopped, which
is fine).
Note that BUG#873 encompasses subbugs 1) and 2) of BUG#333 "3 binlogging bugs when doing INSERT with mixed InnoDB/MyISAM".
 2003-08-22 15:39:24 +02:00
monty@narttu.mysql.fi
5192a58140 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into narttu.mysql.fi:/my/mysql-4.0
 2003-08-22 04:08:16 +03:00
monty@narttu.mysql.fi
efa85aad49 Move test that uses many tables (in query_cache.test) to separate test so that we can get it 'skipped' instead of 'failed' on system where we can't open many files. 2003-08-22 04:07:40 +03:00
serg@serg.mylan
ae8b080549 comment added 2003-08-20 12:27:06 +02:00
guilhem@mysql.com
1a5c8be408 Fix for BUG#1096 which is: 
"mysqlbinlog does not comment the original LOAD DATA INFILE if it has a "use xx""
 2003-08-19 15:46:47 +02:00
guilhem@mysql.com
83f35b8a81 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/mysql_src/mysql-4.0
 2003-08-19 15:22:36 +02:00
guilhem@mysql.com
fefa92f3a7 Fixes for BUG#1091,1092,1093. Synopsis of these bugs: 
mysqlbinlog segfaults if --position is just before Exec_load event
mysqlbinlog prints uncommented warnings if --database and compiled with debug
mysqlbinlog --database does not filter LOAD DATA INFILE
 2003-08-19 15:12:44 +02:00
monty@mashka.mysql.fi
4f7512160b After merge fixes 
Use server character set if --default-character-set is not used
Added convert_string() for more efficient alloc+character-set convert of strings
 2003-08-19 00:08:08 +03:00
jani@rhols221.adsl.netsonic.fi
2a53d5a60e Fixed a limitation bug in mysqlimport. sql_statement was designed to 
contain max 1280 characters, but sometimes in rare cases when --columns
was used, more than 1280 characters was needed. This is case when a lot
of columns was specified using this option. Raised the max value to 8448,
which should be enough.
 2003-08-16 17:03:48 +03:00
monty@mashka.mysql.fi
2263e3e51f Merge with 4.0.14 2003-08-11 22:44:43 +03:00
kostja@oak.local
765053c838 Merge oak.local:/home/kostja/mysql/mysql-4.1-root 
into oak.local:/home/kostja/mysql/mysql-4.1
 2003-08-07 22:19:42 +04:00
vva@eagle.mysql.r18.ru
26abb7d368 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into eagle.mysql.r18.ru:/home/vva/work/mysql.orig/test/mysql-4.1
 2003-08-07 14:19:41 -04:00
vva@eagle.mysql.r18.ru
5ad00d9963 fixed bug with missing '\' in string constant in client/mysqldump.cc 2003-08-07 14:18:43 -04:00
kostja@oak.local
c23975aace Merge oak.local:/home/kostja/mysql/mysql-4.1-root 
into oak.local:/home/kostja/mysql/mysql-4.1
 2003-08-07 13:29:25 +04:00
kostja@oak.local
50d3291aee manual merge 2003-07-31 17:11:52 +04:00
bar@bar.mysql.r18.ru
44c0ca610e mysqldump.c: 
Use the default character set instead of binary. This is to make "mysqlshow" -> "cat'n'paste database name" -> "mysqldump dbname" circle working.
 2003-07-31 09:00:22 +05:00
hf@deer.(none)
e849dad4f3 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.2way
 2003-07-23 15:23:53 +05:00
vva@eagle.mysql.r18.ru
99aa453f37 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1 
into eagle.mysql.r18.ru:/home/vva/work/BUG_663/mysql-4.1
 2003-07-22 19:02:36 -04:00
vva@eagle.mysql.r18.ru
f32299279d fixed bug 663 and WL 1052 (sql_mode is safe for mysqldump) 2003-07-22 18:58:30 -04:00
kostja@oak.local
7dab500b7a Merge oak.local:/home/kostja/mysql/mysql-4.1-root 
into oak.local:/home/kostja/mysql/mysql-4.1
 2003-07-17 14:55:13 +04:00
vva@eagle.mysql.r18.ru
ac08d278b9 fixed bug Bug #683 (Prompt for password doesn't go to console for Windows) 2003-07-16 18:15:35 -04:00
hf@deer.(none)
11de0b35f7 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.2way
 2003-07-15 20:06:27 +05:00
ram@mysql.r18.ru
bc753e138c bugfix for the bugfix for the bug #539 2003-07-15 17:38:01 +05:00
ram@mysql.r18.ru
e1aaa670cc mysql should ignore ' " ` symbols inside comments (Bug #539). 2003-07-15 14:38:48 +05:00
kostja@oak.local
0f28677af6 Merge oak.local:/home/kostja/mysql/mysql-4.1-root 
into oak.local:/home/kostja/mysql/mysql-4.1
 2003-07-08 12:03:46 +04:00
vva@eagle.mysql.r18.ru
c96c87d51d fixed bug #670 2003-07-04 16:06:17 -04:00
hf@deer.(none)
9d4bae335c Resolving conflicts 2003-07-04 13:21:14 +05:00
monty@narttu.mysql.fi
f3af0d7ce4 Status query on killed mysql connection results in segmentation fault (Bug #738) 
Added MAX_PASSWORD_LENGTH. This increased master-slave passwords to 32 bytes (Bug #766)
Fixed server crash on purge master logs or show master logs when binlog is off. (Bug #733)
 2003-07-04 03:18:15 +03:00
monty@narttu.mysql.fi
f259f379e4 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into narttu.mysql.fi:/my/mysql-4.0
 2003-07-03 11:56:30 +03:00
monty@narttu.mysql.fi
c21728f8c8 Cleaner implementation if INSERT ... SELECT with same tables 
Tests cleanup (put drop database first in tests)
 2003-07-03 11:55:36 +03:00
vva@eagle.mysql.r18.ru
da9d454cc3 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0 
into eagle.mysql.r18.ru:/home/vva/work/BUG_672/mysql-4.0
 2003-07-02 17:37:23 -04:00
vva@eagle.mysql.r18.ru
55e046a807 fixed bug #672 2003-07-02 16:56:27 -04:00
venu@hundin.mysql.fi
19bc36241a Removed dbug.h inclussion from client/get_password.c (windows build fix) 2003-07-02 10:49:07 +03:00
Sinisa@sinisa.nasamreza.org
b7644c9212 merge changes 2003-07-02 00:26:23 +03:00
kostja@oak.local
7df0475847 First version of new authentification procedure: now authentification is one-stage (instead of two-stage in 4.1) 
For now following tasks have been done:
- PASSWORD() function was rewritten. PASSWORD() now returns SHA1
  hash_stage2; for new passwords user.password contains '*'hash_stage2; sql_yacc.yy also fixed; 

- password.c: new functions were implemented, old rolled back to 4.0 state

- server code was rewritten to use new authorization algorithm (check_user(), change
  user, and other stuff in sql/sql_parse.cc)

- client code was rewritten to use new authorization algorithm
  (mysql_real_connect, myslq_authenticate in sql-common/client.c)

- now server barks on 45-byte-length 4.1.0 passwords and refuses 4.1.0-style
  authentification. Users with 4.1.0 passwords are blocked (sql/sql_acl.cc)

- mysqladmin.c was fixed to work correctly with new passwords

Tests for 4.0-4.1.1, 4.1.1-4.1.1 (with or without db/password) logons was performed;
mysqladmin also was tested. Additional check are nevertheless necessary.
 2003-07-01 23:40:59 +04:00
vva@eagle.mysql.r18.ru
c34eec515e made error output more detailed 2003-07-01 14:00:57 -04:00
vva@eagle.mysql.r18.ru
a86d23b93a Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0 
into eagle.mysql.r18.ru:/home/vva/work/BUG_671/mysql-4.0
 2003-07-01 13:21:35 -04:00
vva@eagle.mysql.r18.ru
20081b6293 removed --table option (fixed Bug #671) 2003-07-01 13:17:03 -04:00
monty@mashka.mysql.fi
dfac0fc90a Allow one to use MERGE tables with tables from different databases 
Added command 'replace_column' to mysqltest
 2003-06-27 16:29:10 +03:00
Sinisa@sinisa.nasamreza.org
66b60b57af Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0 
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
 2003-06-25 18:40:31 +03:00
guilhem@mysql.com
e8a8b8c346 fix for BUG#691 (4.0 mysqlbinlog couldn't read 3.23 binlog). 
Safe parenthesis.
 2003-06-20 15:48:52 +02:00
hf@deer.(none)
b82e89d872 SCRUM 
merged conflicts about my previous commit
it seems there are some errors left - gonna check...
 2003-06-17 21:53:13 +05:00
hf@deer.(none)
c4e3a624b8 SCRUM 
client capabilities included into libmysqld
some API methods became "virtual"
lots of duplicated code removed

IMHO all the above made library's code way more pleasant to look at, didn't it?
 2003-06-17 21:32:31 +05:00
Sinisa@sinisa.nasamreza.org
833e3db2a7 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0 
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
 2003-06-17 16:24:31 +03:00
guilhem@mysql.com
3f33f17114 Fix for nightly build test failure (test update). 
More messages.
Testcase for bug 651.
 2003-06-16 15:49:54 +02:00
monty@narttu.mysql.fi
1e62d6070a Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into narttu.mysql.fi:/my/mysql-4.1
 2003-06-14 11:38:09 +03:00
monty@narttu.mysql.fi
a1034db4b9 Cleanup after split of libmysql.c to client.c and libmysql.c. A 4.1 master/slave will now use the 4.1 protocol 
Fixed wrong value for SQLSTATE_LENGTH
Added CLIENT_REMEMBER_OPTIONS to mysql_real_connect()
Changed mysql_port and mysql_unix_port to mysqld_xxxx
 2003-06-14 11:37:42 +03:00
serg@serg.mylan
9f67e10d0d consistency fix - all help texts for command-line options should end with a dot. 2003-06-13 10:59:02 +02:00
bar@bar.mysql.r18.ru
b80219f182 mysqldump.c: 
SET NAMES is not sent to server when SET NAMES is not dumped
  Server decides which character set to use in this case
 2003-06-10 12:07:02 +05:00
bar@bar.mysql.r18.ru
1ffc3cca56 mysqldump.c: 
SET NAMES is not produced in compatibility modes
 2003-06-10 11:34:00 +05:00
monty@narttu.mysql.fi
dad0664579 merge with public tree 2003-06-05 00:12:45 +03:00
monty@narttu.mysql.fi
40109c574a Merge with 4.0.13 2003-06-04 19:21:51 +03:00
monty@narttu.mysql.fi
23145cfed7 Added SQLSTATE to client/server protocol 
bmove_allign -> bmove_align
Added OLAP function ROLLUP
Split mysql_fix_privilege_tables to a script and a .sql data file
Added new (MEMROOT*) functions to avoid calling current_thd() when creating some common objects.
Added table_alias_charset, for easier --lower-case-table-name handling
Better SQL_MODE handling (Setting complex options also sets sub options)
New (faster) assembler string functions for x86
 2003-06-04 18:28:51 +03:00
Sinisa@sinisa.nasamreza.org
9bd57aa40e Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0 
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
 2003-06-02 14:14:10 +03:00
bar@bar.mysql.r18.ru
bb611fa0a2 mysqlshow and mysqldump now send their vharacter set to server 
character_set_results is now the same with character_set_client by default
 2003-05-30 23:09:35 +05:00
bar@bar.mysql.r18.ru
c7b3ee228f mysqldump.c: 
mysqldump now produces SET NAMES. It can be disabled by --no-set-names
 2003-05-30 15:21:03 +05:00
vva@eagle.mysql.r18.ru
b4014b903b new version of help 2003-05-29 17:47:31 -04:00
bar@bar.mysql.r18.ru
67c6703463 --with-collation argument for configure. Now one can for example use this: 
./configure --with-charset=latin1 --with-collation=latin1_danish_ci
 2003-05-28 16:23:04 +05:00
bar@bar.mysql.r18.ru
7ffcf6f64a "mysql" now sends client character set to server. 2003-05-28 13:54:18 +05:00
monty@narttu.mysql.fi
bdb66d24dd ORDER BY optimization 
Fixed new bug when reading field types
 2003-05-27 18:40:37 +03:00
monty@narttu.mysql.fi
381492093e Fixed problem with mysql prompt when server disconnect. (Bug 356) 
Fixed problem with localtime -> gmt where some times resulted in
different (but correct) timestamps. Now MySQL should use the smallest
possible timestamp value in this case.  (Bug 316)
 2003-05-27 16:40:14 +03:00
bar@bar.mysql.r18.ru
8192d169a2 CHARSET_INFO structure reorganization for easier maintainance 2003-05-23 17:45:52 +05:00
bar@bar.mysql.r18.ru
b1adadd510 mysqlimport.c, mysqldump.c, mysqlcheck.c: 
Bug fix: latin1 is not compiled charset and is not specified..
mysql.cc:
  Bug fix: latin1 is not compiled charset and is not specified...
 2003-05-22 14:37:01 +05:00
monty@mashka.mysql.fi
cb7061ebe4 merge 2003-05-22 02:57:27 +03:00
Sinisa@sinisa.nasamreza.org
9b35856c2f Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0 
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
 2003-05-21 21:58:12 +03:00
monty@mashka.mysql.fi
6aa8929cf3 After merge fixes 
Added initialization of all important global variables
 2003-05-21 21:39:58 +03:00
vva@eagle.mysql.r18.ru
666d46b6ee Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1 
into eagle.mysql.r18.ru:/home/vva/work/LOADDATA/mysql-4.1
 2003-05-20 17:03:50 -04:00
vva@eagle.mysql.r18.ru
ec247fd6af changed processing of LOAD DATA in mysqlbinlog 2003-05-20 17:03:18 -04:00
monty@narttu.mysql.fi
dd2b7918cd Merge with 4.0.13 2003-05-19 16:35:49 +03:00
guilhem@mysql.com
3d784a4177 changes to mysqladmin : use queries instead of commands (so that they have a chance to go 
into the binlog), SLAVE START -> START SLAVE, error test changes.
 2003-05-15 23:00:58 +02:00
monty@mashka.mysql.fi
5d5d5b08ac Merge to get security patch 2003-05-08 00:12:46 +03:00
monty@narttu.mysql.fi
51f9879008 Removed compiler warnings 
Fixed memory leak in new filesort code
Optimzed sub selects to use keys with outer references.
Increased max tables in join to 62
 2003-05-06 01:38:38 +03:00
monty@narttu.mysql.fi
ee8190f293 Merge 2003-05-02 15:22:04 +03:00
Sinisa@sinisa.nasamreza.org
07c2c4a67c A fix for the crashing bug in mysql client program 2003-05-01 20:01:39 +03:00
serg@serg.mylan
30ae0cdcc7 Merge bk-internal:/home/bk/mysql-3.23/ 
into serg.mylan:/usr/home/serg/Abk/mysql
 2003-04-28 20:09:38 +02:00
serg@sergbook.mysql.com
294cc19667 Merge bk-internal:/home/bk/mysql-4.0 
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0
 2003-04-24 01:44:26 +04:00
serg@sergbook.mysql.com
1d9d1221f0 do not execute \* commands inside identifiers 2003-04-23 22:46:47 +04:00
gluh@gluh.mysql.r18.ru
e6fe7d1bed Task 761:'mysqlbinlog should not die when reading 
unknown event'
 2003-04-23 18:00:07 +05:00
gluh@gluh.mysql.r18.ru
8379f5c4f9 Fix bug#68: ssl_test.c does not compile/work 2003-04-23 17:10:24 +05:00
jani@hynda.(none)
8c8ebd5c14 Added --delimiter option to mysql 2003-04-23 03:29:03 +03:00
monty@narttu.mysql.fi
98240b049f Removed some not used files 
Remove the 'fs' file systems as this is not maintained.
Moved programs from client to tests
 2003-04-22 22:41:59 +03:00
vva@eagle.mysql.r18.ru
4250b44dc9 fixed bug with locales in libedit 2003-04-06 20:14:36 -04:00
jani@hynda.(none)
cbd11df297 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into hynda.(none):/home/my/bk/mysql-4.0
 2003-04-03 21:19:12 +03:00
monty@narttu.mysql.fi
a7708c7904 Merge with 4.0 2003-04-03 21:19:12 +03:00
jani@hynda.(none)
75015595b1 Fixed a bug when printing error messages. stdout and stderr were 
mixed wrongly sometimes.
 2003-04-03 19:55:37 +03:00
monty@narttu.mysql.fi
618857b6eb Merge with 3.23 to get fixes for: 
mysqldump --delete-master-logs
Portability fix for hammer
Memory overrun for MyISAM
LOAD DATA LOCAL replication bug fix.
 2003-04-03 12:33:13 +03:00
bar@bar.mysql.r18.ru
0002beb7a4 my_strncasecmp() is not used anymore. Use my_strncoll() instead. 2003-04-01 14:17:28 +05:00
jani@dsl-kpogw4gb5.dial.inet.fi
66d9143a66 Added quotes around CREATE DATABASE IF EXISTS name if -Q was given. 2003-03-30 19:36:14 +03:00
jani@dsl-kpogw4gb5.dial.inet.fi
4336d4117e Added quotes around database name, when using -Q. 2003-03-29 16:59:03 +02:00
greg@mysql.com
080b73ee18 Manual merge of Novell's changes for NetWare platform from 4.0, 4.1 patches 2003-03-28 14:24:32 -05:00
greg@mysql.com
67985efed5 Post-4.0.12 changes from Novell: mostly NetWare-related code changes to utilize new LibC 2003-03-21 16:45:39 -05:00
jani@rhols221.adsl.netsonic.fi
3d090552da Fixed a bug in comment handling. 2003-03-21 14:14:36 +02:00
monty@narttu.mysql.fi
b883a9c01c Merge with 4.0.12 2003-03-19 22:25:44 +02:00
guilhem@mysql.com
45e3de8f32 Do not silently do RESET MASTER when one does 'mysqldump --master-data' ; 
only do it if the user specifies --delete-master-logs (new option).
Safer + fixes bug #159.
 2003-03-19 15:16:51 +01:00
lenz@mysql.com
04071da35a - renamed "rnd" to "my_rnd" as the name was too generic (and is an exported 
symbol in libmysqlclient) (thanks to Dennis Haney for the initial patch)
 - cleanup: removed client/password.c (not used at all) and
   libmysql/password.c (should rather be a symlink to sql/password.c instead)
 - applied HPUX11 portability fix for char_val declaration to sql/password.c
   (taken from libmysql/password.c)
 2003-03-18 22:14:02 +01:00
serg@serg.mysql.com
018a9b7058 crash fix 2003-03-17 19:39:01 +01:00
jani@hynda.(none)
5eddd40bc9 Fixed a bug in --one-database. 2003-03-17 15:50:56 +02:00
monty@narttu.mysql.fi
a434bca704 Merge with 4.0 2003-03-16 19:17:54 +02:00
root@home.(none)
1daed63ed8 mysqltest.c, mysqlimport.c, mysqldump.c, mysqlcheck.c, mysql.cc: 
system_charset_info was removed
 2003-03-16 11:20:45 +04:00
root@home.(none)
f71a7e4b05 set_default_charset() is not used anymore 
Some system_charset_info were removed
 2003-03-16 10:56:14 +04:00
lenz@mysql.com
efbb9d45c1 - fixed C++-style comments to make IBM C compiler happy 2003-03-15 18:42:55 +01:00
Sinisa@sinisa.nasamreza.org
eebc00a531 A fix for mysql client program when use or connect were used 
without arguments ...
 2003-03-12 21:43:40 +02:00
gluh@gluh.mysql.r18.ru
6253889109 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0 
into gluh.mysql.r18.ru:/home/gluh/mysql-4.0.last
 2003-03-11 13:52:19 +04:00
gluh@gluh.mysql.r18.ru
00314bfd88 Openssl test 2003-03-11 13:41:53 +04:00
monty@mashka.mysql.fi
d56e2acf50 Merge to get fix for LOCK TABLES + DROP TABLE in another thread 2003-03-07 01:20:56 +02:00