database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-10-30 04:26:45 +03:00
Code Activity
9,493 Commits 3,247 Branches 1,092 Tags
1d20c09ce94e8897079278aee293c151a6aa5513
Commit Graph

130 Commits

Author SHA1 Message Date
monty@mashka.mysql.fi
73f66f68fd merge with 4.0.15 2003-09-11 20:24:14 +03: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
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
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
ram@mysql.r18.ru
3e9c55590a Fix for the bug #1125 mysqldump -X creates invalid XML 2003-08-28 19:27:46 +05: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
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
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
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
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
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
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
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@narttu.mysql.fi
dd2b7918cd Merge with 4.0.13 2003-05-19 16:35:49 +03:00
monty@mashka.mysql.fi
5d5d5b08ac Merge to get security patch 2003-05-08 00:12:46 +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
monty@narttu.mysql.fi
a7708c7904 Merge with 4.0 2003-04-03 21:19:12 +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
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
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
serg@serg.mysql.com
018a9b7058 crash fix 2003-03-17 19:39:01 +01: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
113e499b43 - Changed C++-style comments to C-style comments to make IBM compiler happy 2003-03-06 13:51:37 +01:00
serg@serg.mysql.com
cc2dda24b6 Merge work:/home/bk/mysql-4.0 
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
 2003-02-18 20:35:57 +01:00
monty@mashka.mysql.fi
90bf074438 Merge with 4.0.11 tree to get latest bug fixes 2003-02-17 05:43:37 +02:00
monty@mashka.mysql.fi
a533db746b Patch for novell 
Reverted wrong patch for mysqld_safe.sh
 2003-02-16 22:50:00 +02:00
serg@serg.mysql.com
474d013696 Merge serg.mysql.com:/usr/home/serg/Abk/mysql-4.0 
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1
 2003-02-13 17:12:52 +01:00
serg@serg.mysql.com
6bb42870e0 do not ignore --allow-keywords if SHOW CREATE TABLE is used 2003-02-12 20:46:40 +01:00
monty@mashka.mysql.fi
023d6dd39b Merge with 4.0.11 2003-02-04 21:52:14 +02:00
monty@mashka.mysql.fi
689578a099 Fixes for Netware 
Call pthread_mutex_destroy() on not used mutex.
Changed comments in .h and .c files from // -> /* */
Added detection of mutex on which one didn't call pthread_mutex_destroy()
Fixed bug in create_tmp_field() which causes a memory overrun in queries that uses "ORDER BY constant_expression"
Added optimisation for ORDER BY NULL
 2003-01-28 08:38:28 +02:00
jani@rhols221.adsl.netsonic.fi
e79ed81d11 Added --compatible mode to mysqldump. 2003-01-16 05:35:59 +02:00
monty@mashka.mysql.fi
dac6498f9b Merge with 4.0 2002-11-21 15:56:48 +02:00
vva@genie.(none)
c50ecbb1d0 fix xml-output of mysqldump 2002-11-18 20:50:42 +04:00
wax@mysql.com
e91d1b2cbe Add shared memory protocol and option --protocol 2002-11-15 00:16:30 +05:00
bar@bar.mysql.r18.ru
9567611577 Fix syntax to be more clean: 
SHOW CREATE DATABASE [WITH IF NOT EXISTS] dbname
 2002-11-10 14:45:21 +04:00
bar@bar.mysql.r18.ru
8229d282f7 Extensions to support this: 
SHOW CREATE DATABASE [IF NOT EXISTS] dbname

Version dependant parts are displayed in appropriative comments:
CREATE DATABASE /*!32312 IF NOT EXISTS*/ `ucs` /*!40100 DEFAULT CHARACTER SET ucs2*/
 2002-11-06 12:01:38 +04:00
bar@bar.mysql.r18.ru
cebfa22c01 CREATE DATABASE now tries to execute SHOW CREATE DATABASE first 2002-11-05 15:10:13 +04:00
monty@mashka.mysql.fi
0f39457613 Merge with 4.0.4 2002-10-02 17:55:12 +03:00