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

11752 commits

Author SHA1 Message Date
msvensson@neptunus.(none)
83a44bd8ff Disable user_limits for bug23921 2006-11-04 09:24:10 +01:00
msvensson@neptunus.(none)
d59a3b4d43 Merge neptunus.(none):/home/msvensson/mysql/my50-m-stress 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-04 09:20:20 +01:00
msvensson@neptunus.(none)
aa19771c7a Fiexes for --stress mode in mysql-test-run.pl 2006-11-03 17:53:57 +01:00
msvensson@neptunus.(none)
63091e074a Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-03 16:18:32 +01:00
msvensson@neptunus.(none)
78af4ae44c Fix problem with mysql.test relying on "echo" behaviour 2006-11-03 16:09:16 +01:00
msvensson@neptunus.(none)
570f603988 Don't warn about "Found non pid file" for elements that are not files. 2006-11-03 15:26:42 +01:00
msvensson@neptunus.(none)
5c086315a5 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/my50-m-stress
 2006-11-03 13:14:33 +01:00
msvensson@neptunus.(none)
795ad91bc3 Use lowercase for "Too long dbname" test as it will be put ot lower on some platforms and we don't wan't to test that. 2006-11-03 13:12:16 +01:00
msvensson@neptunus.(none)
1c19dc7ed0 Merge neptunus.(none):/home/msvensson/mysql/my41-m-stress 
into  neptunus.(none):/home/msvensson/mysql/my50-m-stress
 2006-11-03 12:58:45 +01:00
msvensson@neptunus.(none)
7b4a8e41a6 Fix mysql-test-run.pl for "bin dist" look in "bin" directory for client binaries as well. 2006-11-03 12:32:05 +01:00
ramil/ram@mysql.com/myoffice.izhnet.ru
afffedc0e3 Fix for bug #19736 VIEW: column names not quoted properly when view is replicated 
When we write 'query=...' string to a frm file for views on a slave, 
indentifiers are not properly quoted due to missing OPTION_QUOTE_SHOW_CREATE 
flag in the thd->options.

Fix: properly set thd->options for the slave thread.
 2006-11-03 15:27:37 +04:00
msvensson@neptunus.(none)
d94101f796 Fix typo, Add "s" to format specifier for --stress-init-file 2006-11-03 11:42:22 +01:00
kroki/tomash@moonlight.intranet
b7fd43bcd0 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-cleanup
 2006-11-03 12:47:31 +03:00
kroki/tomash@moonlight.intranet
1dbf98d162 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-cleanup 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-cleanup
 2006-11-03 12:25:34 +03:00
kroki/tomash@moonlight.intranet
fbf508d686 Cleanup: fix race in rename.test. 2006-11-03 12:16:31 +03:00
iggy@rolltop.ignatz42.dyndns.org
5757c9ffe2 Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint
 2006-11-02 20:43:48 -05:00
cmiller@zippy.cornsilk.net
af5acac047 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2006-11-02 17:39:52 -05:00
cmiller@zippy.cornsilk.net
c34f3219b3 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
 2006-11-02 17:27:42 -05:00
iggy@rolltop.ignatz42.dyndns.org
c5bfb22fe3 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_vs_config/my41-mtr_vs_config 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint
 2006-11-02 15:18:25 -05:00
iggy@rolltop.ignatz42.dyndns.org
2704ba3675 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_vs_config/my50-mtr_vs_config 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
 2006-11-02 15:16:33 -05:00
iggy@rolltop.ignatz42.dyndns.org
9f329f2cf2 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_vs_config/my41-mtr_vs_config 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_vs_config/my50-mtr_vs_config
 2006-11-02 15:09:23 -05:00
iggy@rolltop.ignatz42.dyndns.org
39d7c5a6bc Bug#23865 mysql-test-run.pl on Windows only supports debug and release configurations 
Visual Studio builds each configuration in a different sub-directory.  Only the sub-
directories for release and debug are currently searched.
 2006-11-02 15:05:20 -05:00
