mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 23:04:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
37075 commits 2774 branches 343 tags 1.6 GiB
Commit graph

37075 commits

This branch
This branch
All branches
Author SHA1 Message Date
iggy@rolltop.ignatz42.dyndns.org
a21ec5dbd4 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint_11972 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-new-maint_11972
 2006-08-24 15:03:33 -04:00
iggy@rolltop.ignatz42.dyndns.org
e4bfce3058 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint_11972
 2006-08-24 11:19:33 -04:00
iggy@rolltop.ignatz42.dyndns.org
8bc745456f Bug #11972: client uses wrong character set after reconnect. 
The mysql client uses the default character set on reconnect.  The default character set is now controled by the client charset command while the client is running.  The charset command now also issues a SET NAMES command to the server to make sure that the client's charset settings are in sync with the server's.
 2006-08-24 11:15:08 -04:00
msvensson@neptunus.(none)
0b3c2aa1b3 Merge neptunus.(none):/home/msvensson/mysql/bug21749/my50-bug21749 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-08-24 16:46:37 +02:00
msvensson@neptunus.(none)
984e9ce099 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-08-24 16:08:25 +02:00
kent@c-7b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
5a9cceec39 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/Users/kent/mysql/bk/mysql-5.1-maint
 2006-08-24 16:06:12 +02:00
kent@c-7b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
386743c783 Merge mysql.com:/Users/kent/mysql/bk/bug17194/my51-bug17194 
into  mysql.com:/Users/kent/mysql/bk/mysql-5.1-maint
 2006-08-24 15:12:08 +02:00
msvensson@neptunus.(none)
bc22aa60e6 Merge neptunus.(none):/home/msvensson/mysql/my51-m-bug20841 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-08-24 15:07:57 +02:00
kent@mysql.com/c-7b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
68e1e60f27 Merge mysql.com:/Users/kent/mysql/bk/bug17194/my50-bug17194 
into  mysql.com:/Users/kent/mysql/bk/mysql-5.0-maint
 2006-08-24 14:51:54 +02:00
msvensson@neptunus.(none)
81a0090333 Bug#20841 mysqldump fails to store right info with --compatible=mysql40 option 
- Add "not in version before" commensta around new syntax "WITH PARSER" and "TABLESPACE xxx STORAGE DISK"
 2006-08-24 14:27:57 +02:00
msvensson@neptunus.(none)
5cccfba5ee Merge neptunus.(none):/home/msvensson/mysql/bug21749/my51-bug21749 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-08-24 14:13:37 +02:00
msvensson@neptunus.(none)
d58af76d68 Merge neptunus.(none):/home/msvensson/mysql/bug21749/my50-bug21749 
into  neptunus.(none):/home/msvensson/mysql/bug21749/my51-bug21749
 2006-08-24 12:19:41 +02:00
msvensson@neptunus.(none)
b25b49a05a Cset exclude: msvensson@neptunus.(none)|ChangeSet|20060612110740|13873 2006-08-24 11:39:52 +02:00
tsmith@maint1.mysql.com
6420c9e3e7 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  maint1.mysql.com:/data/localhome/tsmith/bk/51
 2006-08-24 02:49:07 +02:00
tsmith@maint1.mysql.com
2225f14755 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  maint1.mysql.com:/data/localhome/tsmith/bk/50
 2006-08-24 02:49:03 +02:00
tsmith/tim@siva.hindu.god
24f567fa40 Merge siva.hindu.god:/usr/home/tim/m/bk/beef-51 
into  siva.hindu.god:/usr/home/tim/m/bk/51
 2006-08-23 18:33:02 -06:00
tsmith/tim@siva.hindu.god
80e565dfe1 Merge siva.hindu.god:/usr/home/tim/m/bk/beef-50 
into  siva.hindu.god:/usr/home/tim/m/bk/50
 2006-08-23 18:31:15 -06:00
tsmith/tim@siva.hindu.god
a3cb3d2c41 Merge siva.hindu.god:/usr/home/tim/m/bk/beef-50 
into  siva.hindu.god:/usr/home/tim/m/bk/beef-51
 2006-08-23 18:27:34 -06:00
tsmith/tim@siva.hindu.god
df6b8516c4 Merge siva.hindu.god:/usr/home/tim/m/bk/b21531-41 
into  siva.hindu.god:/usr/home/tim/m/bk/beef-50
 2006-08-23 18:24:59 -06:00
tsmith/tim@siva.hindu.god
45460bd0af Bug #21531: EXPORT_SET() doesn't accept args with coercible character sets 
- Fix typo in Item_func_export_set::fix_length_and_dec() which caused character set aggregation to fail
- Remove default argument from last arg of agg_arg_charsets() function, to reduce potential errors
 2006-08-23 18:02:31 -06:00
cmiller@zippy.cornsilk.net
05df2f9402 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0-maint-gca 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0-maint
 2006-08-23 18:37:04 -04:00
cmiller@zippy.cornsilk.net
006f27cf9a Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1-new-maint
 2006-08-23 18:31:20 -04:00
cmiller@zippy.cornsilk.net
2a06452bde Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0-maint-gca 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1-new-maint
 2006-08-23 18:29:44 -04:00
cmiller@zippy.cornsilk.net
a4f32ff2e8 String broken up to avoid silly MICROS~1 string-size limit. 2006-08-23 18:29:05 -04:00
tsmith/tim@siva.hindu.god
ade64d467e Merge siva.hindu.god:/usr/home/tim/m/bk/b20536-50 
into  siva.hindu.god:/usr/home/tim/m/bk/50
 2006-08-23 16:28:53 -06:00
