mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 14:02:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
26279 commits 2781 branches 343 tags 1.6 GiB
Commit graph

12555 commits

Author SHA1 Message Date
paul@kite-hub.kitebird.com
16e879e837 mysqld.cc: 
Reorder out-of-order status variables
 2005-08-30 13:16:40 -05:00
paul@kite-hub.kitebird.com
939c7c687d set_var.cc: 
Reorder out-of-order system variables
 2005-08-30 13:15:43 -05:00
brian@zim.(none)
2b0c81c984 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zim.(none):/home/brian/mysql/mysql-5.0
 2005-08-30 11:07:48 -07:00
brian@zim.(none)
bd806f786e Fix for bad merge. 2005-08-30 11:04:23 -07:00
paul@kite-hub.kitebird.com
19af7f8973 Manual merge. 2005-08-30 12:12:12 -05:00
paul@kite-hub.kitebird.com
9cedc58427 Merge kite-hub.kitebird.com:/tmp/merge-4.1 
into  kite-hub.kitebird.com:/tmp/merge-5.0
 2005-08-30 12:11:11 -05:00
brian@zim.(none)
3091eb3fa4 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zim.(none):/home/brian/mysql/mysql-5.0
 2005-08-30 08:28:55 -07:00
brian@zim.(none)
16e30aaf68 Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  zim.(none):/home/brian/mysql/mysql-4.1
 2005-08-30 08:28:34 -07:00
SergeyV@selena.
e82e15b051 Fixes bug #5588. vio_was_interrupted() function was added to detect 
read timeout properly on win32.
 2005-08-30 19:19:28 +04:00
SergeyV@selena.
e0e235c322 Fixes bug #12517. Clear user variables and replication events before 
closing temp tables in thread cleanup.
 2005-08-30 17:22:19 +04:00
sergefp@mysql.com
f29bebe216 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-bug12720
 2005-08-30 16:34:40 +04:00
ramil@mysql.com
dba11de02a Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/ram/work/4.1.b9613
 2005-08-30 17:32:53 +05:00
evgen@moonbone.local
d76f9471cb Fix bug #12537 UNION produces longtext instead of varchar 
Item::tmp_table_field_from_field_type() and create_tmp_field_from_item()
was converting string field to blob depending on byte-wise length instead of
character length, which results in converting valid varchar string with
length == 86 to longtext.

Made that functions above take into account max width of character when
converting string fields to blobs.
 2005-08-30 16:19:53 +04:00
bar@mysql.com
3ff1acb8db Bug#12363 
character_set_results is nullable, but value_ptr returns string "NULL"

set_var.cc:
  Create Item_null instead of Item_string for NULL values

variables.result, variables.test:
  adding test case
 2005-08-30 17:11:59 +05:00
bar@mysql.com
98581508c3 Bug #12829 
Cannot convert the charset of a GROUP_CONCAT result:

item_sum.cc:
  "result" character set was not set into proper value.

func_gconcat.result, func_gconcat.test:
  Fixing tests accordingly.
 2005-08-30 15:36:47 +05:00
ingo@mysql.com
3e06800b7f Merge mysql.com:/home/mydev/mysql-5.0 
into  mysql.com:/home/mydev/mysql-5.0-5000
 2005-08-30 12:35:37 +02:00
sergefp@mysql.com
c9aacbf943 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-bug12720
 2005-08-30 14:15:05 +04:00
timour@mysql.com
309c40012d Merge mysql.com:/home/timka/mysql/src/5.0-virgin 
into  mysql.com:/home/timka/mysql/src/5.0-bug-12672
 2005-08-30 12:50:09 +03:00
osku@127.(none)
0848d8c366 Bug #11946: Review fixes. 2005-08-30 12:39:20 +03:00
timour@mysql.com
32907c421e Merge mysql.com:/home/timka/mysql/src/5.0-virgin 
into  mysql.com:/home/timka/mysql/src/5.0-bug-12672
 2005-08-30 11:52:27 +03:00
msvensson@neptunus.(none)
8c125455b2 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/bug12527/my50-bug12527
 2005-08-30 10:46:07 +02:00
msvensson@neptunus.(none)
002eb51748 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/bug12527/my41-bug12527
 2005-08-30 10:42:41 +02:00
msvensson@neptunus.(none)
bb54b30524 Merge neptunus.(none):/home/msvensson/mysql/bug12527/my41-bug12527 
into  neptunus.(none):/home/msvensson/mysql/bug12527/my50-bug12527
 2005-08-30 10:40:50 +02:00
osku@127.(none)
312b161409 Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  127.(none):/home/osku/mysql-5.0
 2005-08-30 10:42:51 +03:00
ramil@mysql.com
00e066e201 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/ram/work/4.1.b9613
 2005-08-30 12:33:58 +05:00
ingo@mysql.com
9b11c9a822 Merge mysql.com:/home/mydev/mysql-5.0 
into  mysql.com:/home/mydev/mysql-5.0-5000
 2005-08-30 08:18:27 +02:00
ingo@mysql.com
3683432917 Merge mysql.com:/home/mydev/mysql-4.1 
into  mysql.com:/home/mydev/mysql-4.1-4100
 2005-08-30 08:17:44 +02:00
brian@zim.(none)
333a5662fd Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zim.(none):/home/brian/mysql/mysql-5.0
 2005-08-29 18:03:56 -07:00
pgalbraith@mysql.com
162353250e ha_blackhole.cc: 
Found one more missing DBUG_ENTER. compile-pentium-debug-max does not enable blackhole on 4.1!
 2005-08-30 02:46:03 +02:00
brian@zim.(none)
ab126a8130 Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  zim.(none):/home/brian/mysql/mysql-4.1
 2005-08-29 17:41:09 -07:00
sergefp@mysql.com
5d336fbbe1 Fix for BUG#12720: In QUICK_RANGE_SELECT::reset(), reset in_range so next get_next() call 
doesn't continue reading the last range.
 2005-08-30 03:14:39 +04:00