anozdrin/alik@booka.
7096cd20a4 Wait for IM to start accepting connections after restart (part 2). 2006-11-02 21:43:52 +03:00
anozdrin/alik@booka.
8bc5a89178 Wait for IM to start accepting connections after restart. 2006-11-02 16:53:14 +03:00
kostja@bodhi.local
b471ea50f7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge
 2006-11-02 01:21:37 +03:00
kostja@bodhi.local
6a28c436f7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  bodhi.local:/opt/local/work/mysql-4.1-runtime
 2006-11-02 01:08:39 +03:00
msvensson@shellback.(none)
8d29d65cf3 Merge bk-internal:/home/bk/mysql-4.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-11-01 16:16:34 +01:00
petr/cps@mysql.com/owlet.local
7974bf90aa Merge mysql.com:/home/cps/mysql/trees/4.1-runtime-bug9191 
into  mysql.com:/home/cps/mysql/trees/5.0-runtime-bug9191
 2006-11-01 17:35:35 +03:00
petr/cps@mysql.com/owlet.local
3ec542dfbd Fix Bug #9191 "TIMESTAMP/from_unixtime() no longer accepts 2^31-1" 
(4.1 version, with post-review fixes)
  
  The fix for another Bug (6439) limited FROM_UNIXTIME() to
  TIMESTAMP_MAX_VALUE which is 2145916799 or 2037-12-01 23:59:59 GMT,
  however unix timestamp in general is not considered to be limited 
  by this value. All dates up to power(2,31)-1 are valid.
  
  This patch extends allowed TIMESTAMP range so, that max
  TIMESTAMP value is power(2,31)-1. It also corrects
  FROM_UNIXTIME() and UNIX_TIMESTAMP() functions, so that
  max allowed UNIX_TIMESTAMP() is power(2,31)-1. FROM_UNIXTIME()
  is fixed accordingly to allow conversion of dates up to
  2038-01-19 03:14:07 UTC. The patch also fixes CONVERT_TZ()
  function to allow extended range of dates.
  
  The main problem solved in the patch is possible overflows
  of variables, used in broken-time representation to time_t
  conversion (required for UNIX_TIMESTAMP).
 2006-11-01 16:47:40 +03:00
msvensson@shellback.(none)
b9d4ccbf18 Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-31 19:08:30 +01:00
msvensson@shellback.(none)
2754edbaf3 Improve the reading of .pid files from var/run 
- Only read *.pid
 - Only allow it to contain a number
 2006-10-31 19:02:33 +01:00
msvensson@shellback.(none)
c6c0dcdc0d Remove warning, exe_mysql_fix_system_tables are not available on windows 2006-10-31 17:16:07 +01:00
jonas@perch.ndb.mysql.com
543e73d663 Merge perch.ndb.mysql.com:/home/jonas/src/50-multi 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2006-10-31 16:15:15 +01:00
jonas@perch.ndb.mysql.com
c6308d652d ndb - ndb_multi spurious failure 
remove timeing dependant part of test
 2006-10-31 16:09:31 +01:00
ramil/ram@mysql.com/myoffice.izhnet.ru
2d22e2ec84 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  mysql.com:/usr/home/ram/work/bug23412/my41-bug23412
 2006-10-31 10:21:18 +04:00
msvensson@shellback.(none)
2fd830c4ea Merge bk-internal:/home/bk/mysql-4.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-10-30 15:03:04 +01:00
msvensson@shellback.(none)
9f223873cf Bug#18654 Test is timing-dependent and fails from scheduling effects (?) 
- Wait in loop with small sleep until tables has been renamed
 2006-10-30 14:42:28 +01:00
msvensson@shellback.(none)
e8c7f19179 Improve comments around FLUSH STATUS 
It's not possible to flush the global status variables in 5.0
Update test case so it works by recording the value of handle_rollback
before and compare it to the value after
 2006-10-30 13:35:57 +01:00
jonas@perch.ndb.mysql.com
b67e5b1131 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2006-10-27 23:59:04 +02:00
jonas@perch.ndb.mysql.com
dc2ca8ca10 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
 2006-10-27 23:56:51 +02:00
