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

2859 commits

Author SHA1 Message Date
kaa@polly.(none)
e4403f2eb3 Merge polly.(none):/home/kaa/src/opt/bug26215/my51-bug26215 
into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt
 2007-11-02 17:26:28 +03:00
kaa@polly.(none)
fa462599ca Merge polly.(none):/home/kaa/src/opt/bug26215/my50-bug26215 
into  polly.(none):/home/kaa/src/opt/mysql-5.0-opt
 2007-11-02 17:23:12 +03:00
kaa@polly.(none)
794274ab10 5.1-specific changes for bug #26215 after merging the patch from 5.0: 
- Added trigger tests back.
- Fixed test cases to match the extended output format of SHOW CREATE ...
- Replaced 'gptr' with 'uchar *'.
 2007-11-02 16:40:08 +03:00
kaa@polly.(none)
4b12f94394 Merge polly.(none):/home/kaa/src/opt/bug26215/my50-bug26215 
into  polly.(none):/home/kaa/src/opt/bug26215/my51-bug26215
 2007-11-02 13:44:23 +03:00
kaa@polly.(none)
9cd5f49c53 Fix for: 
bug #26215: mysql command line client should not strip comments
              from SQL statements
and
  bug #11230: Keeping comments when storing stored procedures

With the introduction of multiline comments support in the command line
client (mysql) in MySQL 4.1, it became impossible to preserve
client-side comments within single SQL statements or stored routines.
This feature was useful for monitoring tools and maintenance.

The patch adds a new option to the command line client
('--enable-comments', '-c') which allows to preserve SQL comments and
send them to the server for single SQL statements, and to keep comments
in the code for stored procedures / functions / triggers.

The patch is a modification of the contributed patch from bug #11230
with the following changes:
- code style changes to conform to the coding guidelines
- changed is_prefix() to my_strnncoll() to detect the DELIMITER
command, since the first one is case-sensitive and not charset-aware
- renamed t/comments-51.* to t/mysql_comments.*
- removed tests for comments in triggers since 5.0 does not have SHOW
CREATE TRIGGER (those tests will be added back in 5.1).

The test cases are only for bug #11230. No automated test case for bug
#26215 is possible due to the test suite deficiencies (though the cases
from the bug report were tested manually).
 2007-11-02 13:40:34 +03:00
gluh@mysql.com/eagle.(none)
b0e9fa31af Bug#31113 mysqldump 5.1 can't handle a dash ("-") in database names 
db name should be quoted. this code does communication with the server.
it's always ok to quote names in this case.
 2007-11-02 12:24:45 +04:00
msvensson@pilot.mysql.com
925f4dac99 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-maint
 2007-11-01 16:55:16 +01:00
msvensson@pilot.mysql.com
ec5ee6f5e4 Fix comment 2007-11-01 11:01:05 +01:00
ramil/ram@ramil.myoffice.izhnet.ru
c41f8b65b5 Merge mysql.com:/home/ram/work/mysql-5.1-maint 
into  mysql.com:/home/ram/work/b30679/b30679.5.1
 2007-10-31 11:40:53 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
030d1a1945 Merge mysql.com:/home/ram/work/mysql-5.1-maint 
into  mysql.com:/home/ram/work/b30654/b30654.5.1
 2007-10-31 11:01:52 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
0a11bc2a1f Merge mysql.com:/home/ram/work/b30654/b30654.5.0 
into  mysql.com:/home/ram/work/b30654/b30654.5.1
 2007-10-31 10:57:10 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
38b3b36754 Fix for bug #30654: mysqlcheck fails during upgrade of tables whose 
names include backticks or blank

Problem: mysqlcheck doesn't escape backtick characters in the table names.

Fix: escape them.
 2007-10-30 12:51:57 +04:00
bar@bar.myoffice.izhnet.ru
628b462881 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/bar/mysql-work/mysql-5.0-rpl-merge
 2007-10-30 12:21:44 +04:00
