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

10365 commits

Author SHA1 Message Date
serg@serg.mylan
f66967cf1b sql/ha_federated.cc: update to new prototype 
sql/item_cmpfunc.cc:     typo fixed
 2005-03-17 16:58:23 +01:00
gluh@gluh.mysql.r18.ru
edb4dd5366 after merge fix 2005-03-17 18:44:24 +03:00
gbichot@quadxeon.mysql.com
3cb85a4740 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 
into quadxeon.mysql.com:/nfstmp1/guilhem/mysql-4.0-4xeon
 2005-03-17 15:51:52 +01:00
gluh@gluh.mysql.r18.ru
b435d6e862 Merge 4.1 -> 5.0 2005-03-17 16:51:07 +03:00
gbichot@quadxeon.mysql.com
d823bee92a safer creation of temp files used in replication of LOAD DATA INFILE. 
When we come to create these, they may already exist and it's necessary to delete these old, useless copies.
 2005-03-17 14:39:39 +01:00
serg@serg.mylan
376a4ee03b Field::quote_data(): 
don't call escape_string_for_mysql() unnecesary
  don't overwrite local buffer
escape_string_for_mysql():
  take a length of the destination buffer as an argument
 2005-03-17 12:27:45 +01:00
serg@serg.mylan
262f6b4f25 Automerge 2005-03-17 10:10:26 +01:00
serg@serg.mylan
aab19698ab Automerge 2005-03-17 10:06:49 +01:00
serg@serg.mylan
41997cf263 Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-03-17 08:46:48 +01:00
ramil@mysql.com
261105a007 Merge 2005-03-17 10:59:25 +04:00
ramil@mysql.com
a773916238 A fix (bug #8942: SUBSTRING_INDEX in UPDATE causes internal loop). 2005-03-17 10:24:50 +04:00
jani@a193-229-222-105.elisa-laajakaista.fi
1fbb61754b Fixed two bugs in MySQL ACL. 
First one is related to Bug#7905. One should not be allowed to
create new user with password without UPDATE privilege to
MySQL database. Furthermore, executing the same GRANT statement
twice would actually crash the server and corrupt privilege database.

Other bug was that one could update a column, using the existing
value as basis to calculate the new value (e.g. UPDATE t1 SET a=a+1)
without SELECT privilege to the field (a in the above example)

Fixed tests grant.pl and grant2, which were wrong.
 2005-03-17 08:16:56 +02:00
brian@zim.(none)
f5d0a23788 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 
into zim.(none):/home/brian/mysql/mysql-5.0
 2005-03-16 18:04:28 -08:00
igor@rurik.mysql.com
3103b4cae5 Merge rurik.mysql.com:/home/igor/mysql-4.1 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2005-03-16 17:50:03 -08:00
brian@zim.(none)
473e1ffd3a Removed support for RAID, mit-threads, and MySQL FS (really, if someone wants this feature look at a web-dav hookup). 2005-03-16 16:22:56 -08:00
igor@rurik.mysql.com
45ba13889d olap.result, olap.test: 
Added a test for bug #8615.
sql_select.cc:
  Fixed bug #8615.
  This fix only removed the cause of the reported crash.
  It does not resolve other problems of rollup queries
  with DISTINCT. They were fixed in the previous patch 
  for bug 8616.
 2005-03-16 15:55:04 -08:00
monty@mysql.com
ddec400e18 Merge with global tree 2005-03-17 01:27:04 +02:00
monty@mysql.com
aa6ab3b49c Move handler dependent tests to the specific handler (myisam, bdb, innodb) 
Enabled VARCHAR testing for innodb

NOTE: innodb.test currently fails becasue of a bug in InnoDB. 
I have informed Heikki about this and expect him to fix this ASAP
 2005-03-17 01:22:12 +02:00
serg@serg.mylan
f3cf0837d2 log_event.cc: 
#ifdef USING_TRANSACTIONS
ha_innodb.cc:
  comment
rpl_drop_temp.test, rpl_drop_temp.result:
  cleanup
 2005-03-16 23:47:38 +01:00
serg@serg.mylan
1354f104cf Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-03-16 22:40:58 +01:00
monty@mysql.com
f42941073d Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-03-16 22:59:06 +02:00
patg@krsna.
dcf73493df Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into krsna.:/home/patg/test/mysql-5.0
 2005-03-16 12:05:58 -08:00
acurtis@pcgem.rdg.cyberkinetica.com
4e0b462612 Merge pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8670.2 
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8670.3
 2005-03-16 16:27:07 +00:00
serg@serg.mylan
19279b1b03 merged 2005-03-16 17:13:43 +01:00
patg@krsna.
8e376b37d5 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into krsna.:/home/patg/test/mysql-5.0
 2005-03-16 07:55:56 -08:00
bell@sanja.is.com.ua
80d9cafa8f Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
 2005-03-16 17:06:04 +02:00
dlenev@mysql.com
5f5203b357 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/dlenev/src/mysql-5.0-eld-exp
 2005-03-16 17:14:08 +03:00
monty@mysql.com
594ef41b2d Cleanup during reviews 
Removed some optional arguments
Fixed portability problem in federated tests
 2005-03-16 16:11:01 +02:00
dlenev@mysql.com
8df3d5b098 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/dlenev/src/mysql-5.0-eld-exp
 2005-03-16 17:00:13 +03:00
monty@mysql.com
a085653331 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-03-16 15:44:31 +02:00
bar@mysql.com
a7b877df78 Bugs#9129: CHARSET(), COLLATION(), COERCIBILITY() 
not always correct for NULL values.
Now they always result a non NULL value even
the argument is NULL. It is more usefull for 
debugging purposes.
 2005-03-16 17:44:29 +04:00
gluh@gluh.mysql.r18.ru
41487d0b4e Fix for bug#8656: Crash with group_concat on alias in outer table 
fixed result_field support of Item_ref
 2005-03-16 16:44:28 +03:00
heikki@hundin.mysql.fi
9975f53359 ha_innodb.cc: 
Fix bug: InnoDB created all indexes on true VARCHARs as column prefix keys because field->pack_length() for a true VARCHAR is bigger than key_part->length; FOREIGN KEYs could not be created on true VARCHARs then
 2005-03-16 15:18:14 +02:00
gluh@gluh.mysql.r18.ru
4c3e8b078c Fix for bug #7100: relay_log_space_max missing from SHOW VARIABLES 2005-03-16 15:57:57 +03:00
heikki@hundin.mysql.fi
cb88409e07 data0type.h, row0sel.c: 
Fix a crash in a simple search with a key: the dtype->len of a true VARCHAR is the payload maximum len in bytes: it does not include the 2 bytes MySQL uses to store the string length
ha_innodb.cc:
  Fix a crash in true VARCHARs in test-innodb: we passed a wrong pointer to the column conversion in an UPDATE
rowid_order_innodb.result, ps_3innodb.result, innodb.result, endspace.result:
  Edit InnoDB test results to reflect the arrival of true VARCHARs
 2005-03-16 14:28:54 +02:00
serg@serg.mylan
99e581ecc1 sql/ha_innodb.cc 
protect prepare-...-commit with a mutex to ensure that commits in binlog and in the innodb have the same order
    store binlog position with the commit
 2005-03-16 12:45:08 +01:00
bar@mysql.com
2d8e8c02a5 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/home/bar/mysql-4.1-bug8785
 2005-03-16 14:35:44 +04:00
monty@mysql.com
8e54dece31 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-03-16 12:03:00 +02:00
dlenev@brandersnatch.localdomain
3da06a5500 Fixed behavior of LOAD DATA with subqueries in SET clause. 
The idea is to use TABLE_LIST::lock_type for passing type of lock for
target table to mysql_load() instead of using LEX::lock_option 
(which were rewritten by first subselect in SET clause).

This should also fix potential problem with LOAD DATA in SP
(it is important for them to have right lock_type in the table
 list by the end of statement parsing).
 2005-03-16 12:13:35 +03:00
marko@hundin.mysql.fi
19a82124a2 ha_innodb.cc: 
calc_row_difference(): Use non-inlined functions to avoid linking error.
 2005-03-16 09:56:33 +02:00
serg@serg.mylan
4afb736576 sql/handler.cc 
smarter xid-to-str routiine
    fixed assert crash in XA RECOVER
sql/sql_parse.cc
    XA COMMIT/ROLLBACK did not send_ok in some cases
 2005-03-16 08:42:06 +01:00
serg@serg.mylan
d7b2d4c541 global read lock code now uses a dedicated mutex 
(otherwise a deadlock when ALTER writes to
binlog holding LOCK_open, it causes binlog rotation,
binlog waits for prepared transactions to commit, and commit
needs LOCK_open to check for global read lock)
 2005-03-16 08:40:19 +01:00
igor@rurik.mysql.com
ce6c390c39 olap.result, olap.test: 
Added a test case for bug #8616.
item.h:
  Fixed bug #8616.
  Added class Item_null_result used in rollup processing.
sql_select.h, sql_select.cc:
  Fixed bug #8616.
  Added JOIN::rollup_write_data to cover rollup queries
  with DISTINCT. Modified other rollup methods.
 2005-03-15 22:50:54 -08:00
patg@krsna.
b60a20ce73 WL #2094 Federated Storage Handler. 
Edits to ha_federated.cc per Monty, cleanup
 2005-03-15 18:41:06 -08:00
dlenev@brandersnatch.localdomain
f169114042 WL#874 "Extended LOAD DATA". 
Now one can use user variables as target for data loaded from file
(besides table's columns). Also LOAD DATA got new SET-clause in which
one can specify values for table columns as expressions.

For example the following is possible:
LOAD DATA INFILE 'words.dat' INTO TABLE t1 (a, @b) SET c = @b + 1;

This patch also implements new way of replicating LOAD DATA.
Now we do it similarly to other queries.
We store LOAD DATA query in new Execute_load_query event
(which is last in the sequence of events representing LOAD DATA).
When we are executing this event we simply rewrite part of query which
holds name of file (we use name of temporary file) and then execute it
as usual query. In the beggining of this sequence we use Begin_load_query
event which is almost identical to Append_file event
 2005-03-16 04:32:47 +03:00
acurtis@pcgem.rdg.cyberkinetica.com
1a64fe066d Bug#8670 
Rework to resolve ambigious grammer: conflict in join expression
  handling of parentheses for nested joins and derived tables.
  Tests included of failing statements
Optimize item construction for AND/OR logical expressions
 2005-03-16 00:13:23 +00:00
monty@mysql.com
1a9e05dd3f Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-03-16 01:30:28 +02:00
monty@mysql.com
fde941e5b4 Partly reverty back patch (in heap-auto-increment-key detection) to ensure that auto_key and auto_key_type are calculated the same way 2005-03-16 01:15:45 +02:00
heikki@hundin.mysql.fi
edf59e5480 Many files: 
InnoDB true VARCHAR
 2005-03-16 00:34:15 +02:00
reggie@mdk10.(none)
3bfcc5dd75 Merge mdk10.(none):/home/reggie/bk/mysql-4.1 
into mdk10.(none):/home/reggie/bk/mysql-5.0
 2005-03-15 16:28:47 -06:00
reggie@mdk10.(none)
6c00af77a0 Bug #6660 mysqldump creates bad pathnames on Windows 
sql_show.cc:
  changed strdup to thd->memdup per Serg's advice
 2005-03-15 16:24:37 -06:00
reggie@mdk10.(none)
aa395b3a45 Merge mdk10.(none):/home/reggie/bk/mysql-4.1 
into mdk10.(none):/home/reggie/bk/mysql-5.0
 2005-03-15 11:42:31 -06:00
reggie@mdk10.(none)
ef86c0af65 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mdk10.(none):/home/reggie/bk/mysql-4.1
 2005-03-15 11:37:14 -06:00
reggie@mdk10.(none)
887f2a53fe Bug #6660 mysqldump creates bad pathnames on Windows 
This is a modifiction of my previous patch after receiving feedback. This is a better way to fix the problem.  With this patch, data directory and index directory will use only forward slashes (/) when on Windows.

mysqldump.c:
  Removed fixPaths routine.  Was improper fix for bug #6660
sql_show.cc:
  Changed append_directory to convert backslashes to foward slashes when on Windows.
 2005-03-15 11:33:06 -06:00
ramil@mysql.com
3f6fdabe4f Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/home/ram/work/5.0
 2005-03-15 20:06:37 +04:00
ramil@mysql.com
4ee9cc5a98 after merge fix 2005-03-15 19:43:32 +04:00
ramil@mysql.com
d5e3ba70f3 merging 2005-03-15 19:31:52 +04:00
msvensson@neptunus.(none)
3f8a66cbea Merged WL#2269 to mysql-5.0 2005-03-15 15:22:40 +01:00
monty@mysql.com
05acaf060c Merge with global tree 2005-03-15 16:21:08 +02:00
monty@mysql.com
dd4db08438 Code cleanups during review of pushed code 2005-03-15 16:07:28 +02:00
msvensson@neptunus.(none)
2bdd710d3c WL#2269 Enable query cache for NDB part 2 
-This is mostly fixes for correct behaviour when using query cache + transactions + the thread that
fetches commit count from NDB at regular intervals. The major fix is to add a
list in thd_ndb, that keeps a list of NDB_SHARE's that were modified by
transaction and then "clearing" them in ndbcluster_commit.
 2005-03-15 15:03:25 +01:00
konstantin@mysql.com
021f8d2170 Cleanup 2005-03-15 16:54:11 +03:00
bar@mysql.com
c6c887b990 # Bug#8785 Problem with nested concats and 
character set conversion of a string constant.
 2005-03-15 17:15:47 +04:00
ramil@mysql.com
04328c3dfa A fix (bug #8799: Killed filesorts can fail inited==RND assertion in ha_rnd_end). 2005-03-15 15:32:11 +04:00
ramil@mysql.com
ec775b65f5 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/home/ram/work/4.1.b8799
 2005-03-15 14:13:44 +04:00
ramil@mysql.com
46613bafbe A fix (bug #8489: Strange auto_increment behaviour with HEAP table). 2005-03-15 13:32:12 +04:00
patg@krsna.
d0603db72a Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into krsna.:/home/patg/test/mysql-5.0
 2005-03-15 00:36:38 -08:00
patg@krsna.
24bc862456 This changeset contains changes approved in code review by 
Konstja and Georg, change sets 1.1806, 1.1805. These changes has been successfully 
tested on both my own workstation (Suse 9.0) and production.mysql.com.
 2005-03-15 00:32:21 -08:00
sergefp@mysql.com
62465a98e2 Merge mysql.com:/home/psergey/mysql-4.1-bug8510 
into mysql.com:/home/psergey/mysql-5.0-bug8510
 2005-03-15 09:29:54 +03:00
sergefp@mysql.com
e7e2a8c8eb Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/psergey/mysql-4.1-bug8510
 2005-03-15 04:09:41 +03:00
konstantin@mysql.com
6a2ef5577c WL#926 "AVG(DISTINCT) and other distincts", part 2 (out of 3): clean up 
Item_sum_count_distinct, and
deploy Unique for use with COUNT(DISTINCT) if there is no blob
column in the list of DISTINCT arguments.
 2005-03-15 03:46:19 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
98e83555a5 Merge 4.1 - 5.0 2005-03-15 01:14:59 +02:00
serg@serg.mylan
57adc4d740 Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-03-14 20:45:10 +01:00
serg@serg.mylan
f04bef8faf merged 2005-03-14 18:46:30 +01:00
serg@serg.mylan
3613f8c262 sql/log.cc 
don't set LOG_EVENT_BINLOG_IN_USE_F for relay logs
sql/sql_repl.cc
    clear LOG_EVENT_BINLOG_IN_USE_F flag before sending an event to a slave
 2005-03-14 17:53:24 +01:00
gluh@gluh.mysql.r18.ru
354a93842f Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0
 2005-03-14 19:47:46 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
9ec8d87328 Updated error message to be more informative. Previous error message 
"Access denied to database mysql" was actually not just misleading, but
also wrong.

Bug#7905.
 2005-03-14 16:59:09 +02:00
mskold@mysql.com
f2db341abe Removed unnecessary current_thd 2005-03-14 15:53:44 +01:00
gluh@gluh.mysql.r18.ru
ee434e5cc9 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0
 2005-03-14 17:27:10 +03:00
mskold@mysql.com
7092c7dec2 WL#2353 EXPLAIN support for condition pushdown 2005-03-14 15:26:10 +01:00
serg@serg.mylan
dba1e0889a Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-03-14 14:47:51 +01:00
msvensson@neptunus.(none)
a7ad7784c3 Manual merge 2005-03-14 12:25:26 +01:00
msvensson@neptunus.(none)
13ec961c3a BUG#6554 Problem Building MySql on Fedora Core 3 
- Moved static variables defined inside of function to file scope to avoid this linking problem on FC3
 2005-03-14 12:07:49 +01:00
serg@serg.mylan
ada959edf8 anotehr fix for Item_func_isnotnull::not_null_tables() 2005-03-14 11:04:42 +01:00
serg@serg.mylan
a6b3b8fa98 print more information 2005-03-14 09:27:34 +01:00
marty@linux.site
20ca32862a Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into linux.site:/home/marty/MySQL/mysql-5.0
 2005-03-14 09:21:15 +01:00
serg@serg.mylan
9248f0d714 Item_func_isnotnull::not_null_tables - return 0 if not top-level item 2005-03-13 23:56:25 +01:00
serg@serg.mylan
8986ffebde print xa recovery progress 
add names to handlertons
trans_need_2pc() macro
 2005-03-13 21:58:09 +01:00
konstantin@mysql.com
22915b3ad5 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/media/sda1/mysql/mysql-5.0-926
 2005-03-13 23:53:30 +03:00
konstantin@mysql.com
983c75f05e WL#926 "SUM(DISTINCT) and AVG(DISTINCT)": improvement of SUM(DISTINCT) and 
implementation of AVG(DISTINCT) which utilizes the approach with Fields.
The patch implemented in October is portede to the up-to-date tree 
containing DECIMAL type.
Tests for AVG(DISTINCT) (although there is not much to test provided
that SUM(DISTINCT) works), cleanups for COUNT(DISTINCT) and GROUP_CONCAT()
will follow in another changeset.
 2005-03-13 23:50:43 +03:00
serg@serg.mylan
18343b9454 correct not_null_tables() for XOR and AND 
correct top_level_item for XOR
 2005-03-13 16:34:40 +01:00
heikki@hundin.mysql.fi
a95f09e228 set_var.cc, mysqld.cc, ha_innodb.cc, sql_class.h: 
Add a settable session variable innodb_support_xa; setting it to 0 can save up to 10 % of CPU time and 150 bytes of space in each undo log
trx0trx.h, trx0undo.c, trx0trx.c, trx0roll.c:
  Enable XA if innodb_support_xa is not set to 0; make prepare to do log fsync's according to innodb_flush_log_at_trx_commit
 2005-03-13 12:49:39 +02:00
igor@rurik.mysql.com
7d8b91060d Manual merge 2005-03-13 00:40:55 -08:00
igor@rurik.mysql.com
a90d2bd97c join_outer.result, join_outer.test: 
Added a test case for bug #9017.
item_cmpfunc.h:
  A wrong not_null_tables method for Item_cond_xor
  caused a conversion of a left join into an inner join
  that was not valid.
 2005-03-12 23:31:52 -08:00
serg@serg.mylan
0c31836fa5 Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-03-12 20:17:16 +01:00
serg@serg.mylan
32700d1430 if no xa recovery (or after it): 
warning on startup if prepared foreign xids
  error on startup if prepared our xids
  temporarily: always rollback prepared our xids instead of an error
 2005-03-12 20:09:54 +01:00
jimw@mysql.com
c56a00ec98 Merge bk-internal:/home/bk/mysql-5.0 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-03-11 12:47:29 -08:00
jimw@mysql.com
441f863f52 Merge mysql.com:/home/jimw/my/mysql-5.0-8902 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-03-11 12:46:11 -08:00
jimw@mysql.com
eaea82d3af Merge query_cache tests 2005-03-11 12:38:38 -08:00
serg@serg.mylan
a85613f62c Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-03-11 21:37:52 +01:00
serg@serg.mylan
7b19170cf7 BUG#9101 - RELEASE/ROLLBACK TO SAVEPOINT did not forget savepoints correctly 2005-03-11 21:10:41 +01:00
jimw@mysql.com
50f9fc3368 Merge test and results 2005-03-11 11:07:32 -08:00
ramil@mysql.com
31a1510ff0 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/home/ram/work/5.0.b9029
 2005-03-11 14:01:24 +04:00
ramil@mysql.com
ec41753240 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/home/ram/work/5.0.b9029
 2005-03-11 12:30:55 +04:00
ramil@mysql.com
bf5794622d Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/home/ram/work/5.0
 2005-03-11 12:29:12 +04:00
sergefp@mysql.com
f9322a85a4 Merge mysql.com:/home/psergey/mysql-4.1-bug8711 
into mysql.com:/home/psergey/mysql-5.0-bug8711
 2005-03-11 02:26:38 +03:00
sergefp@mysql.com
763039a17b Merge 2005-03-11 02:23:16 +03:00
sergefp@mysql.com
5d865045c9 Fix for BUG#8711: "<=>" may have true value for NULL arguments, so make 
Item_func_equal::not_null_tables() always return 0.
 2005-03-11 02:17:03 +03:00
acurtis@pcgem.rdg.cyberkinetica.com
759ad1a13e More portability fixes 2005-03-10 19:42:57 +00:00
timour@mysql.com
74dac23915 Merge mysql.com:/home/timka/mysql/src/5.0-virgin 
into mysql.com:/home/timka/mysql/src/5.0-dbg
 2005-03-10 17:00:05 +02:00
dlenev@mysql.com
a66a54edee Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/dlenev/src/mysql-5.0-sp
 2005-03-10 16:22:05 +03:00
ramil@mysql.com
ec06f3e762 a fix (bug #9029 Traditional: Wrong SQLSTATE returned for string truncation). 2005-03-10 17:08:45 +04:00
dlenev@brandersnatch.localdomain
3b6aeddc11 Fix for sp.test failure in --ps-protocol mode (2nd attempt). 
Now we should call open_and_lock_tables() even if table list is empty -
to cache stored routines used by query and open and lock tables required
for their execution.
 2005-03-10 16:05:48 +03:00
bell@sanja.is.com.ua
056d5a3934 fixed left expression of IN/ALL/ANY subquery transformation support (BUG#8888) 2005-03-10 14:01:22 +02:00
timour@mysql.com
b9c56257bb Merge 2005-03-10 13:59:48 +02:00
timour@mysql.com
abf659dee9 Merge mysql.com:/home/timka/mysql/src/4.1-bug-7425 
into mysql.com:/home/timka/mysql/src/4.1-dbg
 2005-03-10 11:50:55 +02:00
msvensson@neptunus.(none)
c94952d1f0 Removed unused variable 2005-03-10 10:43:11 +01:00
tomas@poseidon.ndb.mysql.com
c7925bd3be Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2005-03-10 09:20:44 +01:00
serg@serg.mylan
e272ab9772 Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-03-10 08:45:28 +01:00
ramil@mysql.com
f98d1a84cf Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/home/ram/work/5.0
 2005-03-10 10:22:35 +04:00
igor@rurik.mysql.com
db4ca33f52 Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0 
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2005-03-09 16:53:20 -08:00
serg@serg.mylan
e40bf3c40b sql/ha_ndbcluster.cc 
after merge fix
sql/sql_parse.cc
    correct max_connections condition
 2005-03-10 00:10:10 +01:00
jimw@mysql.com
9fea6f6d1f Merge bk-internal:/home/bk/mysql-5.0 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-03-09 14:44:58 -08:00
marty@linux.site
d88b75874b Fixed broken 4.1->5.0 merge 2005-03-09 23:38:11 +01:00
acurtis@pcgem.rdg.cyberkinetica.com
3b0e983bf0 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug3788.4
 2005-03-09 22:10:38 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
dde2a985f2 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug3788.4
 2005-03-09 21:59:29 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
1a996a7140 Cleanup for VC++ 2005-03-09 21:53:04 +00:00
dlenev@brandersnatch.localdomain
d3f4a597da Portability fix. 2005-03-10 00:52:47 +03:00
jimw@mysql.com
67c9b3316a Merge bk-internal:/home/bk/mysql-5.0 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-03-09 13:26:11 -08:00
tomas@poseidon.ndb.mysql.com
3e95113461 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2005-03-09 21:19:57 +01:00
lars@mysql.com
1422a2b1b1 Fix complilation failure 2005-03-09 20:49:44 +01:00
igor@rurik.mysql.com
af5d21357e Manual merge 2005-03-09 10:58:52 -08:00
jimw@mysql.com
71fd853121 Merge bk-internal:/home/bk/mysql-5.0 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-03-09 10:40:27 -08:00
serg@serg.mylan
79573a5ee8 after merge fixes 2005-03-09 19:22:30 +01:00
jimw@mysql.com
635ba88a4c Merge bk-internal:/home/bk/mysql-5.0 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-03-09 09:39:05 -08:00
jimw@mysql.com
3c7c548b9a Fix change made to ER_READY by creating a new message, instead. 2005-03-09 08:56:50 -08:00
tomas@poseidon.ndb.mysql.com
a032510e19 corrected typo: deafault -> default 2005-03-09 16:39:23 +01:00
timour@mysql.com
f489e56291 Fix for BUG#7425. 
The reported problems were due to two completely unrelated omissions.
1) The file sort procedure didn't correctly create the sort key in
   make_sortkey when the sortkey was an unsigned integer.
2) The name resolution procedure for column references inside a HAVING
   clause did not propagate the unsigned_flag of the resolved references.
This patch corrects both problems.
 2005-03-09 16:51:03 +02:00
ramil@mysql.com
2b1c712d53 a fix (bug #7205: "archive" test fails on UnixWare when using prepared statements) 2005-03-09 18:33:01 +04:00
marty@linux.site
e6d7c9fc5d Fix for Bug #8897 Test ndb_autodiscover: Spurious warning in --ps-protocol on NDB 2005-03-09 14:29:22 +01:00
serg@serg.mylan
956682de1a merged 2005-03-09 14:09:06 +01:00
serg@serg.mylan
6121422820 sql/mysqld.cc 
preserve backward compatibility
 2005-03-09 13:41:57 +01:00
serg@serg.mylan
c49928447d Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-03-09 13:02:51 +01:00
serg@serg.mylan
1e09c15a8b don't close binlog in the destructor - use explictit MYSQL_LOG::cleanup for this 2005-03-09 12:29:51 +01:00
igor@rurik.mysql.com
4559fb998b func_str.result, func_str.test: 
Added a test case for bug #8669.
item_strfunc.cc:
  Fixed bug #8669.
  Function AES_DECRYPT can return NULL value.
 2005-03-09 00:15:51 -08:00
jimw@mysql.com
2b2efa4208 Add all SQL_MODE settings to proc table. (Bug #8902) 2005-03-08 17:40:43 -08:00
acurtis@pcgem.rdg.cyberkinetica.com
8d94824aa1 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug3788.4
 2005-03-09 01:15:42 +00:00
acurtis@ltantony.rdg.cyberkinetica.homeunix.net
be3c863ba0 Merge in fix Bug#3788 2005-03-08 22:32:09 +00:00
Sinisa@sinisa.nasamreza.org
b2c77c1c9c post merge fixes 2005-03-08 22:59:21 +02:00
marko@hundin.mysql.fi
fa001505e3 mysqld.cc: 
main(): add missing parameter to printf(ER(ER_READY),...) call
 2005-03-08 22:33:11 +02:00
serg@serg.mylan
5a2c426eb8 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-03-08 19:47:49 +01:00
serg@serg.mylan
9272081ebb BUG#6635 - test_if_skip_sort_order() thought it can skip filesort 
for fulltext searches too
 2005-03-08 19:45:55 +01:00
pem@mysql.com
699c8f38d8 Merge mysql.com:/usr/local/bk/mysql-5.0 
into mysql.com:/home/pem/work/mysql-5.0
 2005-03-08 18:19:21 +01:00
joerg@mysql.com
b2c4d73997 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/M50/mysql-5.0
 2005-03-08 17:35:53 +01:00
joerg@mysql.com
3bbc35ac01 Merge changes. 2005-03-08 17:24:07 +01:00
pem@mysql.com
d8592e88ae Merge mysql.com:/usr/local/bk/mysql-5.0 
into mysql.com:/home/pem/work/mysql-5.0
 2005-03-08 17:12:51 +01:00
jani@ua141d10.elisa.omakaista.fi
8db4423b8c Fixed Bug#8922. 
Reverted Jim's patch.
 2005-03-08 18:12:12 +02:00
monty@mysql.com
615129206c Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-03-08 16:31:59 +02:00
joerg@mysql.com
a67b670a08 Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/merge-4.1 2005-03-08 14:30:17 +01:00
joerg@mysql.com
28b65497da Manual merge, no effect on 4.1. 2005-03-08 14:17:57 +01:00
pem@mysql.com
1f429fc1fe Merge mysql.com:/usr/local/bk/mysql-5.0 
into mysql.com:/home/pem/work/mysql-5.0
 2005-03-08 09:51:00 +01:00
jimw@mysql.com
df84c534dd Flush entries from the query cache for tables used in 
administrative statements that may alter the table, such
as REPAIR TABLE. (Bug #8480)
 2005-03-07 18:15:19 -08:00
jimw@mysql.com
fd6e7c878e Re-enable IO cache mode that allows slow and query logs to go to a FIFO 
(lost in merge because the code to open these logs was moved to a different
file).
 2005-03-07 13:56:58 -08:00
pem@mysql.comhem.se
6a15e01393 Fixed BUG#8937: Stored Procedure: AVG() works as SUM() in SELECT ... INTO statement 2005-03-07 18:09:53 +01:00
hf@deer.(none)
fbbb58c6ae Fix for bug #8935 CAST(time AS DECIMAL) crashes 2005-03-07 20:53:51 +04:00
gluh@gluh.mysql.r18.ru
00449b8f9c Fix for bug#8978 : Crash on 'select format ...' 2005-03-07 18:56:18 +03:00
serg@serg.mylan
c36fa576c6 additional safety 2005-03-07 16:45:19 +01:00
serg@serg.mylan
d6fa7288c8 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-03-07 14:28:10 +01:00
serg@serg.mylan
2472810489 Fixed crash if max_connections is exceeded. BUG#8996 2005-03-07 13:59:28 +01:00
gbichot@quadita2.mysql.com
fa27e11923 Default value of slave_transaction_retries is now 10 
(whereas it's 0 in 4.1, for safety as this is new code).
 2005-03-07 12:49:38 +01:00
joerg@mysql.com
88773a8c8d Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/M41/mysql-4.1
 2005-03-07 11:46:31 +01:00
mskold@mysql.com
ce87085294 Review fixes for Bug #8753 Invalid schema 
object version after dropping index
 2005-03-07 10:53:16 +01:00
joerg@mysql.com
ab271b4d84 Manual merge. 2005-03-07 10:29:50 +01:00
joerg@mysql.com
c45cfb7c07 Manual merge of the 4.0.24 compile changes into the 4.1 tree. 2005-03-07 10:27:20 +01:00
mskold@mysql.com
6fc6a7521a Fix for Bug #8753 Invalid schema object version after dropping index 2005-03-07 10:21:38 +01:00
konstantin@mysql.com
0f1d024461 Porting of "buffered read" patch to 5.0 and post-review fixes. 
The patch implements the idea suggested by Olaf van der Spek in 
thread "Client: many small reads?" (internals@lists.mysql.com).
Now small reads performed by the client library are buffered.
The buffering gives up to 2 times speedup when retrieving 
one-column tables.
 2005-03-06 00:10:08 +03:00
Sinisa@sinisa.nasamreza.org
a54b5ea52f Fixing bug #8850 in such a way that when TRUNCATE is called within 
stored  procedure,  it  is converted  to DELETE.
 2005-03-05 21:44:15 +02:00
paul@frost.snake.net
e25a5877e0 sql_udf.cc: 
Comment changes: use standard style; fix grammar.
 2005-03-05 12:42:05 -06:00
bar@mysql.com
e660117e70 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/bar/mysql-5.0
 2005-03-05 19:58:49 +04:00
bar@mysql.com
d50d213162 Merge 2005-03-05 18:20:35 +04:00
dlenev@mysql.com
48d92d150d Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/dlenev/src/mysql-5.0-sp
 2005-03-05 16:33:36 +03:00
dlenev@brandersnatch.localdomain
e6a506c397 Fix for yet another memleak caused by SP-locking patch. 
Improved handling of situations when we encounter error during
CREATE PROCEDURE (FUNCTION/TRIGGER/...) and bail out of yyparse()
without restoring proper THD::lex.
 2005-03-05 16:31:58 +03:00
gluh@gluh.mysql.r18.ru
df2b38913f WL2131: Access control for SHOW ... PROCEDURE|FUNCTION ... 2005-03-05 14:35:32 +03:00
igor@linux.local
6d7862aeaf logging_ok: 
Logging to logging@openlogging.org accepted
func_group.result, func_group.test:
  Added a test case for bug #8893.
opt_sum.cc:
  A misplaced initialization for the returned parameter
  prefix_len in the function find_key_for_maxmin caused
  usage of a wrong key prefix by the min/max optimization
  in cases when the matching index was not the first index
  that contained the min/max field.
 2005-03-04 20:24:13 -08:00
konstantin@mysql.com
9ca989aff2 Chmod -x for ha_federated.h 2005-03-05 00:35:00 +03:00
acurtis@pcgem.rdg.cyberkinetica.com
5e1d2ad68c Bug#3788 
Crashes with stored procedure return non-string values
  Also fixes Bug#2773
 2005-03-04 21:14:35 +00:00
hf@deer.(none)
45b90d45e3 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into deer.(none):/home/hf/work/mysql-5.0.8915
 2005-03-05 00:29:04 +04:00
hf@deer.(none)
d3ee99ad91 Fix for bug #8431 (FLOOR returns incorrect result) 2005-03-04 23:06:00 +04:00
hf@deer.(none)
af329d532f Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0 
into deer.(none):/home/hf/work/mysql-5.0.8915
 2005-03-04 22:01:21 +04:00
dlenev@brandersnatch.localdomain
c24820834a Fix for memory leak which was introduced by patch improving locking in SP. 
Made mysql_make_view() to call destructor for st_lex_local objects before
throwing them away (this happens in case of error).
 2005-03-04 20:54:24 +03:00
hf@deer.(none)
7e7d98a291 Fix for bug #8430 (CEILING returns incorrect result) 2005-03-04 20:35:55 +04:00
dlenev@mysql.com
5b16dbf960 Manual merge SP-locking improvements patch with current tree. 2005-03-04 17:46:45 +03:00
marko@hundin.mysql.fi
a8aced1e64 ha_innodb.cc: 
write_row(): Detect SQLCOM_OPTIMIZE, so that also OPTIMIZE TABLE
  will commit at every 10,000 copied rows.
 2005-03-04 15:53:05 +02:00
dlenev@brandersnatch.localdomain
5a6c7027f0 Better approach for prelocking of tables for stored routines execution 
and some SP-related cleanups.

- We don't have separate stage for calculation of list of tables
  to be prelocked and doing implicit LOCK/UNLOCK any more.
  Instead we calculate this list at open_tables() and do implicit
  LOCK in lock_tables() (and UNLOCK in close_thread_tables()).
  Also now we support cases when same table (with same alias) is
  used several times in the same query in SP.

- Cleaned up execution of SP. Moved all common code which handles
  LEX and does preparations before statement execution or complex
  expression evaluation to auxilary sp_lex_keeper class. Now 
  all statements in SP (and corresponding instructions) that
  evaluate expression which can contain subquery have their
  own LEX.
 2005-03-04 16:35:28 +03:00
gluh@gluh.mysql.r18.ru
a55711b424 Fix for bug #8701: Server crash on 'set @@transaction_alloc_block_size=...' 2005-03-04 14:29:05 +03:00
ingo@mysql.com
9e02be68c8 Merge 2005-03-04 11:38:14 +01:00
ingo@mysql.com
212388bd3c Merge with after merge fix 2005-03-04 11:37:45 +01:00
bar@mysql.com
7e8e033290 type_blob.result, func_system.result, func_str.result, ctype_collate.result: 
fixing test results accordingly.
func_system.test:
  New test that illegal mix of collations does not happen anymore.
item_strfunc.h:
    safe_charset_converter() was added for system constants.
item_strfunc.cc:
  safe_charset_converter() was added for system constants.
item_func.cc, item.h, item.cc:
  Bug#8291: Illegal collation mix with USER() function.
  After discussion with PeterG and Serge, a new coercibility
  level for "system constants" was introduced, between
  COERRIBLE and IMPLICIT. Thus:
  SELECT col1 = USER() FROM t1; - is done according to col1 collation.
  SELECT 'string' = USER(); - is done according to USER() collation.
  At the same time, "nagg" and "strong" members were removed as unused.
item_create.cc:
  Version is a system constant too.
 2005-03-04 14:20:49 +04:00
joerg@mysql.com
136c1ea181 Changed C++ style comment to C style for 'sql/net_serv.cc' which will be symlinked 
to 'libmysql/net.c'.
 2005-03-04 11:07:56 +01:00
monty@mysql.com
03a2302202 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-03-04 10:48:32 +02:00
ingo@mysql.com
b5775ee16c Merge mysql.com:/home/mydev/mysql-4.0 
into mysql.com:/home/mydev/mysql-4.1-4100
 2005-03-04 09:35:21 +01:00
jimw@mysql.com
2c6e46f47e Clean up merge of fix for Bug #3309. 2005-03-03 17:44:28 -08:00
serg@serg.mylan
f2c414e024 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-03-04 00:05:52 +01:00
jimw@mysql.com
f7c01cfb76 Merged from 4.1 2005-03-03 15:01:46 -08:00
serg@serg.mylan
3de51f273b after merge fixes 2005-03-03 23:57:48 +01:00
serg@serg.mylan
08d5ef6507 typos fixed 2005-03-03 23:10:23 +01:00
serg@serg.mylan
e47d0a0e2d merge 2005-03-03 23:07:20 +01:00
serg@serg.mylan
45641ff65c Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2005-03-03 21:13:57 +01:00
serg@serg.mylan
f84bd700b3 uninit variable fixed 2005-03-03 21:13:33 +01:00
serg@serg.mylan
8d9a53a78c Fixes for bugs reported by Stefano Di Paola (stefano.dipaola@wisec.it) 2005-03-03 19:51:29 +01:00
jimw@mysql.com
0e8a5dbe08 Merge mysql.com:/home/jimw/my/mysql-4.1-3309 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-03-03 10:47:20 -08:00
jimw@mysql.com
18f13a24a2 Merge bk-internal:/home/bk/mysql-5.0 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-03-03 09:59:38 -08:00
jimw@mysql.com
6a082b36ed Merge bk-internal:/home/bk/mysql-5.0 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-03-03 08:34:27 -08:00
gluh@gluh.mysql.r18.ru
7367af4757 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0
 2005-03-03 19:21:26 +03:00
gluh@gluh.mysql.r18.ru
104072f154 Fix for bug #8164: subquery with INFORMATION_SCHEMA.COLUMNS, 100 % CPU 2005-03-03 19:20:16 +03:00
konstantin@mysql.com
fe2d63a060 Fixes for bug#8115 "Server Crash with prepared statement" 
and bug#8849 "problem with insert statement with table alias's": 
make equality propagation work in stored procedures and prepared 
statements.
Equality propagation can change AND/OR structure of ON expressions,
so the fix is to provide each execution of PS/SP with it's own
copy of AND/OR tree. We have been doing that already for WHERE clauses,
now ON clauses are also copied.
 2005-03-03 17:38:59 +03:00
gluh@gluh.mysql.r18.ru
66bd0447e4 Fix for bug#8740: Server crash at start on Solaris 9 (64 bit) 2005-03-03 17:38:58 +03:00
ramil@mysql.com
710a32621c Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/home/ram/work/5.0
 2005-03-03 15:38:00 +04:00
ramil@mysql.com
e9a20acbb6 After merge fix. 2005-03-03 15:37:14 +04:00
monty@mysql.com
c34c8ad4b0 Use pushed fix for same problem I fixed 2005-03-03 13:25:07 +02:00
monty@mysql.com
0c041be676 Fixed compiler warning 2005-03-03 13:21:42 +02:00
ramil@mysql.com
de1153b5e6 manual merge 2005-03-03 14:29:37 +04:00
pem@mysql.com
f170e8e03e Merge mysql.com:/usr/local/bk/mysql-5.0 
into mysql.com:/home/pem/work/mysql-5.0
 2005-03-03 10:51:20 +01:00
sergefp@mysql.com
00a560c727 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/psergey/mysql-4.1-bugs
 2005-03-03 05:04:00 +03:00
sergefp@mysql.com
eeae2c4dee Comments added 2005-03-03 05:03:21 +03:00
jimw@mysql.com
5d2bedc391 Fix bug in checking of table-specific grats that caused IP/NETMASK 
hostnames to not be matched correctly. (Bug #3309)
 2005-03-02 16:30:24 -08:00
jimw@mysql.com
d596af2c97 Merge bk-internal:/home/bk/mysql-5.0 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-03-02 10:23:07 -08:00
pem@mysql.com
e4908b4020 Merge mysql.com:/usr/local/bk/mysql-5.0 
into mysql.com:/home/pem/work/mysql-5.0
 2005-03-02 18:05:57 +01:00
patg@krsna.patg.net
e3f8c2f51e Merge mysqldev@production.mysql.com:/data0/mysqldev/my/mysql-5.0-merge 
into krsna.patg.net:/home/patg/mysql-5.0
 2005-03-02 09:01:07 -08:00
pem@mysql.comhem.se
027c5a6dac Fixed BUG#8762: Stored Procedures: Inconsistent behavior 
of DROP PROCEDURE IF EXISTS statement.
 2005-03-02 17:25:58 +01:00
ramil@mysql.com
89d44e039e Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/home/ram/work/4.1
 2005-03-02 20:04:38 +04:00
patg@krsna.patg.net
0aec332ba3 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into krsna.patg.net:/home/patg/mysql-5.0
 2005-03-02 08:04:26 -08:00
ramil@mysql.com
89a105abc5 a fix for --ps-protocol (bug #6089: FOUND_ROWS returns wrong values when no table/view is used) 2005-03-02 20:00:48 +04:00
guilhem@mysql.com
d1f089b3d7 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/mysql_src/mysql-5.0-xa
 2005-03-02 16:40:04 +01:00
guilhem@mysql.com
c4ac232d17 First part of fix for BUG#7998 "Replication should be more clever about when to replicate RELEASE_LOCK()" 
(next part is updating test results)
 2005-03-02 16:37:54 +01:00
monty@mysql.com
8fe3d8a039 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-03-02 17:02:05 +02:00
serg@serg.mylan
998c540fa9 Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-03-02 15:31:03 +01:00
serg@serg.mylan
60e1c869f5 workaround for a bug removed 2005-03-02 15:29:46 +01:00
guilhem@mysql.com
c6cedf52e3 Merge 2005-03-02 14:46:19 +01:00
guilhem@mysql.com
c6f1a2e453 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-clean
 2005-03-02 11:38:38 +01:00
guilhem@mysql.com
11a1c83c03 Fix for BUG#8325 "Deadlock in replication thread stops replication": 
in slave SQL thread: if a transaction fails because of InnoDB deadlock or innodb_lock_wait_timeout exceeded,
optionally retry the transaction a certain number of times (new variable --slave_transaction_retries).
 2005-03-02 11:29:48 +01:00
ingo@mysql.com
306bd2fc69 Merge 2005-03-02 10:56:13 +01:00
serg@serg.mylan
7535886f1c Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-03-02 10:41:23 +01:00
serg@serg.mylan
02d88c398f bug#8151 - truncate leaves a transaction open 
deadlock in MYSQL_LOG::new_file()
style fixes
 2005-03-02 10:38:25 +01:00
patg@krsna.patg.net
9e3c670b02 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into krsna.patg.net:/home/patg/mysql-5.0
 2005-03-01 23:23:11 -08:00
jan@hundin.mysql.fi
b9ae89a1e6 Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 
into hundin.mysql.fi:/home/jan/mysql-5.0
 2005-03-02 07:48:00 +02:00
jimw@mysql.com
bf0c6ffd57 Merge mysql.com:/home/jimw/my/mysql-5.0-8678 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-03-01 15:25:18 -08:00
heikki@hundin.mysql.fi
4953070187 ha_innodb.cc: 
Correct indentation + some small style corrections
 2005-03-02 01:25:17 +02:00
jimw@mysql.com
2904f4d0a4 Merge mysql.com:/home/jimw/my/mysql-5.0-8444 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-03-01 15:25:17 -08:00
monty@mysql.com
f4d22c9bbf Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-03-01 23:57:20 +02:00