ramil/ram@mysql.com/myoffice.izhnet.ru
c6ee81f0ed Fix for bug #23412: delete rows with null date field 
Backport of the fix for bug #8143: A date with value 0 is treated as a NULL value
 2006-10-27 18:08:50 +05:00
kroki/tomash@moonlight.intranet
43e84da003 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug22584
 2006-10-27 13:47:45 +04:00
kroki/tomash@moonlight.intranet
0e0f7a0423 BUG#22584: last_insert_id not updated after inserting a record through 
a updatable view.

When there's a VIEW on a base table that have AUTO_INCREMENT column, and
this VIEW doesn't provide an access such column, after INSERT to such
VIEW LAST_INSERT_ID() did not return the value just generated.

This behaviour is intended and correct, because if the VIEW doesn't list
some columns then these columns are effectively hidden from the user,
and so any side effects of inserting default values to them.

However, there was a bug that such statement inserting into a view would
reset LAST_INSERT_ID() instead of leaving it unchanged.

This patch restores the original value of LAST_INSERT_ID() instead of
resetting it to zero.
 2006-10-27 13:32:41 +04:00
msvensson@neptunus.(none)
6e70b126ed Merge bk-internal:/home/bk/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-26 22:54:25 +02:00
msvensson@neptunus.(none)
74a29e5db4 Bug#20894 Reproducible MySQL client segmentation fault 
- Add two null bytes in  "buff" variable allowing us to call
   get_arg two times also for strings longer than sizeof(buff)
 2006-10-26 19:51:29 +02:00
tsmith/tim@siva.hindu.god
514fd098f2 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  siva.hindu.god:/usr/home/tim/m/bk/50
 2006-10-25 16:28:42 -06:00
kroki/tomash@moonlight.intranet
99baff565e Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug18819
 2006-10-25 20:16:39 +04:00
kroki/tomash@moonlight.intranet
fa60a03073 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-runtime 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug18819
 2006-10-25 20:13:07 +04:00
kroki/tomash@moonlight.intranet
2c03444971 Fix after manual merge. 2006-10-25 20:09:31 +04:00
kroki/tomash@moonlight.intranet
c8bb2f396a Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug18819 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug18819
 2006-10-25 20:00:51 +04:00
kroki/tomash@moonlight.intranet
b7b991cec3 BUG#18819: DELETE IGNORE hangs on foreign key parent delete 
If the error happens during DELETE IGNORE, nothing could be send to the
client, thus leaving it frozen expecting the reply.

The problem was that if some error occurred, it wouldn't be reported to
the client because of IGNORE, but neither success would be reported.

MySQL 4.1 would not freeze the client, but will report

  ERROR 1105 (HY000): Unknown error

instead, which is also a bug.

The solution is to report success if we are in DELETE IGNORE and some
non-fatal error has happened.
 2006-10-25 19:53:26 +04:00
msvensson@neptunus.(none)
6665d67e3f Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-25 16:51:32 +02:00
msvensson@neptunus.(none)
8f118827c4 Skip innodb test if mysqld doesn't have innodb support 2006-10-25 16:50:06 +02:00
msvensson@neptunus.(none)
e193c7bf87 Test failure when compiled without innodb 
Disable warnings around the create table statements, we want to use innodb when possible but they work just fine without.
 2006-10-25 15:41:32 +02:00
msvensson@neptunus.(none)
8ce354f3cf Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-25 14:57:06 +02:00
msvensson@neptunus.(none)
de932f2a5f Update the binlog format parse routine to only be avaliable in 5.1 and allow for any binlog_format to be specified 2006-10-25 14:56:36 +02:00
msvensson@neptunus.(none)
86cca50848 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-25 14:39:29 +02:00
msvensson@neptunus.(none)
a6d87b4c00 Add valgrinding support for mysql_client_test 
Fix two memory leaks in mysql_client_test
 2006-10-25 14:34:18 +02:00
msvensson@neptunus.(none)
392c00d49e Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-25 12:41:34 +02:00
msvensson@neptunus.(none)
4969081589 Set flag opt_skip_ndbcluster_slave if no slaves are being used. 
Add comments
Deperlify
 2006-10-25 12:40:33 +02:00