bar@bar.myoffice.izhnet.ru
70488d7dfe Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/bar/mysql-work/mysql-5.1-new-rpl-merge
 2007-10-30 12:03:34 +04:00
cmiller@zippy.cornsilk.net
61621a9791 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-recentcommmerge 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1
 2007-10-29 12:42:06 -04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
bb79b4662f Fix for bug #30679: 5.1 name encoding not performed for views during upgrade 
Problem: we skip views perfoming --fix-table-names.

Fix: rename views as well.
 2007-10-24 22:36:57 +05:00
bar@bar.myoffice.izhnet.ru
811e64de62 Merge mysql.com:/home/bar/mysql-work/mysql-5.0 
into  mysql.com:/home/bar/mysql-work/mysql-5.0-rpl-mr
 2007-10-24 10:49:46 +05:00
gluh@eagle.(none)
17acda6ca8 Merge mysql.com:/home/gluh/MySQL/Merge/5.1 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
 2007-10-23 19:08:21 +05:00
gluh@eagle.(none)
237383f0fe Merge mysql.com:/home/gluh/MySQL/Merge/5.0 
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
 2007-10-23 18:51:43 +05:00
malff@lambda.hsd1.co.comcast.net.
94b4f4a870 Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-rt-merge
 2007-10-18 19:21:07 -06:00
malff@lambda.hsd1.co.comcast.net.
2d6fbbda59 Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-base 
into  lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-rt-merge
 2007-10-18 16:57:51 -06:00
brian@zim.(none)
f9046eafbf Fix for bug#31704 
Just had to put in the removal of the autocommit, and make sure the commit occurred at the propper time.
 2007-10-18 15:08:27 -07:00
davi@moksha.com.br
253439874a Bug#31608 missing mysqltest change_user command 
Post merge fixes: close any open statement before
the change user command and fix test case output.
 2007-10-17 16:43:30 -03:00
cmiller@zippy.cornsilk.net
f3d77c1979 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-comeng-unification 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-recentcommmerge
 2007-10-17 14:05:43 -04:00
davi@moksha.com.br
c3447cef35 Bug#31608 missing mysqltest change_user command 
The problem is that currently there is no way to test the behavior
of the mysql_change_user() function using the mysqltest suite because
there is no internal command for it.

The solution is to introduce a change_user command that can be used
to test aspects of the MySQL client function mysql_change_user().
 2007-10-16 12:29:22 -03:00
tsmith@ramayana.hindu.god
d207867cf5 Fix compiler warning (use correct data type) 2007-10-09 18:45:29 -06:00
iggy@alf.(none)
5e98415d4a Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  alf.(none):/src/bug28774/my50-bug28774
 2007-10-08 22:40:30 -04:00
iggy@alf.(none)
a4ba236948 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  alf.(none):/src/bug28774/my51-bug28774
 2007-10-08 22:37:07 -04:00
iggy@alf.(none)
c9a19e5454 Merge alf.(none):/src/bug28774/my50-bug28774 
into  alf.(none):/src/bug28774/my51-bug28774
 2007-10-08 22:32:26 -04:00
iggy@alf.(none)
19107288e4 Bug#28774 mysql_upgrade creates tempfiles in root-dir (C:\) and 
doesn't clean them up
- Make sure to cleanup temporary files after use.
 2007-10-08 22:30:41 -04:00
iggy@alf.(none)
dfe6c1772a Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  alf.(none):/src/bug28535/my51-bug28535
 2007-10-08 17:46:14 -04:00
iggy@alf.(none)
6a7947b8ab Bug#28535 mistake in mysqldump error message 
- Fixed error message.
 2007-10-08 17:43:32 -04:00
kostja@bodhi.(none)
53b0324824 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
 2007-10-08 02:05:10 +04:00
