pem@mysql.com
7b13840a46
Merge
2003-12-18 17:51:43 +01:00
jani@rhols221.arenanet.fi
c1bde7d8bd
Removed unneccessary sprintf call and a variable.
2003-12-18 13:56:13 +02:00
pem@mysql.comhem.se
bb51272bd1
Post-merge fixes.
...
Multiple result sets from stored procedures now works with the
mysql and mysqltest clients.
2003-12-16 18:09:22 +01:00
pem@mysql.com
975061bb5a
Merge 4.1 to 5.0.
2003-12-16 16:12:28 +01:00
jani@rhols221.adsl.netsonic.fi
5678574922
Fixed parenthesis needed by valgrind-max.
2003-12-16 16:03:39 +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
serg@serg.mylan
6a7a91ba4d
mysqldump version updated
2003-12-11 12:02:26 +01:00
pem@mysql.com
24a2ae44a3
Merged 4.1 -> 5.0
2003-12-09 19:00:34 +01: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
pem@mysql.com
6e717133c5
Merge 4.1 to 5.0
2003-12-01 16:14:40 +01: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
pem@mysql.com
28a2c6a96b
Merging 4.1->5.0.
2003-11-19 15:19:46 +01: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
pem@mysql.com
337238b78a
Merging 4.1->5.0
2003-10-22 16:10:22 +02: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
pem@mysql.telia.com
6e55a3428a
Post-merge fixes.
2003-09-24 15:26:20 +02:00
ram@gw.mysql.r18.ru
5e07599ebe
#1169 : Add --exec command to mysqltest
2003-09-24 16:13:47 +05:00
pem@mysql.com
8d884c02bb
Merging 4.1 -> 5.0
2003-09-24 11:29:38 +02: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