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

9244 commits

Author SHA1 Message Date
lars@mysql.com
a8ba8a30a6 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new 
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new
 2006-03-22 17:28:47 +01:00
lars@mysql.com
c07b9184aa Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new 
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new
 2006-03-22 17:28:46 +01:00
msvensson@neptunus.(none)
123f513593 Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-22 17:28:46 +01:00
msvensson@neptunus.(none)
7d3a809695 Merge bk-internal:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-03-22 16:52:31 +01:00
msvensson@neptunus.(none)
13c5e780ed Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-22 16:48:35 +01:00
msvensson@neptunus.(none)
451a7129bb Bug#18071 Result from MATCH() uses too many decimals 
- Use FORMAT as a workaround to only output the first 6 decimals of the value returned
from MATCH
 - This has been done before
 2006-03-22 14:57:24 +01:00
bar@mysql.com
d735a60964 Merge mysql.com:/usr/home/bar/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.1-new
 2006-03-22 15:10:42 +04:00
msvensson@neptunus.(none)
89a5b96ee4 Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-22 11:12:28 +01:00
lars@mysql.com
ad7c20c7c4 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new 
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new
 2006-03-22 10:50:46 +01:00
bar@mysql.com
cab060d2e2 Merge mysql.com:/usr/home/bar/mysql-4.1.b18004 
into  mysql.com:/usr/home/bar/mysql-5.0
 2006-03-22 13:11:31 +04:00
bar@mysql.com
235c5d35a3 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/home/bar/mysql-5.1-new.b18172
 2006-03-22 13:01:16 +04:00
lars@mysql.com
e0e39bf656 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new 
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new
 2006-03-22 08:42:45 +01:00
msvensson@neptunus.(none)
ffe694b831 Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-22 07:57:56 +01:00
mats@mysql.com
cd550dd5db Post-merge fixes after merging mysql-5.0 with mysql-5.1-new 2006-03-22 00:47:36 +01:00
msvensson@neptunus.(none)
dcceaae8b6 Merge bk-internal:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-03-21 20:08:25 +01:00
msvensson@neptunus.(none)
06a9b0be0e Merge neptunus.(none):/home/msvensson/mysql/bug13228/my50-bug13228_minimal 
into  neptunus.(none):/home/msvensson/mysql/bug13228/my51-bug13228
 2006-03-21 19:47:59 +01:00
msvensson@neptunus.(none)
ede2943ea0 Merge neptunus.(none):/home/msvensson/mysql/bug11835/my51-bug11835 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-21 18:51:47 +01:00
lars@mysql.com
20290ee5f6 Made rpl_flushlog_loop use wait_slave_status instead of sleep. 
This to save 5 seconds of test time.
More test to follow. :-)
 2006-03-21 17:40:51 +01:00
mats@mysql.com
7351d35693 Merge mysql.com:/home/bkroot/mysql-5.0 
into  mysql.com:/home/bk/b18293-mysql-5.0
 2006-03-21 14:37:41 +01:00
mats@mysql.com
1d4ee057ee BUG#18293 (Values in stored procedures written to binlog unescaped): 
Generating character set-independent quoting of strings for the
binary log when executing statements from inside stored procedure.
 2006-03-21 14:35:49 +01:00
gluh@mysql.com
c9d4d6aa29 5.0 -> 5.1 merge 2006-03-21 16:26:47 +04:00
msvensson@neptunus.(none)
dc749e9ad7 Bug#11835 CREATE FUNCTION crashes server 
- Update for 5.1
 - Add "have_dlopen"
 - Remove requirement to load udf's only in "opt_plugin_dir"
 2006-03-21 10:54:26 +01:00
pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se
4d2b8f8ef6 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug17754
 2006-03-20 22:47:48 -05:00
pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se
f9075c0732 BUG#17754 
Fixed result files
 2006-03-20 21:46:16 -05:00
msvensson@neptunus.(none)
4064528279 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/bug11835/my51-bug11835
 2006-03-20 21:41:27 +01:00
msvensson@neptunus.(none)
0811648e31 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/bug11835/my50-bug11835
 2006-03-20 21:35:05 +01:00
pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se
738176c15f Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug17754
 2006-03-20 14:41:50 -05:00
pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se
bd77396a94 BUG#17754 
Added new syntax ALTER TABLE t1 REMOVE PARTITIONING,
changed semantics of ALTER TABLE t1 ENGINE=X; to not remove partitioning
Fix a number of mix engine bugs in partitioning
 2006-03-20 14:36:21 -05:00
msvensson@neptunus.(none)
f12b979fb1 Merge neptunus.(none):/home/msvensson/mysql/bug11835/my50-bug11835 
into  neptunus.(none):/home/msvensson/mysql/bug11835/my51-bug11835
 2006-03-20 20:16:53 +01:00
holyfoot@vva.(none)
28834f4466 merging 2006-03-20 19:37:44 +04:00
holyfoot@mysql.com
fc94004a65 merging 2006-03-20 19:22:56 +04:00
gluh@eagle.intranet.mysql.r18.ru
820731c6ed Fix for bug#15336 Partitions: crash if create table as select 
added HA_EXTRA_WRITE_CACHE case to ha_partition::extra()
 2006-03-20 18:58:21 +04:00