brian@zim.(none)
b4208c569a Update for delete_all_rows() which will be used for TRUNCATE and DELETE support. 2005-08-29 15:26:05 -07:00
brian@zim.(none)
4e9931752e Added support for delete_all_rows() for archive. This fixes bug #12836. 2005-08-29 15:05:16 -07:00
andrey@lmy004.
f479c3a48f Merge lmy004.:/work/mysql-5.0-clean into lmy004.:/work/mysql-5.0-ready5 2005-08-29 22:28:01 +02:00
pgalbraith@mysql.com
9f45c8f2fe ha_blackhole.cc: 
Added missing DBUG enter, compiled and tested on production with debug-max
  build (my regular build missed the previous errors friday)

Changeset:
 Added missing DBUG_ENTER, compiled and tested on production with debug-max
 build!
 2005-08-29 21:22:06 +02:00
ingo@mysql.com
4b0ac126cd Merge mysql.com:/home/mydev/mysql-5.0 
into  mysql.com:/home/mydev/mysql-5.0-5000
 2005-08-29 21:11:05 +02:00
ingo@mysql.com
ae7e8b1de6 Merge mysql.com:/home/mydev/mysql-4.1 
into  mysql.com:/home/mydev/mysql-4.1-4100
 2005-08-29 21:10:25 +02:00
andrey@lmy004.
1668c45d30 fix for bug 12207 (alter table discard tablespace on MyISAM table 
causes ERROR 2013).
(all-in-one approved patch)
 2005-08-29 21:00:43 +02:00
paul@kite-hub.kitebird.com
4fe8e78df1 set_var.cc: 
Reorder out-of-order system variables.
 2005-08-29 12:08:04 -05:00
ingo@mysql.com
4368e9957d After merge fix. 2005-08-29 18:41:39 +02:00
paul@frost.snake.net
6b265793c3 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-4.1
 2005-08-29 11:25:12 -05:00
ingo@mysql.com
5d41d5e0f4 Merge mysql.com:/home/mydev/mysql-4.1-4100 
into  mysql.com:/home/mydev/mysql-5.0-5000
 2005-08-29 18:18:30 +02:00
ingo@mysql.com
5845a6e553 Bug#10056 - PACK_KEYS option take values greater than 1 while creating table 
Added a switch to reject illegal values for PACK_KEYS.
 2005-08-29 17:24:07 +02:00
ingo@mysql.com
330eb04536 Bug#12296 - CHECKSUM TABLE reports 0 for the table 
Skipping deleted records instead of breaking the loop
during checksum calculation.
 2005-08-29 17:08:41 +02:00
ingo@mysql.com
32e3238da7 Bug#11816 - Truncate table doesn't work with temporary innodb tables 
Handle temporary tables like permanent tables: If the storage engine
cannot truncate, delete instead.
 2005-08-29 17:01:46 +02:00
ingo@mysql.com
674f8dfa7c Bug#11493 - Alter table rename to default database does not work without db name qualifying 
Supplied the default database name for ALTER TABLE ... RENAME 
for the new table instead of the old tables db like we do for 
other ALTERs.
 2005-08-29 16:54:33 +02:00