msvensson@neptunus.(none)
9906a10a27 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-24 23:40:11 +02:00
msvensson@neptunus.(none)
1f780b77e7 Adapt mysql-test-run.pl to mysqld in 5.1 using "mixed" binlog format by default 2006-10-24 23:39:46 +02:00
tsmith/tim@siva.hindu.god
3af2089b13 Merge siva.hindu.god:/usr/home/tim/m/bk/g50 
into  siva.hindu.god:/usr/home/tim/m/bk/50
 2006-10-24 14:42:08 -06:00
msvensson@neptunus.(none)
e0985bef96 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-24 21:05:35 +02:00
msvensson@neptunus.(none)
ac5b37ef00 Pass --core-file option to mysqld when bootstrapping 2006-10-24 21:02:04 +02:00
msvensson@neptunus.(none)
56d2a6fd3c Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-24 19:22:48 +02:00
msvensson@neptunus.(none)
844369130f Remove debug printout 2006-10-24 19:22:27 +02:00
msvensson@neptunus.(none)
a45e6ba7e8 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-24 18:51:07 +02:00
msvensson@neptunus.(none)
a8d1c62e5f Run mysql_client_test without --silent 
Flush both stdout and stderr before abort'ing mysql_client_test
 2006-10-24 18:49:19 +02:00
msvensson@neptunus.(none)
d02838deb0 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-24 18:08:38 +02:00
msvensson@neptunus.(none)
80f4c1056f Fix spelling errors in test files 2006-10-24 17:54:45 +02:00
msvensson@neptunus.(none)
3df77e48af Add analyze_testcase_failure which is called when mysqltest has failed 
with error 1 and we are running with --force
The specific "analyze" code is enclosed in a .test file fwich can easily
be modified to be more advanced
 2006-10-24 17:36:46 +02:00
stewart@willster.(none)
a8037f478d fix result file for ndb_multi 2006-10-25 00:41:55 +10:00
msvensson@neptunus.(none)
ccc33b4e53 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-24 16:00:42 +02:00
msvensson@neptunus.(none)
e4df2aac07 Avoid matching the trailing carriage return when parsing the mysqld.spec file 
This fixes problem where --replace_result failed in rpl000015 because the MYSQL_TCP_PORT variable was "3306\r"
 2006-10-23 20:36:44 +02:00
msvensson@neptunus.(none)
792adb7ce3 The vardir trick can only bge used on platforms with native symlinks - otherwise opt_vardir need to be set to default value. 2006-10-23 16:51:48 +02:00
andrey@example.com
6237be99d0 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  example.com:/work/bug23037/my50
 2006-10-23 15:21:23 +02:00
msvensson@neptunus.(none)
6b5ec53962 Don't use the "4.1 vardir trick" on OS that does not have native symlink(i.e windows) 2006-10-23 13:32:20 +02:00
andrey@example.com
389c6a019e Fix for bug#23037 Bug in field "Default" of query "SHOW COLUMNS FROM table" 
To the documentor: The DEFAULT value in SHOW COLUMNS/SELECT FROM I_S.COLUMNS
was truncated to NAME_LEN (which effectively is 64) characters.
 2006-10-23 13:12:30 +02:00
msvensson@neptunus.(none)
cad9d6b106 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-23 12:19:52 +02:00
msvensson@neptunus.(none)
e5c2351b4a Merge bk-internal:/home/bk/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-10-23 12:17:15 +02:00
msvensson@neptunus.(none)
43aa130a38 If "var" is a symlink which does not point to anything, remove it before creating real var 2006-10-23 12:16:40 +02:00
msvensson@neptunus.(none)
962fe84784 As both ndb and im are components that may be disabled as well as the binaries may not exist. Look for 
their binaries in a separate function and produce test casea failures for the test thet needs these components
 2006-10-23 12:02:56 +02:00