gluh@eagle.intranet.mysql.r18.ru
c0420a5c5e Bug#14367 Partitions: crash if utf8 column 
use part_info->item_free_list instead of thd->free_list during partition function parsing
 2006-03-20 17:41:45 +04:00
holyfoot@vva.(none)
a68742f460 bug #17290 (sp with delete, create and rollback causes MySQLD core) 
additional fixes
 2006-03-20 17:30:01 +04:00
bar@mysql.com
da8a68b4ca Bug#17374: select ... like 'A%' operator fails to find value on columuns with key 
Fixed that LIKE worked case insensitively for latin2_czech_cs,
which was wrong for a case sensitive collation.
 2006-03-20 16:28:25 +04:00
bar@mysql.com
2e7cf881ac Bug #18172 XML: Extractvalue() accepts mallformed 
XPath without a XPath syntax error
item_xmlfunc.cc:
  Error message didn't happen because after
  a failing attempt to parse RelativeLocationPath,
  my_xpath_parse_AbsoluteLocationPath() returned success.
  Changeing logic a bit:
  - Try to parse EOF first, return success if true.
  - Then try to parse RelativeLocationPath(), return success if true.
  - Otherwise return failure.
xml.result:
  Adding test case.
  Also, this change made it possible to generate 
  an error message earlier in the case of another
  bad XPATH syntax.
xml.test:
  Adding test case.
 2006-03-20 14:57:34 +04:00
bar@mysql.com
33e446b356 Bug#18004 Connecting crashes server when default charset is UCS2 
table.cc:
  Fixing to use system_charset_info instead of default_charset_info.
  Crash happened because the "ctype" array is empty in UCS2,
  and thus cannot be used with my_isspace().
  The reason why UCS2 appeared in this context was because of
  of default_charset_info variable incorrectly substituted to my_isspace().
  As functions check_db_name(), check_table_name() and check_column_name()
  always get values in utf8, system_charset_info must be used instead.
ctype_ucs2_def.test, ctype_ucs2_def-master.opt, ctype_ucs2_def.result:
  new file
 2006-03-20 14:43:02 +04:00
gluh@eagle.intranet.mysql.r18.ru
f78ae59f0f Fix for bug#18224 VIEW on information_schema crashes the server 
additional check for subselect
 2006-03-20 14:17:47 +04:00
gluh@eagle.intranet.mysql.r18.ru
a184a00eae Fix for bug #18113 "SELECT * FROM information_schema.xxx crashes server" 
Crash happened when one selected data from one of INFORMATION_SCHEMA
tables and in order to build its contents server had to open view which
used stored function and table or view on which one had not global or
database-level privileges (e.g. had only table-level or had no
privileges at all).

The crash was caused by usage of check_grant() function, which assumes
that either number of tables to be inspected by it is limited explicitly
or table list used and thd->lex->query_tables_own_last value correspond
to each other (the latter should be either 0 or point to next_global
member of one of elements of this table list), in conditions when
above assumptions were not true. This fix just explicitly limits
number of tables to be inspected. Other negative effects which are
caused by the fact that thd->lex->query_tables_own_last might not
be set properly during processing of I_S tables are less disastrous
and will be reported and fixed separetely.
 2006-03-20 13:42:02 +04:00
mskold@mysql.com
83d4481a5d Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
 2006-03-18 08:31:28 +01:00
mats@mysql.com
a8a2d16c1d Merge mysql.com:/home/bkroot/mysql-5.1-new 
into  mysql.com:/home/bk/b17400-mysql-5.1-new
 2006-03-18 00:36:12 +01:00
mats@mysql.com
da22f2dd44 Merge mysql.com:/home/bkroot/mysql-5.1-new 
into  mysql.com:/home/bk/b17400-mysql-5.1-new
 2006-03-17 18:19:10 +01:00
mats@mysql.com
4440b71dda Bug#18280 (RBR: Extreneous maps when writing to general_log and slow_log): 
Filter out replication general_log and slow_log entirely from binary
log. Caching result of table share-specific tests.
 2006-03-17 18:11:07 +01:00
mskold@mysql.com
9e9d2e0311 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
 2006-03-17 17:25:00 +01:00
jani@ibmlab.site
928591e50f Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  ibmlab.site:/home/my/bk/mysql-5.1-new
 2006-03-17 15:56:27 +02:00
andrey@lmy004.
50efe4ed28 fix after manual merge of fix for bug #16396: Events: Distant-future dates become past dates. 2006-03-17 11:01:45 +01:00
andrey@lmy004.
a1d87d6a0d manual merge 2006-03-17 09:40:48 +01:00
bell@production.mysql.com
c5337540af Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  production.mysql.com:/usersnfs/abelkin/work-qc-5.0
 2006-03-17 00:56:47 +01:00
jani@ibmlab.site
ba5c940377 Fixed depedency problem with the following test. 
Without resetting, the next test will not pass.
 2006-03-16 17:44:27 +02:00
jani@ibmlab.site
e94aefcd81 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  ibmlab.site:/home/my/bk/mysql-5.1-new
 2006-03-16 17:44:26 +02:00