timour@mysql.com
e62c877748 Fix for BUG#12672. 2005-08-29 17:13:42 +03:00
andrey@lmy004.
235cde55fb fix for bug #12841 
(Server crash on DO IFNULL(NULL,NULL)
(fixes also "SELECT CAST(IFNULL(NULL,NULL) as DECIMAL)" unreported
 crash)
(new revampled fix with suggestions from Igor)
 2005-08-29 15:45:03 +02:00
msvensson@neptunus.(none)
5de2259263 Bug #12527 yassl causes errors in "repair" and "optimize" 
- Use constant directly to check that enough number of bytes have been written as header of the archive.
 2005-08-29 14:04:15 +02:00
bar@mysql.com
96e0cb8cbf ctype_utf8.result, ctype_utf8.test, item.cc: 
Bug#12371 executing prepared statement fails (illegal mix of collations)
  After review fixes.
 2005-08-29 16:49:01 +05:00
bar@mysql.com
be470c38c6 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b12371
 2005-08-29 15:44:49 +05:00
andrey@lmy004.
d7d307fbdd Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into lmy004.:/work/mysql-5.0-ready4
 2005-08-29 12:20:36 +02:00
andrey@lmy004.
ed0bac2116 fix for bug #12490 (all-in-one patch) 
(Packets out of order if calling HELP CONTENTS from Stored Procedure)
 2005-08-29 12:19:08 +02:00
osku@127.(none)
caf74b7cdd Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  127.(none):/home/osku/mysql-5.0
 2005-08-29 09:06:43 +03:00
sergefp@mysql.com
e13f67cd05 Fix for valgrind warning: Check for thd->binlog_evt_union.unioned_events only if 
we were doing binlog union (i.e. need_binlog_call==TRUE)
 2005-08-28 20:25:53 +04:00
paul@frost.snake.net
351c59cb5f Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.0 
into  frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-4.0
 2005-08-27 22:00:22 -05:00
paul@frost.snake.net
39e5dafb91 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-4.1
 2005-08-27 21:52:26 -05:00
paul@frost.snake.net
848853ea5b mysqld.cc: 
Reorder out-of-order status variables.
 2005-08-27 21:04:58 -05:00
paul@frost.snake.net
0f6a1f6565 set_var.cc: 
Reorder out-of-order system variables.
 2005-08-27 21:02:05 -05:00
paul@frost.snake.net
c0080aeba6 set_var.cc: 
Reorder out-of-order system variables.
 2005-08-27 19:20:10 -05:00
paul@frost.snake.net
458bc88563 mysqld.cc: 
Reorder out-of-order status variables.
 2005-08-27 19:18:53 -05:00
igor@rurik.mysql.com
c19d2c1e89 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2005-08-27 16:30:39 -07:00
hf@deer.(none)
23a51871d2 Merge deer.(none):/home/hf/work/mysql-5.0.11207 
into deer.(none):/home/hf/work/mysql-5.0.clean
 2005-08-27 18:53:54 +05:00
hf@deer.(none)
b2a1a5e7f2 Addition to the fix for #11207 (SET GLOBAL TRANSACTION ISOLATION LEVEL) 2005-08-27 18:51:11 +05:00
hf@deer.(none)
63d6bc34e0 Merge deer.(none):/home/hf/work/mysql-5.0.10499 
into deer.(none):/home/hf/work/mysql-5.0.clean
 2005-08-27 18:13:26 +05:00
andrey@lmy004.
950a277988 retest the fix for bug #10362 (SHOW PROCEDURE always qualifies name with database) 
(already approved)
 2005-08-27 12:29:36 +02:00
andrey@lmy004.
c9d9c74ac6 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into lmy004.:/work/mysql-5.0-bug11904
 2005-08-27 09:09:54 +02:00
acurtis@xiphis.org
bebe182885 Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  xiphis.org:/usr/home/antony/work2/p3-bug9048.2
 2005-08-27 07:28:45 +01:00
acurtis@xiphis.org
23c19b21d6 Bug#9048 
"Creating a function with char binary IN parameter fails"
  Parse BINARY as part of type declaration, not as 
  a column attribute.
 2005-08-27 07:26:14 +01:00
igor@rurik.mysql.com
f93e7cc77a func_str.result, null.result: 
Corrected results after the fix for bug #12791.
func_test.result, func_test.test:
  Added test cases for bug #12791.
item_func.h, item_func.cc:
  Fixed bug #12791.
  Made LEAST/GREATES fully Oracle compliant.
  LEAST/GREATEST did not return NULL if only some
  arguments were NULLs. This did not comply with Oracle.
 2005-08-26 22:25:45 -07:00
kent@mysql.com
0c3c6f8003 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-08-27 02:05:35 +02:00
kent@mysql.com
057a98af4f unireg.h: 
Max index key length increased from 1024 to 3072
  for 64 bit builds.
 2005-08-27 01:50:38 +02:00
sergefp@mysql.com
5f231a5f49 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-rpl-bug
 2005-08-27 02:34:05 +04:00
sergefp@mysql.com
ad9bfc251c Slightly amended Monty's SP replication code cleanup patch 2005-08-27 02:33:06 +04:00
patg@radha.local
69114941cd typo to DBUG_RETURN fixed 2005-08-26 20:29:26 +02:00
serg@sergbook.mysql.com
e0a7676757 Merge bk-internal:/home/bk/mysql-5.0 
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
 2005-08-26 21:37:44 +04:00
serg@sergbook.mysql.com
0a0fc47ce4 bad blind change fixed 2005-08-26 21:33:13 +04:00
kent@mysql.com
7a45cd2dad Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-08-26 18:45:16 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
7b7188cea6 Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
 2005-08-26 15:56:52 +03:00
kent@mysql.com
abfbd9f9ba Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-08-26 14:32:38 +02:00
serg@sergbook.mysql.com
78a0585cea after merge fix 2005-08-26 15:28:08 +04:00
serg@sergbook.mysql.com
d591705e69 merged 2005-08-26 13:24:59 +04:00
ramil@mysql.com
120dd92b03 workaround (bug #9613: Some read-only variables are selectable, others are not). 2005-08-26 13:23:32 +05:00
serg@sergbook.mysql.com
4da4a66b64 Merge bk-internal:/home/bk/mysql-5.0 
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
 2005-08-26 11:56:29 +04:00
andrey@lmy004.
7b1b3997a8 fix for bug #11904 (select statement, cursor, grouping wrong results) 2005-08-26 09:45:30 +02:00
patg@radha.local
6b4baf48a5 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  radha.local:/Users/patg/mysql-build/mysql-4.1
 2005-08-26 03:14:56 +02:00
patg@radha.local
efff75ed1a ha_blackhole changes, same patch as http://lists.mysql.com/internals/27878, per brian 2005-08-26 02:09:56 +02:00
kent@mysql.com
64c2d24978 libmysqld.vcproj: 
Changed spelling "Commerical" to "Commercial"
mysqld.vcproj:
  Aligned engines with Unix version
sql_class.cc:
  VC7 needs my_free() cast of first arg to be (gptr)
my_global.h:
  Can't assume macro set_timespec_nsec exists if set_timespec does
 2005-08-25 23:24:43 +02:00
sergefp@mysql.com
2af2f47395 Merge mysqldev@production.mysql.com:my/mysql-5.0-release 
into mysql.com:/home/psergey/mysql-5.0-bug12335-release2
 2005-08-26 00:56:36 +04:00
sergefp@mysql.com
ec9768be18 Compiler error fix for ICC 8.1 2005-08-26 00:54:55 +04:00
jani@a193-229-222-105.elisa-laajakaista.fi
ff5d26d777 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
 2005-08-25 23:24:16 +03:00
joerg@mysql.com
598d0e7361 Include the new header file in an appropriate macro. 2005-08-25 21:41:50 +02:00
jimw@mysql.com
663d0bbdfb Fix crash in DES_DECRYPT(NULL). (Bug #12757) 2005-08-25 12:34:42 -07:00
bell@sanja.is.com.ua
e4733cc8b0 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug1-5.0
 2005-08-25 21:35:58 +03:00
jimw@mysql.com
f006319405 Merge mysql.com:/home/jimw/my/mysql-4.1-11707 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-25 09:36:51 -07:00
bell@sanja.is.com.ua
97ad1cba62 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug1-5.0
 2005-08-25 19:14:43 +03:00
bell@sanja.is.com.ua
5963573c05 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug1-5.0
 2005-08-25 17:47:18 +03:00
petr@mysql.com
05fe0b2247 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/cps/mysql/devel/mysql-5.0-sp11333
 2005-08-25 18:16:21 +04:00
sergefp@mysql.com
469e413f94 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-bug12335-release2
 2005-08-25 18:16:20 +04:00
petr@mysql.com
56882c61bb Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/cps/mysql/devel/mysql-5.0-sp11333
 2005-08-25 18:05:49 +04:00
heikki@hundin.mysql.fi
7ec0b37c3c ha_innodb.cc: 
Fix typo
 2005-08-25 16:57:13 +03:00
sergefp@mysql.com
c78ce16681 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-bug12335-release2
 2005-08-25 17:39:02 +04:00
sergefp@mysql.com
95c3afc5d9 Fix for BUG#12335 (SP replication) : New binlogging strategy for stored PROCEDUREs/FUNCTIONs. 
"Interleaved SPs execution is now binlogged properly, "SELECT spfunc()" is binlogged too.
The known remaining issue is binlogging/replication of "a routine is deleted while it is executed" scenario.
 2005-08-25 17:34:34 +04:00
petr@mysql.com
db5acc18ed Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/cps/mysql/devel/mysql-5.0-sp11333
 2005-08-25 16:06:49 +04:00
petr@mysql.com
8dfa469729 Fix Bug#11333 "Stored Procedure: Memory blow up on repeated SELECT ... INTO query" 2005-08-25 15:34:14 +04:00
osku@127.(none)
ce22788bdd Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  127.(none):/home/osku/mysql-5.0
 2005-08-25 14:15:31 +03:00
joerg@mysql.com
fea0745ba8 Merge mysql.com:/M50/clone-5.0 into mysql.com:/M50/push-5.0 2005-08-25 11:46:17 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
e767eb330e Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
 2005-08-25 12:08:26 +03:00
monty@mishka.mysql.com
848c936693 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mishka.mysql.com:/home/my/mysql-5.0
 2005-08-25 10:44:08 +03:00
andrey@lmy004.
d4a25c1b36 Merge lmy004.:/work/mysql-5.0-clean 
into lmy004.:/work/mysql-5.0-bug12533-2
 2005-08-25 09:38:59 +02:00
andrey@lmy004.
dde57f082b fix for bug #12533 (crash on DESCRIBE <view> after renaming base table column) 2005-08-25 09:24:21 +02:00
monty@mishka.local
b90d7fe3b6 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mishka.local:/home/my/mysql-5.0
 2005-08-25 09:40:40 +03:00
monty@mishka.local
f16c7b3c5c After merge fixes 2005-08-25 09:38:06 +03:00
georg@lmy002.wdf.sap.corp
adc603a930 Merge lmy002.wdf.sap.corp:/home/georg/work/mysql/bugs/mysql-5.0-master 
into lmy002.wdf.sap.corp:/home/georg/work/mysql/bugs/mysql-5.0_5501
 2005-08-25 07:02:37 +02:00
monty@mishka.local
f384e08277 Merge mishka.local:/home/my/mysql-4.1 
into  mishka.local:/home/my/mysql-5.0
 2005-08-25 06:55:48 +03:00
jimw@mysql.com
27b6d59db2 Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-24 17:09:44 -07:00
kent@mysql.com
96dc373650 ha_tina.cc: 
Some lack madvice()
 2005-08-25 01:02:40 +02:00
jimw@mysql.com
6964b7491e Merge mysql.com:/home/jimw/my/mysql-5.0-11680 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-24 15:54:23 -07:00
jimw@mysql.com
56dfc1bf18 Merge mysql.com:/home/jimw/my/mysql-5.0-12562 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-24 15:52:58 -07:00
jimw@mysql.com
9e4a9e23c6 Make SYSDATE() behave as in Oracle: always the current datetime, not the 
datetime of when the current statement began. This also makes SYSDATE()
not safe in replication. (Bug #12562)
 2005-08-24 15:50:58 -07:00
monty@mishka.local
05ee47a80d Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mishka.local:/home/my/mysql-5.0
 2005-08-25 00:22:59 +03:00
monty@mishka.local
bb7289b7d2 Cleanups during review of new code 
Removed ASSERT that can obviously never be wrong
 2005-08-25 00:21:47 +03:00
serg@sergbook.mysql.com
714b27c71c merged 2005-08-25 00:08:02 +04:00
dlenev@mysql.com
dc1df41b3f Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/src/mysql-5.0.12
 2005-08-24 23:54:53 +04:00
dlenev@mysql.com
2a880905c4 Correction of fix for bug #12280 "Triggers: crash if flush tables". 
We should not assume that "thd" argument of reload_acl_and_cache() is
non-zero. Failure to do so will cause server to crash when one sends
SIGHUP to it.
 2005-08-24 23:44:42 +04:00
jani@a193-229-222-105.elisa-laajakaista.fi
fe977b0cd0 Several fixes for Netware. 2005-08-24 22:03:34 +03:00
monty@mishka.local
17654cd7af Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mishka.local:/home/my/mysql-4.1
 2005-08-24 20:55:54 +03:00
monty@mishka.local
842de6ea45 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mishka.local:/home/my/mysql-4.1
 2005-08-24 19:53:40 +03:00
monty@mishka.local
8e6aa0e7ea Review fixes 2005-08-24 19:37:27 +03:00
jimw@mysql.com
006e5b770b Merge mysql.com:/home/jimw/my/mysql-4.1-12302 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-08-24 08:50:12 -07:00
igor@rurik.mysql.com
b610c0972f Merge rurik.mysql.com:/home/igor/mysql-5.0 
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2005-08-24 08:19:02 -07:00
heikki@hundin.mysql.fi
2310ef6938 Merge hundin.mysql.fi:/home/heikki/mysql-4.0 
into  hundin.mysql.fi:/home/heikki/mysql-4.1
 2005-08-24 17:30:25 +03:00
heikki@hundin.mysql.fi
9f72d504b4 ha_innodb.cc: 
Fix bug #12779 : never give a row count estimate of 0 to the MySQL query optimizer, as then left join optimizer may beleive it KNOWS that the table is empty; note that this fix may change query optimization of many other queries where one table is empty; note that the proper fix would be to make the query optimizer to know that the row count estimates it receives really are just estimates, it cannot assume they are certain
 2005-08-24 17:27:46 +03:00
georg@lmy002.wdf.sap.corp
254db48603 Fix for bug#5501 (SHOW TABLE STATUS should show "view" in upper case) 2005-08-24 12:51:00 +02:00
lars@mysql.com
f34398ba65 BUG#12532: Fix for the case when my_malloc is macro 2005-08-24 11:14:41 +02:00
msvensson@neptunus.(none)
9af0f156a5 Improve default error message for optimize/repair table 2005-08-24 10:41:44 +02:00
timour@mysql.com
5d736f1063 Merge mysql.com:/home/timka/mysql/src/5.0-virgin 
into  mysql.com:/home/timka/mysql/src/5.0-2486
 2005-08-24 10:52:30 +03:00
timour@mysql.com
04a6a8e011 Post-fix for BUG#6276. 2005-08-24 10:51:28 +03:00
osku@127.(none)
55c752fb37 Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  127.(none):/home/osku/mysql-5.0
 2005-08-24 09:25:32 +03:00
igor@rurik.mysql.com
4adc90bdd6 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2005-08-23 23:22:52 -07:00
petr@mysql.com
adb8244163 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usersnfs/pchardin/mysql-5.0-virgin
 2005-08-24 02:50:23 +02:00
petr@mysql.com
659809d30f fix compilation failure appeared after monty's cleanup 2005-08-24 02:46:13 +02:00
lars@mysql.com
f98f46c471 BUG#12532: Fixes after review 2005-08-24 01:45:15 +02:00
lars@mysql.com
d8df765913 Merge mysql.com:/users/lthalmann/ltx/root/mysql-5.0 
into  mysql.com:/users/lthalmann/ltx/dev/mysql-5.0-bug12532
 2005-08-24 00:16:58 +02:00
bell@sanja.is.com.ua
144c847da6 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug3-5.0
 2005-08-23 23:17:36 +03:00
jimw@mysql.com
cf5dd176c0 Fix build using --without-server. (Bug #11680) 2005-08-23 11:25:24 -07:00
timour@mysql.com
9a6aefab3a Fix for BUG#6276. 2005-08-23 20:03:32 +03:00
kent@mysql.com
4d2cc6e503 Merge 2005-08-23 18:06:24 +02:00
timour@mysql.com
bf8563ae1d Merge mysql.com:/home/timka/mysql/src/5.0-virgin 
into  mysql.com:/home/timka/mysql/src/5.0-2486
 2005-08-23 18:15:51 +03:00
timour@mysql.com
e040300393 WL#2486 - natural and using join according to SQL:2003 
* Provide backwards compatibility extension to name resolution of
  coalesced columns. The patch allows such columns to be qualified
  with a table (and db) name, as it is in 4.1.
  Based on a patch from Monty.

* Adjusted tests accordingly to test both backwards compatible name
  resolution of qualified columns, and ANSI-style resolution of
  non-qualified columns.
  For this, each affected test has two versions - one with qualified
  columns, and one without.
 2005-08-23 18:08:04 +03:00
serg@sergbook.mysql.com
1fbb96ea97 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
 2005-08-23 14:16:17 +04:00
dlenev@mysql.com
603dddfdb4 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/src/mysql-5.0-bg11896
 2005-08-23 09:15:05 +04:00
jimw@mysql.com
447988759f Reorder server startup so that network startup is done after storage 
engine startup. (Bug #11707)
 2005-08-22 18:07:42 -07:00
igor@rurik.mysql.com
21b63441f5 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2005-08-22 17:46:21 -07:00
igor@rurik.mysql.com
94166de5f3 sql_show.cc: 
Database name was set incorrectly for any show command
  that used sunqueries in its where condition.
information_schema.test, information_schema.result:
  Added a test case for bug #12636.
 2005-08-22 17:32:02 -07:00
jimw@mysql.com
f70beef6c7 Use the hostname with which the user authenticated when determining which 
user to update with 'SET PASSWORD = ...'. (Bug #12302)
 2005-08-22 15:48:50 -07:00
jimw@mysql.com
247e9421fa Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-22 11:54:33 -07:00
jimw@mysql.com
bb4af4f176 Merge mysql.com:/home/jimw/my/mysql-5.0-12689 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-22 10:19:09 -07:00
monty@mishka.local
ef06534945 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mishka.local:/home/my/mysql-5.0
 2005-08-22 19:58:11 +03:00
konstantin@mysql.com
fb7be5270f Add a comment about I_List<> copy constructor. 2005-08-22 19:23:01 +04:00
monty@mishka.local
49413542bd Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mishka.local:/home/my/mysql-5.0
 2005-08-22 16:06:00 +03:00
evgen@moonbone.local
3831bb56df Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into moonbone.local:/work/11718-bug-4.1-mysql
 2005-08-22 15:46:14 +04:00
evgen@moonbone.local
f5f6ed8b78 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/11398-bug-5.0-mysql
 2005-08-22 15:46:09 +04:00
osku@127.(none)
216227d8a2 Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  127.(none):/home/osku/mysql-5.0
 2005-08-22 12:53:54 +03:00
serg@sergbook.mysql.com
eadb86d56f after pull cleanup 2005-08-22 13:20:02 +04:00
monty@mishka.local
d62295e44e Cleanup during review of new pushed code 2005-08-22 01:13:37 +03:00
jonas@eel.(none)
a58c0e7dae Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  eel.(none):/home/jonas/src/mysql-4.1-push
 2005-08-21 16:35:27 +02:00
jonas@eel.(none)
5823c91f88 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  eel.(none):/home/jonas/src/mysql-5.0-push
 2005-08-21 16:22:08 +02:00
monty@mishka.local
ba2ace25a9 Merge mishka.local:/tmp/skr99/mysql-5.0 
into  mishka.local:/home/my/mysql-5.0
 2005-08-21 13:05:15 +03:00
pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se
dce31760e4 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.0
 2005-08-20 21:21:49 -04:00
sasha@asksasha.com
e038bfe8ff Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  asksasha.com:/reiser-data/mysql-dev/mysql-4.1
 2005-08-20 16:09:59 -06:00
pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se
4084c13605 Merge c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-4.1 
into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.0
 2005-08-20 16:38:55 -04:00
serg@sergbook.mysql.com
573a7f5cc1 be standard (I_S.TABLES: s/TEMPORARY/LOCAL &/) 2005-08-20 20:15:30 +04:00
serg@sergbook.mysql.com
117d61c8a0 Merge bk-internal:/home/bk/mysql-5.0 
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
 2005-08-20 14:38:18 +04:00
monty@mishka.local
1c1f26d5e2 Fixes during review of new pushed code 
Fixed new bug when running a SP without a default database
 2005-08-20 11:00:00 +03:00
jimw@mysql.com
6240210305 Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-19 17:53:48 -07:00
jimw@mysql.com
a3c893e0b8 Fix cases where SLEEP() calls would get optimized away or cached. (Bug #12689) 2005-08-19 15:51:40 -07:00
igor@rurik.mysql.com
2c2f18b98b Merge rurik.mysql.com:/home/igor/mysql-4.1 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2005-08-19 15:07:51 -07:00
patg@radha.local
7a43a0f54d Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  radha.local:/Users/patg/mysql-build/mysql-4.1.clean
 2005-08-19 23:44:40 +02:00
elliot@mysql.com
55b81af671 Merge mysql.com:/home/emurphy/src/bk-clean/mysql-4.1 
into  mysql.com:/home/emurphy/src/work/mysql-5.0
 2005-08-19 15:29:30 -04:00
igor@rurik.mysql.com
55fd68ccd7 Merge rurik.mysql.com:/home/igor/mysql-4.1 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2005-08-19 12:10:34 -07:00
elliot@mysql.com
d9efe655ed Bug#11338 Fixes from review (identical functionality). 2005-08-19 14:49:34 -04:00
jimw@mysql.com
dd1e0fb8c7 Merge mysql.com:/home/jimw/my/mysql-5.0-11711 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-19 11:40:39 -07:00
lars@mysql.com
c79ba8e346 BUG#12532: Added more memory in malloc for slave query cache 2005-08-19 16:25:55 +02:00
serg@sergbook.mysql.com
c234386a40 the syntax is XA END xid [SUSPEND [FOR MIGRATE]] 2005-08-19 18:00:16 +04:00
timour@mysql.com
a53d283481 Merge mysql.com:/home/timka/mysql/src/5.0-virgin 
into  mysql.com:/home/timka/mysql/src/5.0-2486
 2005-08-19 16:05:58 +03:00
konstantin@mysql.com
887fba4736 A fix and a test case for "Bug #12168 'DECLARE CONTINUE HANDLER FOR 
NOT FOUND ...' in conditional handled incorrectly".

Whenever we remove an instruction during optimization, we need to
adjust instruction numbers (ip - instruction pointer) stored in all
instructions. In addition to that, sp_instr_hpush_jump, which 
corresponds to DECLARE CONTINUE HANDLER needs adjustment for m_handler,
which holds the number of instruction with the continue handler.
In the bug report, a wrong ip stored in m_handler was pointing at 
FETCH, which resulted in an error message and abnormal SP termination.
The fix is to just remove m_handler member from sp_instr_hpush_jump,
as it's always points to the instruction next to the DECLARE
statement itself (m_ip+1).
 2005-08-19 17:03:21 +04:00
timour@mysql.com
d053a23034 Merge mysql.com:/home/timka/mysql/src/5.0-virgin 
into  mysql.com:/home/timka/mysql/src/5.0-2486
 2005-08-19 15:32:00 +03:00
timour@mysql.com
f5fc1543aa WL#2486 - natural and using join according to SQL:2003 
- Corrected problem with N-way nested natural joins in PS mode.
- Code cleanup
- More asserts to check consistency of name resolution contexts
- Fixed potential memory leak of name resolution contexts
 2005-08-19 15:22:30 +03:00
jonas@eel.(none)
4575678ff1 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  eel.(none):/home/jonas/src/mysql-5.0-push
 2005-08-19 13:40:40 +02:00
igor@rurik.mysql.com
2d32b77693 distinct.test, distinct.result: 
Added test cases for bug #12625.
sql_select.cc:
  Fixed bug #12625.
  Fixed invalid removal of constant items from the DISTINCT
  list in the function create_distinct_group.
 2005-08-19 01:57:22 -07:00
jonas@eel.(none)
c962896744 Merge eel.(none):/home/jonas/src/mysql-5.0-push 
into  eel.(none):/home/jonas/tmp/kkk/mysql-5.0
 2005-08-19 10:50:51 +02:00
osku@127.(none)
70be812365 Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  127.(none):/home/osku/mysql-5.0
 2005-08-19 11:34:04 +03:00
bell@sanja.is.com.ua
376c5307df Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug2-5.0
 2005-08-19 10:40:46 +03:00
andrey@lmy004.
a5ecf5f4b1 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into lmy004.:/work/mysql-5.0-clean
 2005-08-19 09:14:59 +02:00
jonas@eel.(none)
178a76fab4 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  eel.(none):/home/jonas/src/mysql-4.1-push
 2005-08-19 07:58:54 +02:00
bell@sanja.is.com.ua
a3724d2546 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug2-5.0
 2005-08-19 08:55:38 +03:00
jonas@eel.(none)
1b1d1d8d5c Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  eel.(none):/home/jonas/src/mysql-5.0-push
 2005-08-19 07:52:42 +02:00
patg@radha.local
d0767dfad3 BUG #12498 Fixed mispelling 2005-08-19 07:51:22 +02:00
sasha@asksasha.com
c594ab7921 updated patch for BUG#4680 (incomplete DROP DATABASE breaking replication). 
We binlog the DROP TABLE for each table that was actually dropped. Per Sergei's 
suggestion a fixed buffer for the DROP TABLE query is pre-allocated from THD pool, and 
logging now is done in batches - new batch is started if the buffer becomes full.
Reduced memory usage by reusing the table list instead of accumulating a list of 
dropped table names. Also fixed the problem if the table was not actually dropped, eg
due to permissions. Extended the test case to make sure batched query 
logging does work.
 2005-08-18 21:40:14 -06:00
igor@rurik.mysql.com
743917759c Manual merge 2005-08-18 15:17:04 -07:00
andrey@lmy004.
0e6606c8da Merge lmy004.:/work/mysql-5.0-clean 
into lmy004.:/work/mysql-5.0-bug12591
 2005-08-18 23:40:04 +02:00
evgen@moonbone.local
1fc33b0533 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/10624-bug-5.0-mysql
 2005-08-18 22:46:17 +04:00
jani@a193-229-222-105.elisa-laajakaista.fi
c6ee26ab45 Some minor fixes for Netware. These were required after we started building 
against a later version of libc.
 2005-08-18 21:26:25 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
3bfa514655 Changes for Netware. This is needed when building against newer Libc 
than we've used before.
 2005-08-18 21:22:35 +03:00
kent@mysql.com
7933906325 mysqld.dsp: 
Added archive and example storage engine to Windows build
ha_example.cc, ha_archive.cc:
  Windows fix, use relative include path to "mysql_priv.h"
ha_archive.h:
  Windows VC6 compile needed (char*) cast of byte var
mysqltest.dsp, mysql_test_run_new.dsp:
  Added /FD flag, to avoid include file warnings
 2005-08-18 17:29:24 +02:00
dlenev@mysql.com
6c39364f85 Fix for bug #11896 "Partial locking in case of recursive trigger definitions". 
If we are in stored function or trigger we should ensure that we won't change
table that is already used by calling statement (this can damage table or
easily cause infinite loops). Particularly this means that recursive triggers
should be disallowed.
 2005-08-18 19:07:23 +04:00
jimw@mysql.com
6c3dafd07c Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-18 07:59:43 -07:00
igor@rurik.mysql.com
c93d841dbf Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 
into rurik.mysql.com:/home/igor/mysql-5.0
 2005-08-18 07:30:45 -07:00
sergefp@mysql.com
c085c9a3b7 Undo the test cset that shouldn't have been pushed (ChangeSet@1.1988, 2005-08-16 00:03:50+04:00, aivanov@mysql.com 
)
 2005-08-18 18:26:30 +04:00
igor@rurik.mysql.com
b5e7bfa9f2 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2005-08-18 05:36:22 -07:00
jonas@eel.(none)
7c70be87b7 Merge eel.(none):/home/jonas/src/mysql-5.0 
into  eel.(none):/home/jonas/src/mysql-5.0-push
 2005-08-18 14:28:13 +02:00
jonas@eel.(none)
6399a93ac2 Merge eel.(none):/home/jonas/src/mysql-4.1 
into  eel.(none):/home/jonas/src/mysql-5.0
 2005-08-18 14:25:00 +02:00
jonas@eel.(none)
96f719818c Merge eel.(none):/home/jonas/src/mysql-4.1 
into  eel.(none):/home/jonas/src/mysql-4.1-push
 2005-08-18 14:07:31 +02:00
jonas@eel.(none)
3b68047235 bug#12118 - ndb alter table data loss 
Split table version into 2 (major, minor)
  Impl. signaling to API when table has been altered
  Allow running transactions to use any minor number for transactions
 2005-08-18 14:02:25 +02:00
petr@mysql.com
cb71626268 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usersnfs/pchardin/mysql-5.0
 2005-08-18 11:25:32 +02:00
petr@mysql.com
4fb6f4dddf Fix for Bug#11247 Stored procedures: Function calls in long loops leak memory 
and Bug#12297 SP crashes the server if data inserted inside a lon loop
Third commit attempt. With fixes to the issues, showed up after full rebuild and
tests on other hosts.
 2005-08-18 11:23:54 +02:00
bell@sanja.is.com.ua
fc070c2bcb stop on NULL comparison only if it is allowed (BUG#12509) 2005-08-18 12:07:14 +03:00
timour@mysql.com
76cacf4522 Merge mysql.com:/home/timka/mysql/src/5.0-virgin 
into  mysql.com:/home/timka/mysql/src/5.0-2486
 2005-08-18 11:29:29 +03:00
timour@mysql.com
f31f5eabc7 WL#2486 - natural and using join 
Fixed debug printout.
 2005-08-18 11:28:50 +03:00
timour@mysql.com
8d975efc72 WL#2486 - natural and using join according to SQL:2003 
- Fixed minor error after Monty's review.
 2005-08-18 11:24:59 +03:00
igor@rurik.mysql.com
fd5461ac12 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2005-08-17 22:24:20 -07:00
igor@rurik.mysql.com
5ac7d86793 view.test: 
Added a test case for bug #10970.
view.result:
  Added a test case for bug #10970.
  Modified the error messages for error ER_VIEW_SELECT_TMPTABLE.
sql_view.cc:
  Fixed bug #10970.
  In the function mysql_create_view if a view does not refer
  any tables directly the variable table must be updated
  after the call of open_and_lock_tables.
errmsg.txt:
  Modified the error messages for error ER_VIEW_SELECT_TMPTABLE
  (when fixing bug #10970).
 2005-08-17 22:19:12 -07:00
jimw@mysql.com
1eb0f45d17 Fix minor typo in handling of error conditions and return of SLEEP(). 2005-08-17 19:57:07 -07:00
jimw@mysql.com
15f97778ff Revert patch for Bug #12595, it causes the sql_mode test to fail. 2005-08-17 19:56:14 -07:00
jimw@mysql.com
e7656ffecc Merge mysql.com:/home/jimw/my/mysql-5.0-12582 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-17 18:45:36 -07:00
jimw@mysql.com
19ed563cd5 Fix bad merge of sql/item_strfunc.cc by aivanov 2005-08-17 18:42:07 -07:00
monty@mysql.com
c726451abb Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2005-08-18 03:41:11 +03:00
monty@mysql.com
3eaa953529 Cleanups and optimization during review of new code 2005-08-18 03:12:42 +03:00
evgen@moonbone.local
6d8bd17c3a Fix bug #11718 query with function, join and order by returns wrong type. 
create_tmp_field_from_item() was creating tmp field without regard to
original field type of Item. This results in wrong type being reported to
client.

To create_tmp_field_from_item() added special handling for Items with 
DATE/TIME field types to preserve their type.
 2005-08-17 23:53:12 +04:00
bell@sanja.is.com.ua
7f48830f9e sql_view.cc: 
correct exit from mysql_create_view to restore ennvironment (BUG#12468)
view.result, view.test:
  test of CRETE VIEW in SP
 2005-08-17 22:42:53 +03:00
sasha@asksasha.com
76a59be6fb Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  asksasha.com:/reiser-data/mysql-dev/mysql-4.1
 2005-08-17 12:39:30 -06:00
andrey@lmy004.
4ff51a5743 fix for bug #12591 (SHOW TABLES FROM dbname produces wrong error message) 2005-08-17 17:51:10 +02:00
aivanov@mysql.com
c3de1aa84a Merge mysql.com:/home/alexi/mysql-5.0 
into  mysql.com:/home/alexi/dev/mysql-5.0-1
 2005-08-17 18:46:20 +04:00
aivanov@mysql.com
8a80193e0a Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/alexi/mysql-5.0
 2005-08-17 18:41:19 +04:00
timour@mysql.com
a55786ca70 WL#2486 - natural and using join according to SQL:2003 
- fixed a problem with RIGHT JOIN ON and enabled corresponding tests in select.test
- fixed a memory leak
 2005-08-17 17:19:31 +03:00
timour@mysql.com
0671228b05 Fixed code formatting. 2005-08-17 14:20:01 +03:00
timour@mysql.com
066e3c4209 Merge mysql.com:/home/timka/mysql/src/5.0-virgin 
into  mysql.com:/home/timka/mysql/src/5.0-2486
 2005-08-17 13:47:16 +03:00
timour@mysql.com
c8e55a35b3 WL#2486 - Process NATURAL and USING joins according to SQL:2003 
- Applied Monty's patch after his review of sql_base.cc
 2005-08-17 13:46:36 +03:00
elliot@mysql.com
1664e31f12 Merge mysql.com:/Users/emurphy/src/bk-clean/mysql-4.1 
into  mysql.com:/Users/emurphy/src/work/mysql-4.1-bug11338
 2005-08-17 04:32:29 -04:00
elliot@mysql.com
197782605f BUG#11338 (logging of prepared statement w/ blob type) 
In cp932, '\' character can be the second byte in a 
multi-byte character stream. This makes it difficult to use
mysql_escape_string. Added flag to indicate which languages allow
'\' as second byte of multibyte sequence so that when putting a prepared
statement into the binlog we can decide at runtime whether hex encoding
is really needed.
 2005-08-17 04:26:32 -04:00
osku@127.(none)
3809fdac6d Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  127.(none):/home/osku/mysql-5.0
 2005-08-17 11:11:50 +03:00
osku@127.(none)
fb48039444 Fix bug #11946, truncate not always resetting the auto-increment counter 
in InnoDB tables.
 2005-08-17 11:00:20 +03:00
jimw@mysql.com
054e78943e Fix SLEEP() to be interruptable. (Bug #12582) 2005-08-16 16:31:16 -07:00
aivanov@mysql.com
df00bbc862 Merge mysql.com:/home/alexi/mysql-5.0 
into  mysql.com:/home/alexi/dev/mysql-5.0-1
 2005-08-16 23:33:06 +04:00
aivanov@mysql.com
0a1fa93190 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/alexi/mysql-5.0
 2005-08-16 23:27:00 +04:00
aivanov@mysql.com
ed6cd805dc information_schema.test: 
Added a comment line for a test case used for bug #12301.
information_schema.result:
  Fixed some test cases results (bug #12301).
sql_show.cc:
  Fixed bug #12301.
  The bug was due to a missing value setting for the NUMERIC_SCALE column
   in the get_schema_column_record() function (sql_show.cc).
 2005-08-16 23:11:04 +04:00
andrey@lmy004.
41c93e368b Merge lmy004.:/work/mysql-5.0-clean 
into lmy004.:/work/mysql-5.0-bug12595
 2005-08-16 20:59:18 +02:00
andrey@lmy004.
7269045b82 after review fix for bug #12595 2005-08-16 20:54:53 +02:00
evgen@moonbone.local
eb6135a765 Fix bug #11398 Bug in field_conv() results in wrong result of join with index 
When copying varchar fields with field_conv() it's not taken into account
that length_bytes of source and destination fields may be different.
This results in saving wrong data in field and making wrong key later.

Added check so if fields are varchar and have different length_bytes they
are not copied by memcpy().
 2005-08-16 22:13:43 +04:00