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
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