kostja@bodhi.local
81962878d8 A post-merge fix. 2006-10-23 13:55:29 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
dd2a1d1e96 Merge mysql.com:/usr/home/ram/work/mysql-4.1-maint 
into  mysql.com:/usr/home/ram/work/bug20732/my41-bug20732
 2006-10-23 12:58:20 +05:00
kostja@bodhi.local
0ef2ae34e7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge
 2006-10-23 11:51:45 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
a67472f289 Merge mysql.com:/usr/home/ram/work/mysql-5.0-maint 
into  mysql.com:/usr/home/ram/work/bug20732/my50-bug20732
 2006-10-23 12:44:25 +05:00
msvensson@neptunus.(none)
125163c03b Init some variables that changes between test cases direclty in run_testcase 
This can not be done in run_testcase_start_servers as embedded never starts a server
Add error if mysqld_start is called in embedded mode
 2006-10-20 17:09:07 +02:00
gkodinov@dl145s.mysql.com
a93cc1b70b Merge bk-internal:/home/bk/mysql-5.0 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
 2006-10-20 11:02:56 +02:00
gkodinov@dl145s.mysql.com
0612a212d1 Merge bk-internal:/home/bk/mysql-4.1 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt
 2006-10-20 10:57:38 +02:00
malff/marcsql@weblab.(none)
ea0998caca Bug#20028 (Function with select return no data) 
This patch reverts a change introduced by Bug 6951, which incorrectly
set thd->abort_on_warning for stored procedures.

As per internal discussions about the SQL_MODE=TRADITIONAL,
the correct behavior is to *not* abort on warnings even inside an INSERT/UPDATE
trigger.

Tests for Stored Procedures, Stored Functions, Triggers involving SQL_MODE
have been included or revised, to reflect the intended behavior.

(reposting approved patch, to work around source control issues, no review needed)
 2006-10-19 11:39:51 -07:00
msvensson@neptunus.(none)
698e0abd11 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-19 20:34:28 +02:00
msvensson@neptunus.(none)
c4a570aa00 Adapt to running from "binary dist" 
Add function mtr_exe_maybe_exists to look for binaries that is optional
Skip ndb support if it's a binary dist where mysqld supports ndb but there is no ndbd
 2006-10-19 20:33:32 +02:00
msvensson@neptunus.(none)
c950eee217 Fix problem running rpl_timezone on powermacg5, it was not popular to set TZ to "" so now it's set 
to a value wich is not our default
 2006-10-19 20:29:33 +02:00
msvensson@neptunus.(none)
c7710510ac Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-19 17:15:49 +02:00
svoj@mysql.com/april.(none)
afefa5d42f After merge fix. 2006-10-19 18:48:37 +05:00
svoj@mysql.com/april.(none)
2d9e457460 Merge mysql.com:/home/svoj/devel/mysql/engines/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/engines/mysql-5.0-engines
 2006-10-19 18:04:34 +05:00
gkodinov@dl145s.mysql.com
c77fae407b Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
 2006-10-19 15:04:12 +02:00
gkodinov@dl145s.mysql.com
892495acaf Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-5.0 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
 2006-10-19 14:37:49 +02:00
svoj@mysql.com/april.(none)
d2fa9fd192 Merge mysql.com:/home/svoj/devel/mysql/BUG23175/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/engines/mysql-4.1-engines
 2006-10-19 17:35:09 +05:00
gkodinov@dl145s.mysql.com
1dacdd4c85 Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-4.1 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt
 2006-10-19 14:34:56 +02:00
svoj@mysql.com/april.(none)
b6f909bf1b Merge mysql.com:/home/svoj/devel/mysql/BUG22562/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/engines/mysql-4.1-engines
 2006-10-19 17:33:22 +05:00
msvensson@neptunus.(none)
9a5b4a1151 Add command "exit" to mysqltest, it will stop processing any more 
commands and go directly to result file processing
 2006-10-19 13:34:09 +02:00
ramil/ram@mysql.com/myoffice.izhnet.ru
f6ea36c3a5 Merge mysql.com:/usr/home/ram/work/bug20732/my41-bug20732 
into  mysql.com:/usr/home/ram/work/bug20732/my50-bug20732
 2006-10-19 16:15:30 +05:00
