mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-03-01 16:53:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
32258 commits 2853 branches 349 tags 1.7 GiB
Commit graph

32258 commits

Author SHA1 Message Date
anozdrin/alik@alik.
ad7d4b0c3f Polishing (was the part of original patch for BUG#16899): 
Changed trigger-handling code so that there will be the one
place for generate statement string for replication log
and for trigger file.
 2006-08-24 18:48:26 +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@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
kent@mysql.com/c-7b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
13e0fa2ccf Merge mysql.com:/Users/kent/mysql/bk/bug17194/my41-bug17194 
into  mysql.com:/Users/kent/mysql/bk/mysql-4.1-maint
 2006-08-24 14:48:22 +02:00
anozdrin/alik@alik.
df28e14b3a Fix for BUG#16899: Possible buffer overflow in handling of DEFINER-clause 
User name (host name) has limit on length. The server code relies on these
limits when storing the names. The problem was that sometimes these limits
were not checked properly, so that could lead to buffer overflow.
  
The fix is to check length of user/host name in parser and if string is too
long, throw an error.
 2006-08-24 16:29:24 +04:00
kroki/tomash@moonlight.intranet
b6bee0a394 BUG#21166: Prepared statement causes signal 11 on second execution 
Changes in an item tree done by optimizer weren't properly
registered and went unnoticed, which resulted in preliminary freeing
of used memory.
 2006-08-24 15:49:12 +04:00
msvensson@neptunus.(none)
b25b49a05a Cset exclude: msvensson@neptunus.(none)|ChangeSet|20060612110740|13873 2006-08-24 11:39:52 +02:00
jonas@perch.ndb.mysql.com
7cb75fc850 Merge perch.ndb.mysql.com:/home/jonas/src/41-work 
into  perch.ndb.mysql.com:/home/jonas/src/50-work
 2006-08-24 07:18:04 +02:00
jonas@perch.ndb.mysql.com
b60be73461 ndb - bug#21800 
read TransactionDeadlockTimeout (for scans) to cater for insane settings
 2006-08-24 07:14:46 +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@maint1.mysql.com
679d1e27ed Merge tim@tsmith.mysql.internal:m/bk/41 
into  maint1.mysql.com:/data/localhome/tsmith/bk/41
 2006-08-24 02:44:49 +02: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
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
e8cbda2c27 Merge siva.hindu.god:/usr/home/tim/m/bk/b21531-41 
into  siva.hindu.god:/usr/home/tim/m/bk/41
 2006-08-23 18:06:07 -06:00
tsmith/tim@siva.hindu.god
45460bd0af Bug : 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
evgen@sunlight.local
1e9b5cead2 view.result, view.test: 
Corrected test case for the bug#21261
sql_parse.cc:
  Corrected fix for bug#21261
 2006-08-24 03:05:13 +04: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
tsmith/tim@siva.hindu.god
b8521714af Merge siva.hindu.god:/usr/home/tim/m/bk/b20536-41 
into  siva.hindu.god:/usr/home/tim/m/bk/41
 2006-08-23 16:30:05 -06: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
0831d404e1 Manual merge 2006-08-23 15:46:57 -06:00
tsmith/tim@siva.hindu.god
dba7b8e81c Bug : 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@maint1.mysql.com
e312416ef2 Merge bk-internal:/home/bk/mysql-4.1 
into  maint1.mysql.com:/data/localhome/tsmith/bk/41
 2006-08-23 22:51:20 +02: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
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
anozdrin/alik@alik.
9af756efd3 Fix for BUG#16899: Possible buffer overflow in handling of DEFINER-clause 
User name (host name) has limit on length. The server code relies on these
limits when storing the names. The problem was that sometimes these limits
were not checked properly, so that could lead to buffer overflow.

The fix is to check length of user/host name in parser and if string is too
long, throw an error.
 2006-08-23 21:31:00 +04:00
cmiller@maint1.mysql.com
977e696677 Bug : 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
joerg@trift2.
6d62914044 configure.in : Set the version for 5.0.24a. 2006-08-23 17:40:05 +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
timour/timka@lamia.home
31373e000b Merge lamia.home:/home/timka/mysql/src/4.1-virgin 
into  lamia.home:/home/timka/mysql/src/4.1-bug-21456
 2006-08-23 18:30:21 +03:00
timour/timka@lamia.home
70f76e457f Merge lamia.home:/home/timka/mysql/src/4.1-bug-21456 
into  lamia.home:/home/timka/mysql/src/5.0-bug-21456
 2006-08-23 18:22:53 +03:00
svoj@may.pils.ru
6509ad6e8a Merge may.pils.ru:/home/svoj/devel/mysql/BUG19702/mysql-4.1 
into  may.pils.ru:/home/svoj/devel/mysql/BUG19702/mysql-5.0-engines
 2006-08-23 20:06:56 +05: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
timour/timka@lamia.home
de723f2998 Bug : SELECT DISTINCT(x) produces incorrect results when using order by 
GROUP BY/DISTINCT pruning optimization must be done before ORDER BY 
optimization because ORDER BY may be removed when GROUP BY/DISTINCT
sorts as a side effect, e.g. in 
  SELECT DISTINCT <non-key-col>,<pk> FROM t1
  ORDER BY <non-key-col> DISTINCT
must be removed before ORDER BY as if done the other way around
it will remove both.
 2006-08-23 16:46:57 +03:00
joerg@trift2.
75c0f2fba6 Fix for bug#21537, "Error at startup" 
These variables must be defined for Netware, or it fails
to recognize hard paths starting from the device.

(Packport of:  2006/08/16 19:30:46+03:00 jani@ua141d10.elisa.omakaista.fi  )
 2006-08-23 12:08:08 +02:00
jonas@perch.ndb.mysql.com
179a7c885b Merge perch.ndb.mysql.com:/home/jonas/src/41-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
 2006-08-23 11:01:12 +02:00
jonas@perch.ndb.mysql.com
4cab70171e Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2006-08-23 11:00:29 +02:00
malff/marcsql@weblab.(none)
28ac53688f Bug#8153 (Stored procedure with subquery and continue handler, wrong result) 
Implemented code review comments
Test cleanup
 2006-08-22 18:58:14 -07:00
evgen@moonbone.local
39d0ef17c7 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  moonbone.local:/work/21475-fix-5.0-opt-mysql
 2006-08-23 01:04:00 +04:00
evgen@moonbone.local
44cad14bf4 item_cmpfunc.cc, item.cc: 
Additional fix for bug 
item_func.h, item_func.cc:
  Additional fix for bug#16861
 2006-08-23 01:03:28 +04:00
rburnett@bk-internal.mysql.com
b81b102530 Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
 2006-08-22 19:01:56 +02:00
malff/marcsql@weblab.(none)
154bb53b1f Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  weblab.(none):/home/marcsql/TREE/mysql-5.0-8153
 2006-08-22 09:06:00 -07:00
cmiller@maint1.mysql.com
60a88a573a Bug#15583: BIN()/OCT()/CONV() do not work with BIT values 
Converting BIT to a string (an intermediate step in conversion) does 
not yield an ASCII numeric string, so we skip that step for BIT and
get the integer value directly from the item.

This site in sql/item_strfunc.cc may be ripe for refactoring for
other types as well, where converting to a string is a waste of time.
 2006-08-22 17:51:00 +02: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
igor@rurik.mysql.com
be9ba6cfd3 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  rurik.mysql.com:/home/igor/mysql-5.0-opt
 2006-08-22 07:09:11 -07:00
evgen@sunlight.local
f0edc9084d Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  sunlight.local:/local_work/16861-bug-5.0-mysql
 2006-08-22 17:39:18 +04:00
evgen@sunlight.local
f17a536e09 Fixed bug#16861: User defined variable can have a wrong value if a tmp table was 
used.

Sorting by RAND() uses a temporary table in order to get a correct results.
User defined variable was set during filling the temporary table and later
on it is substituted for its value from the temporary table. Due to this
it contains the last value stored in the temporary table.

Now if the result_field is set for the Item_func_set_user_var object it 
updates variable from the result_field value when being sent to a client.

The Item_func_set_user_var::check() now accepts a use_result_field
parameter. Depending on its value the result_field or the args[0] is used
to get current value.
 2006-08-22 17:37:41 +04:00