mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 03:21:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
57139 commits 2791 branches 343 tags 1.7 GiB
Commit graph

3131 commits

Author SHA1 Message Date
mkindahl@dl145h.mysql.com
0c7f3bdeba Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
 2007-11-21 21:15:33 +01:00
mkindahl@dl145h.mysql.com
3cf2733086 Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
 2007-11-21 21:11:57 +01:00
tsmith@ramayana.hindu.god
56b9199ba3 Merge ramayana.hindu.god:/home/tsmith/m/bk/build/b25146/51 
into  ramayana.hindu.god:/home/tsmith/m/bk/build/51
 2007-11-20 20:35:14 -07:00
tsmith@ramayana.hindu.god
6a193c5528 Bug #25146: Some warnings/errors not shown when using --show-warnings 
In several cases, an error when processing the query would cause mysql to
return to the top level without printing warnings.  Fix is to always
print any available warnings before returning to the top level.
 2007-11-20 17:03:56 -07:00
guilhem@gbichot4.local
2bcf5b4e97 BUG#27850 "mysqldump --single-transaction does not work if TRUNCATE/DROP/RENAME/ALTER": 
this has already been closed by a note in the manual, now we
complete this by a note in "mysqldump --help"
 2007-11-20 10:25:07 +01:00
kaa@polly.(none)
4cbcdb9b88 Merge polly.(none):/home/kaa/src/opt/bug32376/my51-bug26215 
into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt
 2007-11-19 16:16:44 +03:00
kaa@polly.(none)
ee1bb66368 Merge polly.(none):/home/kaa/src/opt/bug32376/my50-bug26215 
into  polly.(none):/home/kaa/src/opt/mysql-5.0-opt
 2007-11-19 16:14:05 +03:00
kaa@polly.(none)
74bc350bcc Merge polly.(none):/home/kaa/src/opt/bug32376/my50-bug26215 
into  polly.(none):/home/kaa/src/opt/bug32376/my51-bug26215
 2007-11-19 15:57:50 +03:00
kaa@polly.(none)
b93bbc5ea6 Changed the help text for --comments to make it clear which option 
disables the option explicitely.
Changed the option location in code so that --help will show it in
lexical option order.

This is for bug #26215: mysql command line client should not strip
comments from SQL statements
 2007-11-19 15:27:44 +03:00
evgen@moonbone.local
c406150f34 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  moonbone.local:/work/30081-bug-5.1-opt-mysql
 2007-11-13 13:29:42 +00:00
evgen@moonbone.local
4fa7ee92e6 Bug#30081: "ON UPDATE CURRENT_TIMESTAMP" wasn't shown by the SHOW FIELDS 
command and reported to a client.

The fact that a timestamp field will be set to NO on UPDATE wasn't shown 
by the SHOW COMMAND and reported to a client through connectors. This led to
problems in the ODBC connector and might lead to a user confusion.

A new filed flag called ON_UPDATE_NOW_FLAG is added. 
Constructors of the Field_timestamp set it when a field should be set to NOW
on UPDATE.

The get_schema_column_record function now reports whether a timestamp field
will be set to NOW on UPDATE.
 2007-11-13 13:24:48 +00:00
jani@hynda.mysql.fi
e8d8102a93 Merge hynda.mysql.fi:/home/my/mysql-5.1-main 
into  hynda.mysql.fi:/home/my/mysql-5.1-marvel
 2007-11-08 13:23:08 +02:00
msvensson@pilot.mysql.com
64019f014d Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-maint 
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-new-maint
 2007-11-06 11:07:30 +01:00
kaa@polly.(none)
fdaec60f18 Merge polly.(none):/home/kaa/src/opt/bug26215/my51-bug26215 
into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt
 2007-11-05 14:48:39 +03:00
kaa@polly.(none)
02b913ad26 Merge polly.(none):/home/kaa/src/opt/bug26215/my50-bug26215 
into  polly.(none):/home/kaa/src/opt/mysql-5.0-opt
 2007-11-05 14:45:55 +03:00
kaa@polly.(none)
6b828c8288 Merge polly.(none):/home/kaa/src/opt/bug26215/my50-bug26215 
into  polly.(none):/home/kaa/src/opt/bug26215/my51-bug26215
 2007-11-05 13:32:14 +03:00
kaa@polly.(none)
910003b544 Fixed code that parses the DELIMITER command to correctly calculate 
the length of the remaining input string.

This is to fix mysqldump test failure in PB introduced by the patch
for bug #26215.
 2007-11-05 13:30:31 +03:00
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
5fb96884d1 Merge pilot.mysql.com:/data/msvensson/mysql/bug31004/my50-bug31004 
into  pilot.mysql.com:/data/msvensson/mysql/bug31004/my51-bug31004
 2007-11-01 16:49:39 +01:00
msvensson@pilot.mysql.com
53bc1d5c25 Bug#31004 mysqltest needs a --mkdir command 
- Add new mysqltest command "mkdir" and "rmdir"
 2007-11-01 15:42:19 +01:00
msvensson@pilot.mysql.com
ec5ee6f5e4 Fix comment 2007-11-01 11:01:05 +01:00
msvensson@pilot.mysql.com
3ef9cb4ed9 Backport mysqltests "change_user" command 2007-10-31 18:44:31 +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