kroki/tomash@moonlight.intranet
dea0028cd9 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug21856
 2006-10-19 14:53:50 +04:00
kroki/tomash@moonlight.intranet
00b2fc6aff BUG#21856: Prepared Statements: crash if bad create 
When statement to be prepared contained CREATE PROCEDURE, CREATE FUNCTION
or CREATE TRIGGER statements with a syntax error in it, the preparation
would fail with syntax error message, but the memory could be corrupted.

The problem occurred because we switch memroot when parse stored
routine or trigger definitions, and on parse error we restored the
original memroot only after performing some memory operations.  In more
detail:
 - prepared statement would activate its own memory root to parse
   the definition of the stored procedure.
 - SP would reset this memory root with its own memory root to
   parse SP statements
 - a syntax error would happen
 - prepared statement would restore the original memory root
 - stored procedure would restore what it thinks was the original
   memory root, but actually was the statement memory root.
That led to double free - in destruction of the statement and in
a next call to mysql_parse().

The solution is to restore memroot right after the failed parsing.
 2006-10-19 14:43:52 +04:00
msvensson@neptunus.(none)
9a0e8fb4a1 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-19 12:36:40 +02:00
msvensson@neptunus.(none)
6573fed1c7 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-19 11:35:10 +02:00
msvensson@neptunus.(none)
b11dee73ca Backport test cases fixes from 5.0 2006-10-19 10:54:23 +02:00
istruewing@chilla.local
11d453cc33 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  chilla.local:/home/mydev/mysql-5.0-merge
 2006-10-19 09:59:01 +02:00
ramil/ram@mysql.com/myoffice.izhnet.ru
0027b6e4b7 Fix for bug #20732: Partial index and long sjis search with '>' fails sometimes 
We miss some records sometimes using RANGE method if we have
partial key segments.
Example:
  Create table t1(a char(2), key(a(1)));
  insert into t1 values ('a'), ('xx');
  select a from t1 where a > 'x';
We call index_read() passing 'x' key and HA_READ_AFTER_KEY flag
in the handler::read_range_first() wich is wrong because we have
a partial key segment for the field and might miss records like 'xx'.

Fix: don't use open segments in such a case.
 2006-10-19 12:52:37 +05:00
igor@rurik.mysql.com
3a4a9521d8 Changed test case for bug 22342 to make it platform independent. 2006-10-18 17:24:33 -07:00
iggy@rolltop.ignatz42.dyndns.org
39bda9e3cf Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19745/my50-bug19745 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
 2006-10-18 19:27:14 -04:00
msvensson@neptunus.(none)
179c17adfa Merge neptunus.(none):/home/msvensson/mysql/bug22436/my50-bug22436 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-19 01:01:54 +02:00
msvensson@neptunus.(none)
9a50d74fbb Change the ssl related variables to loose so they work also when the server is compiled without ssl 2006-10-19 00:53:01 +02:00
iggy@rolltop.ignatz42.dyndns.org
3c31c84200 Bug#19745: mysqldump --xml produces invalid xml 
The mysqldump command with both the --xml and --hex-blob options will output blob data encoded as hexBinary.  
The proper XML datatype is xs:hexBinary.  
The correct XML datatype is specified be setting the xsi_type attribute equal to xs:hexBinary for each encoded element.
 2006-10-18 18:43:51 -04:00
msvensson@neptunus.(none)
4b9ea8c0e2 Merge neptunus.(none):/home/msvensson/mysql/bug21868/my50-bug21868 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-19 00:12:36 +02:00
msvensson@neptunus.(none)
722aec24d3 Remove extra whitespace in result file 2006-10-18 22:47:30 +02:00
msvensson@shellback.(none)
f83e9e4f18 Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-18 18:02:07 +02:00
msvensson@shellback.(none)
4cefd49b81 Put the printf of failed ratio on itäs only line, printf was tricked 
into thinking the escaped % + w was a format specifier
 2006-10-18 17:58:26 +02:00
