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
tsmith@ramayana.hindu.god
6668554a8d Merge ramayana.hindu.god:/home/tsmith/m/bk/51 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2008-01-22 15:56:15 -07:00
kaa@kaamos.(none)
0cec5f8e4b Merge kaamos.(none):/data/src/mysql-5.1 
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
 2008-01-10 20:44:23 +03:00
tsmith@ramayana.hindu.god
68980477dd Merge ramayana.hindu.god:/home/tsmith/m/bk/51 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2008-01-04 19:59:37 -07:00
joerg@trift2.
9f96125023 Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-12-21 12:53:05 +01:00
df@pippilotta.erinye.com
bea1bfd5c7 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-12-21 09:44:08 +01:00
serg@janus.mylan
d9ca7b670e Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  janus.mylan:/usr/home/serg/Abk/mysql-5.1
 2007-12-20 22:11:37 +01:00
df@pippilotta.erinye.com
f7527b7856 BUG#33057 mysql command line client slows down and uses 100% CPU when restoring dump 2007-12-20 21:37:21 +01:00
brian@zim.(none)
97e3c6cbf4 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch 
into  zim.(none):/home/bk/mysql-5.1-arch
 2007-12-20 12:32:16 -08:00
brian@zim.(none)
4316829b75 client_priv.h: 
Removed dead option
mysqlslap.c:
  Updates from Paul for help.
  Removed dead option
 2007-12-20 12:23:35 -08:00
tnurnberg@white.intern.koehntopp.de
72b007864e Merge mysql.com:/misc/mysql/31752_/50-31752_ 
into  mysql.com:/misc/mysql/31752_/51-31752_
 2007-12-17 12:11:14 +01:00
tnurnberg@white.intern.koehntopp.de
5016d16507 Merge mysql.com:/misc/mysql/31752_/41-31752_ 
into  mysql.com:/misc/mysql/31752_/50-31752_
 2007-12-17 12:10:26 +01:00
tnurnberg@mysql.com/white.intern.koehntopp.de
93894a444e Bug#31752: check strmake() bounds 
fix test program
 2007-12-17 12:09:21 +01:00
tnurnberg@mysql.com/white.intern.koehntopp.de
94d7b8273f Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  mysql.com:/misc/mysql/31752_/51-31752_
 2007-12-17 09:48:30 +01:00
tnurnberg@white.intern.koehntopp.de
d611f84449 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  mysql.com:/misc/mysql/32350/51-32350
 2007-12-17 06:55:47 +01:00
tnurnberg@white.intern.koehntopp.de
a9cffb3e4d Merge mysql.com:/misc/mysql/32350/50-32350 
into  mysql.com:/misc/mysql/32350/51-32350
 2007-12-17 06:14:53 +01:00
tnurnberg@white.intern.koehntopp.de
c0f5a7cb69 Merge mysql.com:/misc/mysql/32350/41-32350 
into  mysql.com:/misc/mysql/32350/50-32350
 2007-12-17 06:13:52 +01:00
tnurnberg@mysql.com/white.intern.koehntopp.de
b52ac74d54 Bug#32350: mysqldump should show more version information in output 
show version of mysqldump, release of server et al., and version of
current server in mysqldumps.
 2007-12-17 06:13:26 +01:00
cmiller@zippy.cornsilk.net
edbacd3a99 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-forcollapseandmerge 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2007-12-14 13:42:09 -05:00
anozdrin/alik@station.
151444c626 Merge station.:/mnt/raid/alik/MySQL/devel/5.1 
into  station.:/mnt/raid/alik/MySQL/devel/5.1-rt
 2007-12-14 16:30:22 +03:00
kostja@bodhi.(none)
5b80d6a11b Fix broken embedded build (broken by the patch for Bug#12713, first part). 2007-12-13 23:58:55 +03:00
gluh@eagle.(none)
4f5868114a Merge mysql.com:/home/gluh/MySQL/Merge/5.1 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
 2007-12-13 15:56:04 +04:00
gluh@eagle.(none)
e039595029 Merge mysql.com:/home/gluh/MySQL/Merge/5.0 
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
 2007-12-13 14:52:49 +04:00
tsmith@ramayana.hindu.god
8fc0bfb6b6 Merge ramayana.hindu.god:/home/tsmith/m/bk/51 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51-merge
 2007-12-05 12:33:36 -07:00
tsmith@ramayana.hindu.god
10cab933b2 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
 2007-12-04 20:58:21 -07:00
tnurnberg@white.intern.koehntopp.de
f561e8ddf3 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  mysql.com:/misc/mysql/31177/51-31177
 2007-12-02 03:19:07 +01:00
tnurnberg@white.intern.koehntopp.de
55d6d04df0 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/misc/mysql/31177/50-31177
 2007-12-02 01:48:43 +01:00
tnurnberg@white.intern.koehntopp.de
9598ea4f45 Merge mysql.com:/misc/mysql/31177/50-31177 
into  mysql.com:/misc/mysql/31177/51-31177
 2007-12-01 15:53:56 +01:00
tnurnberg@mysql.com/white.intern.koehntopp.de
31d4e58ad4 Bug#31177: Server variables can't be set to their current values 
Default values of variables were not subject to upper/lower bounds
and step, while setting variables was. Bounds and step are also
applied to defaults now; defaults are corrected quietly, values
given by the user are corrected, and a correction-warning is thrown
as needed. Lastly, very large values could wrap around, starting
from 0 again. They are bounded at the maximum value for the
respective data-type now if no lower maximum is specified in the
variable's definition.
 2007-11-30 06:32:04 +01:00
tsmith@ramayana.hindu.god
b44d792324 Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-11-27 11:38:18 -07:00
msvensson@pilot.mysql.com
f45cf3e975 Bug#25146 Some warnings/errors not shown when using --show-warnings 
- Additional patch to fix compiler warnings
 2007-11-26 19:50:43 +01:00
msvensson@pilot.mysql.com
385e3a895e Revert 2007-11-26 19:42:07 +01:00
msvensson@pilot.mysql.com
702361735a Fix warning about possibly uninitialized variable "warnings" 2007-11-26 16:45:58 +01:00
tnurnberg@white.intern.koehntopp.de
72cd363665 Merge mysql.com:/misc/mysql/31752_/50-31752_ 
into  mysql.com:/misc/mysql/31752_/51-31752_
 2007-11-26 09:19:30 +01:00
tnurnberg@mysql.com/white.intern.koehntopp.de
883338a949 Bug#31752: check strmake() bounds 
strmake() called with wrong parameters:
5.0-specific fixes.
 2007-11-26 09:13:23 +01:00
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
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