tsmith/tim@siva.hindu.god
7503ca1da0 Merge siva.hindu.god:/usr/home/tim/m/bk/b20536-51 
into  siva.hindu.god:/usr/home/tim/m/bk/51
 2006-08-23 16:27:06 -06:00
tsmith/tim@siva.hindu.god
cf5f2693f2 Merge siva.hindu.god:/usr/home/tim/m/bk/b20536-50 
into  siva.hindu.god:/usr/home/tim/m/bk/b20536-51
 2006-08-23 16:03:57 -06:00
tsmith/tim@siva.hindu.god
0831d404e1 Manual merge 2006-08-23 15:46:57 -06:00
tsmith/tim@siva.hindu.god
dba7b8e81c Bug #20402: DROP USER failure logged as ERROR rather than WARNING 
Remove some sql_print_error() calls which were triggered by user error (i.e., not server-level events at all).

Also, convert an sql_print_error -> sql_print_information for a non-error server event.
 2006-08-23 15:37:54 -06:00
tsmith/tim@siva.hindu.god
bf8fc6e82a Merge siva.hindu.god:/usr/home/tim/m/bk/b20536-50 
into  siva.hindu.god:/usr/home/tim/m/bk/50
 2006-08-23 13:43:28 -06:00
tsmith/tim@siva.hindu.god
ecc1e1fe7d Merge siva.hindu.god:/usr/home/tim/m/bk/b20536-51 
into  siva.hindu.god:/usr/home/tim/m/bk/51
 2006-08-23 13:28:01 -06:00
cmiller@maint1.mysql.com
a4c6076cbe Merge maint1.mysql.com:/data/localhome/cmiller/bug20908/my51-bug20908 
into  maint1.mysql.com:/data/localhome/cmiller/mysql-5.1-maint
 2006-08-23 19:43:41 +02:00
cmiller@maint1.mysql.com
c640ed93b6 Merge maint1.mysql.com:/data/localhome/cmiller/bug20908/my50-bug20908 
into  maint1.mysql.com:/data/localhome/cmiller/mysql-5.0-maint
 2006-08-23 19:41:46 +02:00
cmiller@maint1.mysql.com
3fc55a024f Merge maint1.mysql.com:/data/localhome/cmiller/bug20908/my50-bug20908 
into  maint1.mysql.com:/data/localhome/cmiller/bug20908/my51-bug20908
 2006-08-23 19:27:32 +02:00
cmiller@maint1.mysql.com
977e696677 Bug #20908: Crash if select @@"" 
Zero-length variables caused failures when using the length to look
up the name in a hash.  Instead, signal that no zero-length name can
ever be found and that to encounter one is a syntax error.
 2006-08-23 19:14:58 +02:00
cmiller@maint1.mysql.com
5572348ba5 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  maint1.mysql.com:/data/localhome/cmiller/mysql-5.0-maint
 2006-08-23 17:37:18 +02:00
cmiller@maint1.mysql.com
7f0dcf45ab Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint 
into  maint1.mysql.com:/data/localhome/cmiller/mysql-5.1-maint
 2006-08-23 17:34:34 +02:00
cmiller@zippy.cornsilk.net
0a3ab8eb34 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/m50-maint-b21224 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-new-maint
 2006-08-23 10:58:57 -04:00
cmiller@zippy.cornsilk.net
5422668169 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-new-maint
 2006-08-23 10:53:28 -04:00
cmiller@zippy.cornsilk.net
73963de637 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/m50-maint-b21224
 2006-08-23 10:47:46 -04:00
tnurnberg@salvation.intern.azundris.com
f07937730a Merge salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.0-maint-20411 
into  salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.0-maint-20987
 2006-08-22 17:27:36 +02:00
tnurnberg@salvation.intern.azundris.com
a74c4c0d4d Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.0-maint-20987
 2006-08-22 17:22:46 +02:00
cmiller@zippy.cornsilk.net
34fd70452c Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
 2006-08-22 10:32:07 -04:00
tnurnberg@salvation.intern.azundris.com
10c351b124 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.0-maint-20411
 2006-08-22 14:31:57 +02:00
tnurnberg@salvation.intern.azundris.com
002adef0e1 Bug#20411: "GRANT ... REQUIRE ISSUER nnn AND SUBJECT mmm" fails to require both 
when X.509 subject was required for a connect, we tested whether it was the right
one, but did not refuse the connexion if not. fixed.

(corrected CS now --replace_results socket-path)
 2006-08-22 14:29:48 +02:00
tnurnberg@salvation.intern.azundris.com
0ead4ec836 Merge salvation.intern.azundris.com:/home/tnurnberg/work/mysql-4.1-maint-20987 
into  salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.0-maint-20987
 2006-08-22 14:03:52 +02:00
kent@g4-2.local
510240fb56 Merge mysql.com:/Users/kent/mysql/bk/bug17194/my50-bug17194 
into  mysql.com:/Users/kent/mysql/bk/bug17194/my51-bug17194
 2006-08-22 11:57:37 +02:00
kent@mysql.com/g4-2.local
c8b6563dfc mysql.spec.sh: 
Added ndb_error_reporter to the RPM install (bug#20426)
 2006-08-22 11:55:08 +02:00
kent@mysql.com/g4-2.local
d210c8cfc3 Merge mysql.com:/Users/kent/mysql/bk/bug17194/my41-bug17194 
into  mysql.com:/Users/kent/mysql/bk/bug17194/my50-bug17194
 2006-08-22 11:52:26 +02:00
kent@mysql.com/g4-2.local
442c111b72 mysql.spec.sh: 
Added ndb_size.{pl,tmpl} to the RPM install (bug#20426)
 2006-08-22 11:48:58 +02:00