mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 21:12:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
7031 commits 2784 branches 343 tags 1.6 GiB
Commit graph

511 commits

Author SHA1 Message Date
serg@serg.mylan
9d198d35bf merged 2003-10-07 20:41:07 +02:00
monty@narttu.mysql.fi
b82b76f480 Simple cleanups 2003-10-07 15:44:31 +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
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
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
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
a6e3ee6bef Better quoting patch for mysqldump 2003-09-03 18:48:10 +03: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
a2a1e97226 Portability fixes 2003-08-28 22:18:02 +03: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
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
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
vva@eagle.mysql.r18.ru
c96c87d51d fixed bug #670 2003-07-04 16:06:17 -04: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
Sinisa@sinisa.nasamreza.org
b7644c9212 merge changes 2003-07-02 00:26:23 +03: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
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