msvensson@shellback.(none)
d71d1a64de Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-18 17:16:53 +02:00
msvensson@shellback.(none)
770a1f919f Don't stop the time in mtr_timer_timeout, that will be done after testcase or when program exit 2006-10-18 17:16:08 +02:00
msvensson@shellback.(none)
09d069fa01 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-18 16:41:01 +02:00
msvensson@shellback.(none)
dd6a9307f1 Remove some junk 2006-10-18 16:40:22 +02:00
msvensson@shellback.(none)
1feac4d44f Stop all timers before exiting when --start-and-exit 2006-10-18 16:39:00 +02:00
mskold/marty@mysql.com/linux.site
9f686a4c99 Merge mysql.com:/windows/Linux_space/MySQL/mysql-4.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-4.1-ndb
 2006-10-18 16:34:43 +02:00
msvensson@shellback.(none)
a5561176e4 Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-18 16:31:38 +02:00
msvensson@shellback.(none)
4890ed261c Fix bug where a timer was stopped by calling mtr_timer_stop with a "timer" instead of it's name 2006-10-18 16:30:51 +02:00
svoj@mysql.com/april.(none)
a2e0059f3c BUG#23175 - MYISAM crash/repair failed during repair 
Repair table could crash a server if there is not sufficient
memory (myisam_sort_buffer_size) to operate. Affects not only
repair, but also all statements that use create index by sort:
repair by sort, parallel repair, bulk insert.

Return an error if there is not sufficient memory to store at
least one key per BUFFPEK.

Also fixed memory leak if thr_find_all_keys returns an error.
 2006-10-18 17:57:29 +05:00
mskold/marty@mysql.com/linux.site
b381ed95d9 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
 2006-10-18 14:28:18 +02:00
msvensson@shellback.(none)
ae10cfc01a Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-18 13:25:06 +02:00
msvensson@shellback.(none)
8d72bf9448 Make --with-ndbcluster only be valid together with --bench 
Improve code that detects if ndb shuold be installed
Remove call to stop_all_servers after install db, if any servers are still running 
and need to be stopped they will be stopped atuomatically
 2006-10-18 13:24:06 +02:00
igor@rurik.mysql.com
c4c9fe63db Merge rurik.mysql.com:/home/igor/mysql-5.0-opt 
into  rurik.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug19579
 2006-10-17 10:07:29 -07:00
cmiller@zippy.cornsilk.net
7714fea9a2 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint_20061016
 2006-10-17 12:31:52 -04:00
cmiller@zippy.cornsilk.net
3a709f50b2 Fix previous bad patch for Bug#14262. 
Remove table engine qualification where it's unnecessary.
 2006-10-17 11:06:11 -04:00
gkodinov/kgeorge@macbook.gmz
a64ae1844d Merge bk-internal:/home/bk/mysql-5.0-opt 
into  macbook.gmz:/Users/kgeorge/mysql/work/B21798-5.0-opt-merge
 2006-10-17 16:36:44 +03:00
gkodinov/kgeorge@macbook.gmz
f7b8937661 Bug#21798: memory leak during query execution with subquery in column 
list using a function
When executing dependent subqueries they are re-inited and re-exec() for 
each row of the outer context.
The cause for the bug is that during subquery reinitialization/re-execution,
the optimizer reallocates JOIN::join_tab, JOIN::table in make_simple_join()
and the local variable in 'sortorder' in create_sort_index(), which is
allocated by make_unireg_sortorder().
Care must be taken not to allocate anything into the thread's memory pool
while re-initializing query plan structures between subquery re-executions.
All such items mush be cached and reused because the thread's memory pool
is freed at the end of the whole query.
Note that they must be cached and reused even for queries that are not 
otherwise cacheable because otherwise it will grow the thread's memory 
pool every time a cacheable query is re-executed. 
We provide additional members to the JOIN structure to store references 
to the items that need to be cached.
 2006-10-17 16:20:26 +03:00
kroki/tomash@moonlight.intranet
656b643276 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-runtime 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug21726
 2006-10-17 13:41:29 +04:00
