guilhem@mysql.com
84bc0db087
Fix for BUG#7850: force the transaction isolation level to REPEATABLE READ when --single-transaction
2005-01-13 00:44:13 +01:00
monty@mysql.com
f4274fe9be
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-01-11 19:35:00 +02:00
hf@deer.(none)
196c95e938
Merging conflicts resolved
2005-01-11 21:00:53 +04:00
monty@mysql.com
2677a1c46b
Review of new pushed code
...
Indentation cleanup
2005-01-11 18:55:53 +02:00
hf@deer.(none)
8b3b364893
Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.5920
2005-01-11 19:58:52 +04:00
pekka@mysql.com
195f7bda02
Merge
2005-01-08 22:34:16 +01:00
serg@sergbook.mylan
247052fecc
few harmless warnings from automated code-checking tools fixed
2005-01-08 21:25:31 +01:00
jimw@mysql.com
5010be1d8b
Merge mysql.com:/home/jwinstead2/mysql-4.1-clean
...
into mysql.com:/home/jwinstead2/mysql-5.0
2005-01-06 21:39:57 +01:00
bell@sanja.is.com.ua
a8861fe9ec
Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
2005-01-06 20:49:27 +02:00
bell@sanja.is.com.ua
d944dc9a78
postreview changes
2005-01-06 20:47:08 +02:00
bell@sanja.is.com.ua
779c33a5e7
fixed comparation with string constant on some platform (BUG#7651)
2005-01-06 19:13:58 +02:00
jimw@mysql.com
d4b236fe8f
Merge mysql.com:/home/jwinstead2/mysql-4.1-7451
...
into mysql.com:/home/jwinstead2/mysql-4.1-clean
2005-01-06 17:27:48 +01:00
jimw@mysql.com
9971b2f0f5
Add support for --default-character-set to mysqladmin (Bug #7524 )
2005-01-06 01:08:03 +01:00
jimw@mysql.com
4d025523e5
Fix "mysqladmin password" to use correct password scrambling function when
...
talking to pre-4.1 servers or 4.1 and later servers where the old_passwords
option is enabled. "mysqladmin old-password" is unchanged. (Bug #7451 )
2005-01-05 21:56:18 +01:00
hf@deer.(none)
5eb5fd12be
fix for bug #5920 (embedded-server mysql doesn't handle --defaults-file)
2005-01-03 19:21:54 +04:00
wax@mysql.com
36edf8297a
Merge mysql.com:/home/wax/mysql/mysql-4.1
...
into mysql.com:/home/wax/mysql/mysql-4.1test2
2005-01-02 20:01:08 +05:00
wax@kishkin.ru
9d5fc07494
WL#964
...
move my_end() after free_used_memory()
2005-01-02 19:58:49 +05:00
serg@sergbook.mysql.com
a04fc26c54
manually merged
2004-12-31 15:26:24 +01:00
dlenev@mysql.com
536cb92195
Manual merge.
2004-12-31 12:48:27 +03:00
monty@mysql.com
34d5331cee
Merge with global tree
2004-12-31 00:50:30 +02:00
dlenev@mysql.com
a8deefa3dd
Manual merge of patch implementing WL#1339 with main tree.
2004-12-29 22:35:16 +03:00
dlenev@brandersnatch.localdomain
ffa7393330
WL#1339 "Add per account max_user_connections limit (maximum number
...
of concurrent connections for the same account)"
Added support of account specific max_user_connections limit. Made all
user limits to be counted per account instead of the old behavior,
which was per user/host accounting. Added option which enables the old
behavior. Added testing of these to the test suite.
(After review version).
2004-12-29 20:30:37 +03:00
serg@serg.mylan
cf6e2214d8
client/mysqldump.c
...
compilation failure fixed
cleanup
2004-12-28 17:33:49 +01:00
lars@mysql.com
967fac4ef6
WL#2319 V2: Exclude tables from dump
...
- Added a hash to keep track of database-table pairs.
- Specified database-table tables do not get dumped
2004-12-27 19:10:30 +01:00
bar@mysql.com
e53b446a73
Bug#7020: mysqldump --compatible=mysql40 still dumps in UTF8
...
See mysqldump.test comments for more details
2004-12-22 16:02:27 +04:00
monty@mishka.local
4f4bbfc279
Merge with 4.1
2004-12-22 13:54:39 +02:00
ram@gw.mysql.r18.ru
22f3ca4d8e
A fix (bug #7283 : Test failure: 'update' (using '--ps-protocol': server crash)).
2004-12-20 20:18:17 +04:00
paul@frost.snake.net
66f0ff16a3
mysql.cc:
...
Fix up mysql help messages.
2004-12-18 14:30:00 -06:00
guilhem@mysql.com
884663662b
Fix for BUG#7358: removing warning reporting of mysqldump 4.1.8 when calling SHOW CREATE DATABASE, as we deal almost gracefully with it
...
(back to behaviour of 4.1.7). Warning was not fatal: mysqldump continued. And the good thing is that it helped spot that starting from 4.1.7,
SHOW CREATE DATABASE failed (if --single-transaction and first db has non-empty InnoDB table and there is a second db) and thus mysqldump
produced CREATE DATABASE statements missing the CHARACTER SET clause. Removing the bug which was in the server, and the warning reporting in
mysqldump (compatibility with old servers).
2004-12-17 23:37:43 +01:00
wax@kishkin.ru
e81d48fdd9
corrected mysqltest.dsp
...
corrected mysql_test_run_new.dsp
added dependency
corrected path of mysql_test_run_new.dsp
fixed wrong code
added my_create_tables.c
removed command_line
fixed #elif
restored NAME_MAX and MAX_FNAME
added create_system_files()
added compare() for windows
added all files of testes in script
added mysql-test in script
2004-12-14 18:46:55 +05:00
anjuta@arthur.local
f9451974be
WL#1051, more maintanable error messages.
2004-12-13 22:51:54 +02:00
monty@mysql.com
3b14ba64fd
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2004-12-12 18:44:15 +02:00
gluh@gluh.mysql.r18.ru
58e75f6f24
fix according to review
2004-12-10 18:25:12 +03:00
kent@mysql.com
081fdcc2e1
Makefile.am:
...
Moved "../regex/libregex.a" before "../libmysql/libmysqlclient.la"
when linking. For -all-static linking libtool put -lc after the .la
file and this put the libc regex functions before our regex functions
when linking on Linux.
2004-12-10 13:06:58 +01:00
gluh@gluh.mysql.r18.ru
2e912bbbe8
Don't display 'usage' privilege in TABLE_PRIVILEGES if we have columns privileges
...
mysqldump skips information_schema db
'use' now can use information_schema db
changed value of column 'Null' to 'NO' if column is not nullable
2004-12-10 12:07:11 +03:00
monty@mysql.com
36d11d950a
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2004-12-10 02:58:39 +02:00
guilhem@mysql.com
eac128ef2d
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/mysql_src/mysql-5.0-clean
2004-12-09 15:42:06 +01:00
guilhem@mysql.com
1cbc904c59
Changing the default of libmysqlclient : it's now NO reconnection.
...
All our programs which use mysql_real_connect() and mysql_connect() are updated accordingly, though I have deliberately
made mysqlimport not reconnect anymore (already true for mysqldump >= 4.1.8).
All Connector devs have been warned about the change I'm doing here - which was agreed with Monty,
and fixes BUG#2555.
2004-12-09 14:44:10 +01:00
monty@mysql.com
b68f2307e0
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-12-09 12:50:37 +02:00
monty@mysql.com
01e4740f4c
Ensure that we free memory used with --order-by-primary (in mysqldump)
...
Simple, non critical, fix to mysql_fix_privilege_tables
2004-12-09 12:47:20 +02:00
monty@mysql.com
1316954b3f
Fixed that mysql-test-run --ps-protocol works with system_mysql_db_fix.test
2004-12-08 01:17:52 +02:00
monty@mysql.com
77207d19f2
Merge with new VARCHAR code
2004-12-06 19:18:35 +02:00
monty@mysql.com
0de4777187
Merge with 4.1
2004-12-06 11:38:56 +02:00
monty@mysql.com
67ce247965
Add support for up to VARCHAR (size up to 65535)
...
Renamed HA_VAR_LENGTH to HA_VAR_LENGTH_PART
Renamed in all files FIELD_TYPE_STRING and FIELD_TYPE_VAR_STRING to MYSQL_TYPE_STRING and MYSQL_TYPE_VAR_STRING to make it easy to catch all possible errors
Added support for VARCHAR KEYS to heap
Removed support for ISAM
Now only long VARCHAR columns are changed to TEXT on demand (not CHAR)
Internal temporary files can now use fixed length tables if the used VARCHAR columns are short
2004-12-06 02:00:37 +02:00
serg@serg.mylan
9c23871867
help text corrected
2004-12-04 10:06:38 +01:00
tsmith@build.mysql.com
88f48f33c5
Merge bk-internal:/home/bk/mysql-4.1
...
into build.mysql.com:/users/tsmith/m/41/b
2004-12-02 15:33:12 +01:00
konstantin@mysql.com
dc4f845103
Fix for Bug#6377 "Password Generation Discrepancy"
2004-12-02 14:28:59 +03:00
brian@avenger.(none)
b85f4677d5
Merge for Matt for Innodb bug.
2004-11-30 10:10:40 -08:00
ram@gw.mysql.r18.ru
0ca8fd2ee9
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6101
2004-11-30 12:27:17 +04:00
tsmith@build.mysql.com
c02e81b018
Merge
2004-11-30 03:24:17 +01:00