mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 12:01:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
37029 commits 2793 branches 343 tags 1.5 GiB
Commit graph

37029 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
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
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
iggy@rolltop.ignatz42.dyndns.org
f6dbea4f2f Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint_21757 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-new-maint_21757
 2006-08-21 20:33:22 -04:00
iggy@rolltop.ignatz42.dyndns.org
39a8fe6e44 Bug#21757: mysql_client_test fails in testcase when reading master.log file 2006-08-21 20:29:11 -04:00
msvensson@shellback.(none)
adaa3a2a60 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-08-21 14:09:38 +02:00
msvensson@shellback.(none)
2b2985e0ea Print lines from log file to see what's in them 2006-08-21 14:06:59 +02:00
msvensson@neptunus.(none)
0f54eccbb0 Move the initialisation of "NDB_STATUS_OK" env variable to after cluster has been intalled 2006-08-20 20:46:50 +02:00
tnurnberg@salvation.intern.azundris.com
9335cba3e4 17926 duplicates Bug#1989 in bug db 
on up-merging 17926 from 5.0 tree it collides with near-identical fix 1989
in 5.1 tree. backing 17926 out of 5.1 tree.
 2006-08-18 19:29:54 +02:00
tnurnberg@salvation.intern.azundris.com
e0592f53cb Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1-maint
 2006-08-18 15:27:29 +02:00
tnurnberg@salvation.intern.azundris.com
da6943872a Merge salvation.intern.azundris.com:/home/tnurnberg/mysql-5.0-maint 
into  salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1-maint
 2006-08-18 14:34:15 +02:00
tnurnberg@salvation.intern.azundris.com
c8d1c498fb innodb r702 
innodb r719
 2006-08-18 14:16:11 +02:00
cmiller@zippy.cornsilk.net
9e5db9f6ea Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1-new-maint
 2006-08-18 07:09:21 -04:00
cmiller@zippy.cornsilk.net
dc1e177697 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
 2006-08-18 06:50:08 -04:00
rburnett@production.mysql.com
284fa931bb A couple of adjustments to the merge to fix the broken build 
instance.cc:
  Removed wrongly placed closing brace
item_geofunc.cc:
  needed to pass in a TABLE_SHARE* instead of a TABLE*
 2006-08-17 22:24:35 +02:00
cmiller@zippy.cornsilk.net
99b113f48e Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1-new-maint
 2006-08-17 14:49:32 -04:00
cmiller@zippy.cornsilk.net
6d35e75cda Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
 2006-08-17 12:59:44 -04:00
rburnett@bk-internal.mysql.com
9d531c4f43 rename to avoid case sensitive collision 2006-08-17 18:50:58 +02:00
cmiller@zippy.cornsilk.net
e65a3e97b5 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1-new-maint
 2006-08-17 12:38:30 -04:00
cmiller@zippy.cornsilk.net
c821fa8bc6 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
 2006-08-17 12:17:52 -04:00
rburnett@bk-internal.mysql.com
d65095b451 Merge bk-internal.mysql.com:/data0/bk/tmp_reg 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1
 2006-08-17 17:19:41 +02:00
cmiller@zippy.cornsilk.net
64092ca93b Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
 2006-08-17 10:55:57 -04:00
cmiller@zippy.cornsilk.net
6998c5140b Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
 2006-08-17 10:53:12 -04:00
cmiller@zippy.cornsilk.net
7d38d61398 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
 2006-08-17 10:49:56 -04:00
cmiller@zippy.cornsilk.net
030ddb48f3 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
 2006-08-17 10:47:23 -04:00
cmiller@zippy.cornsilk.net
c627a6ce84 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
 2006-08-17 10:42:50 -04:00
tnurnberg@maint1.mysql.com
781658d64b Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint 
into  maint1.mysql.com:/data/localhome/tnurnberg/mysql-5.1-maint-i51
 2006-08-17 16:15:09 +02:00
tnurnberg@salvation.intern.azundris.com
d1e1ea2c27 temporarily disabled partition test, fails w/ PS protocol, filed as Bug#21658 2006-08-17 16:01:33 +02:00
pgalbraith/patg@govinda.patg.net
dd1d46c2cd merge warning test results (!) 2006-08-16 20:39:33 -07:00
pgalbraith/patg@govinda.patg.net
ceb7cb55e7 test result changes (non-functional) for 5.1-5.0 merge 2006-08-16 17:16:36 -07:00
iggy@rolltop.ignatz42.dyndns.org
00ab7be7b9 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint_20328 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-merge
 2006-08-16 19:31:33 -04:00
iggy@rolltop.ignatz42.dyndns.org
af844dbed6 manual merge 2006-08-16 19:19:49 -04:00
tnurnberg@salvation.intern.azundris.com
4550b9d044 manual merge 2006-08-16 23:45:01 +02:00
iggy@rolltop.ignatz42.dyndns.org
ca6532af50 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint_20328 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint_20328
 2006-08-16 16:16:10 -04:00
tnurnberg@salvation.intern.azundris.com
2c16439d02 Merge tnurnberg@maint1:/data/localhome/tnurnberg/i51 
into  salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.1-maint-i51
 2006-08-16 21:34:20 +02:00
msvensson@shellback.(none)
a6a8ea0bc9 Remove duplicate free of "ds_res" 2006-08-16 20:38:33 +02:00
iggy@rolltop.ignatz42.dyndns.org
a86f035a08 Bug#20328 - Correction to test/result for broken Windows build. 2006-08-16 13:55:16 -04:00
pgalbraith/patg@govinda.patg.net
370f22418b merge 5.0 -> 5.1, re-enabling federated, disabled partition 2006-08-16 10:47:53 -07:00