msvensson@shellback.(none)
84d455b4f2 Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-17 11:31:56 +02:00
gkodinov/kgeorge@macbook.gmz
52dacf7c9a merge changes becuase of the fix for bug 22367 2006-10-17 12:06:06 +03:00
msvensson@shellback.(none)
d45b61b1b5 Remove warnings 
Set comment properly before calling mtr_report_test failed and report_failure_restart
 2006-10-17 10:31:06 +02:00
gkodinov/kgeorge@macbook.gmz
660d724f25 Merge bk-internal:/home/bk/mysql-5.0-opt 
into  macbook.gmz:/Users/kgeorge/mysql/work/B22367-5.0-opt-merge
 2006-10-17 10:58:01 +03:00
msvensson@shellback.(none)
3f46c5cdbd When calculating what features to use for _this_ test run, don't look at test that already are deterined to be skipped 2006-10-17 08:10:51 +02:00
tsmith/tim@siva.hindu.god
df200bd018 Merge siva.hindu.god:/usr/home/tim/m/bk/b19764/50 
into  siva.hindu.god:/usr/home/tim/m/bk/tmp/mrgOct16/50
 2006-10-16 20:15:14 -06:00
igor@rurik.mysql.com
c467be8d6e Fixed bug #19579: at range analysis optimizer did not take into 
account predicates that become sargable after reading const tables.
In some cases this resulted in choosing non-optimal execution plans.
Now info of such potentially saragable predicates is saved in
an array and after reading const tables we check whether this
predicates has become saragable.
 2006-10-16 14:25:28 -07:00
gkodinov/kgeorge@rakia.(none)
a5899ea863 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  rakia.(none):/home/kgeorge/mysql/autopush/B22342-5.0-opt
 2006-10-16 19:46:02 +03:00
gkodinov/kgeorge@macbook.gmz
0e954d2c1a Bug #22342: No results returned for query using max and group by 
When using index for group by and range access the server isolates    
 a set of ranges based on the conditions over the key parts of the
 index used. Then it uses only the ranges over the GROUP BY fields to
 jump from one group to another. Since the GROUP BY fields may form a
 prefix over the index, we may use only a prefix of the ranges produced
 by the range optimizer.
 Each range contains a notion on whether it includes its border values.
 The problem is that when using a range prefix, the last range is open
 because it assumes that there is a range on the next keypart. Thus when
 we use a prefix range as it is, it excludes all border values.
 The solution is when ignoring the suffix of the range conditions 
 (to jump over the GROUP BY prefix only) the server must change the 
 remaining intervals so they always contain their borders, e.g. 
 if the whole range was :
 (1,-inf) <= (<group_by_col>,<min_max_arg_col>) < (1, 3) we must make
 (1) <= (<group_by_col>) <= (1) because (a,b) < (c1,c2) means :
 a < c1 OR (a = c1 AND b < c2).
 2006-10-16 19:30:19 +03:00
gkodinov/kgeorge@macbook.gmz
a1310d84be Bug #22367: Optimizer uses ref join type instead of eq_ref for simple join on 
strings
MySQL is setting the flag HA_END_SPACE_KEYS for all the keys that reference
text or varchar columns with collation different than binary.
This was done to handle correctly the situation where a lookup on such a key
may return more than 1 row because of the presence of many rows that differ
only by the amount of trailing space in the table's string column.
Inserting such values however appears to violate the unique checks on 
INSERT/UPDATE. Thus that flag must not be set as it will prevent the optimizer
from choosing a faster access method.
This fix removes the setting of the HA_END_SPACE_KEYS flag.
 2006-10-16 18:09:58 +03:00
gkodinov/kgeorge@macbook.gmz
abad78f455 Merge bk-internal:/home/bk/mysql-5.0-opt 
into  macbook.gmz:/Users/kgeorge/mysql/work/B14019-5.0-opt
 2006-10-16 16:28:13 +03:00
gkodinov/kgeorge@macbook.gmz
6b10eebe2c Merge update of the fix for bug 14019 in 5.0 2006-10-16 16:27:06 +03:00