msvensson@pilot.mysql.com
53975763b8 Merge msvensson2.mysql.internal:mysql/mysql-5.0-maint 
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-maint
 2007-10-05 19:32:14 +02:00
msvensson@shellback.(none)
9571e7ec87 Update for 5.1 format of dirname_part 2007-10-05 18:22:28 +02:00
msvensson@shellback.(none)
d376c3da5e Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2007-10-05 18:19:37 +02:00
msvensson@shellback.(none)
39a069b296 Bug#31398 problems with mysql-test-run, part2 
Write .reject file to r/ if it's writable else use opt_logdir
 2007-10-05 18:18:50 +02:00
gluh@mysql.com/eagle.(none)
e2614270c3 after merge fix 2007-10-04 15:35:45 +05:00
aelkin/elkin@koti.dsl.inet.fi
4c6e14ce8d Merge koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0 
into  koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/5.1-merge
 2007-10-04 12:27:14 +03:00
gluh@eagle.(none)
53fa81ac03 Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
 2007-10-04 14:23:55 +05:00
bar@mysql.com/bar.myoffice.izhnet.ru
2b42750a51 Bug#29323 mysql client only accetps ANSI encoded files 
Fix: ignore BOM marker in the first line.
 2007-10-04 13:06:01 +05:00
tnurnberg@sin.intern.azundris.com
34d43d3b04 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  sin.intern.azundris.com:/home/tnurnberg/30444/51-30444
 2007-10-04 08:53:39 +02:00
tnurnberg@sin.intern.azundris.com
c8a6f30a5b Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  sin.intern.azundris.com:/home/tnurnberg/30444/50-30444
 2007-10-04 08:42:36 +02:00
tnurnberg@sin.intern.azundris.com
2686905392 Merge sin.intern.azundris.com:/home/tnurnberg/30444/50-30444 
into  sin.intern.azundris.com:/home/tnurnberg/30444/51-30444
 2007-10-04 08:38:27 +02:00
tnurnberg@sin.intern.azundris.com
fee111cd29 Merge sin.intern.azundris.com:/home/tnurnberg/30444/41-30444 
into  sin.intern.azundris.com:/home/tnurnberg/30444/50-30444
 2007-10-04 08:32:43 +02:00
tnurnberg@sin.intern.azundris.com
c623e73e8f Bug #30444: 5.0 mysqldump silently allows wrong backup to be taken against a 4.0 database 
The combination of --single-transaction and --master-data requires
START TRANSACTION WITH CONSISTENT SNAPSHOT which is available from
mysqld 4.1 on. When trying this against an older server, print
diagnostic, then, if --force is not given, abort.

No test-case given since it would require a mysqld < 4.1.
 2007-10-04 08:27:03 +02:00
gshchepa/uchum@gleb.loc
c81751adba mysqldump.c, mysqldump.test, mysqldump.result: 
Bug #31077: post-commit fix.
 2007-10-03 02:50:38 +05:00
gshchepa/uchum@gleb.loc
5fc81ee88e Fixed bug #31077. 
mysqldump adds the "-- Dump completed on YYYY-MM-DD hh:mm:ss" string
to the end of output if the --comments switch is on.
The only way to suppress this line is to use --skip-comments/--compact
switch.

New switch has been added to the mysqldump client command line:
--dump-date.

For the compatibility with previous releases, by default the --dump-date
is on.
The --dump-date switch forces mysqldump to add date to the
"-- Dump completed on ..." string at the end of output.
The --skip-dump-date switch supresses the output of date string
and uses short form of that commentary: "-- Dump completed".
--skip-comments or --compact switches disable the whole commentary
as usual.
 2007-10-01 20:35:51 +05:00
anozdrin/alik@station.
0635a75f4a Fix compilation warnings. 2007-10-01 00:16:50 +04:00
anozdrin/alik@station.
95e01d4453 Fix compile warnings. 2007-09-29 23:31:08 +04:00