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
23129 commits 2784 branches 343 tags 1.6 GiB
Commit graph

11034 commits

Author SHA1 Message Date
gbichot@quadita2.mysql.com
a85ecdb670 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita
 2005-05-07 17:26:01 +02:00
jimw@mysql.com
b4dcd8f4ab Merge bk-internal:/home/bk/mysql-5.0 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-05-07 08:26:00 -07:00
holyfoot@hf-ibm.(none)
a16a207456 Fix for embedded server to compile 2005-05-07 20:25:59 +05:00
jimw@mysql.com
80933d9f95 Merge 2005-05-07 08:25:58 -07:00
gluh@mysql.com
3ce315ce33 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/gluh/MySQL/Bugs/5.0.10261
 2005-05-07 15:25:57 +00:00
gluh@mysql.com
f6bf2680b2 Fix for bug#10261: INFORMATION_SCHEMA.COLUMNS, incomplete result for non root user 
I_S table columns information is available for any user
 2005-05-07 15:14:34 +00:00
antony@ltantony.mysql.com
fa8673a627 Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0 
into ltantony.mysql.com:/usr/home/antony/work2/p2-bug6616-5.0
 2005-05-07 14:55:49 +01:00
jimw@mysql.com
d398b6eb51 Add support for slave_compressed_protocol, slave_load_tmpdir, and 
slave_skip_errors in SHOW VARIABLES. (Bug #7800)
 2005-05-07 06:55:47 -07:00
gluh@mysql.com
64cbbf1463 Fix for bug #9838: INFORMATION_SCHEMA.COLUMNS columns of granted views missing 2005-05-07 13:55:46 +00:00
antony@ltantony.mysql.com
a5e9523364 Merge ltantony.mysql.com:/usr/home/antony/work2/p4-bug9666 
into ltantony.mysql.com:/usr/home/antony/work2/megapatch-4.1
 2005-05-07 14:46:54 +01:00
antony@ltantony.mysql.com
687417be74 Merge ltantony.mysql.com:/usr/home/antony/work2/p2-bug9725 
into ltantony.mysql.com:/usr/home/antony/work2/megapatch-4.1
 2005-05-07 14:43:03 +01:00
mwagner@ultrafly.mysql.com
ded73eddf7 errmsg.txt: 
Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
 2005-05-07 15:11:31 +02:00
antony@ltantony.mysql.com
1af671bf36 Bug#9666 - Can't use 'DEFAULT FALSE' for column of type bool 
Fix bug by moving TRUE/FALSE in with other literals.
 2005-05-07 13:51:29 +01:00
antony@ltantony.mysql.com
1ebc9e37ea Bug#9725 - "disapearing query/hang" and "unknown error" with "on duplicate key update" 
INSERT IGNORE...UPDATE causes break in protocol or unknown error message.
  Fix so that protocol doesn't break by properly ignoring dups.
 2005-05-07 13:31:37 +01:00
antony@ltantony.mysql.com
06954a4f8b Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0 
into ltantony.mysql.com:/usr/home/antony/work2/p2-bug6616-5.0
 2005-05-07 13:21:49 +01:00
gluh@mysql.com
a8febcd7d2 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/gluh/MySQL/Bugs/5.0.9897
 2005-05-07 12:21:48 +00:00
gluh@mysql.com
d76be7ab3f Fix for bug#9897: Views: 'Check Table' crashes MySQL, with a view and a table in the statement 
thd->lex->derived_tables should be zero(it may be changed if we open a view)
 2005-05-07 12:17:54 +00:00
svoj@mysql.com
c7f0fcab23 BUG#7709 fix - Boolean fulltext query against unsupported engines does not 
fail.
 2005-05-07 15:48:56 +05:00
gbichot@production.mysql.com
a1948f769c [backport of 4.1, because 4.0 autobuild now hits the same problem; 
when merging just use "ul"] In configure.in, don't remove $AVAILABLE_LANGUAGES_ERRORS_RULES at end
because config.status may later need this file (if it does not find it
it won't incorporate dependencies of errmsg.sys in sql/share/Makefile).
In sql/share/Makefile.am using "all:" leads to double-"all:" in Makefile.
 2005-05-07 11:35:14 +02:00
jimw@mysql.com
ef183de687 Merge mysql.com:/home/jimw/my/mysql-4.1-8497 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-05-07 01:00:24 -07:00
antony@ltantony.mysql.com
521b0b6d76 Merge ltantony.mysql.com:/usr/home/antony/work2/p2-bug6616-4.1 
into ltantony.mysql.com:/usr/home/antony/work2/p2-bug6616-5.0
 2005-05-07 08:46:42 +01:00
serg@sergbook.mylan
27426ea1fd typo fixed 2005-05-07 08:59:12 +02:00
ramil@mysql.com
7217b4e9a4 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/ram/work/4.1
 2005-05-07 09:06:11 +05:00
monty@mishka.local
81e46539b2 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mishka.local:/home/my/mysql-5.0
 2005-05-07 00:26:45 +03:00
ramil@mysql.com
e95d77c61d Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/ram/work/mysql-5.0
 2005-05-07 02:26:44 +05:00
gluh@mysql.com
a36ac81bd4 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/gluh/MySQL/Bugs/5.0.8998
 2005-05-06 21:26:43 +00:00
gluh@mysql.com
f285b4fcee Fix for bug#8998: information_schema: Table SCHEMATA should report default collations 
DEFAULT_COLLTION_NAME field is added to SCHEMATA table
 2005-05-06 20:14:22 +00:00
gluh@mysql.com
5dee7cfc70 Fix for bug #10018:use INFORMATION_SCHEMA works, but show tables in it returns error 2005-05-06 19:06:10 +00:00
gbichot@quadita2.mysql.com
ea1bc59ed9 Dmitri please review. Fix for BUG#10417 "CREATE TRIGGER not written to binlog": 
writing DROP and CREATE TRIGGER to binlog, disabling binlogging
of substatements, testing.
 2005-05-06 18:52:19 +02:00
antony@ltantony.mysql.com
91e04912cd Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.1 
into ltantony.mysql.com:/usr/home/antony/work2/p2-bug6616-4.1
 2005-05-06 17:30:36 +01:00
antony@ltantony.mysql.com
67bcc9707f Merge ltantony.mysql.com:/usr/home/antony/work2/p2-bug6616 
into ltantony.mysql.com:/usr/home/antony/work2/p2-bug6616-4.1
 2005-05-06 16:16:05 +01:00
ramil@mysql.com
0316492d77 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/ram/work/mysql-5.0
 2005-05-06 20:11:02 +05:00
ramil@ram-book.(none)
bec93d485b fix for bug #4082: Integer lengths cause truncation with DISTINCT CONCAT and InnoDB 2005-05-06 20:11:01 +05:00
ramil@mysql.com
def8eb631c Merge mysql.com:/home/ram/work/mysql-4.1 
into mysql.com:/home/ram/work/mysql-5.0
 2005-05-06 20:11:01 +05:00
bar@noter.(none)
6a47698468 Bug#6611: wrong sorting order. 
Adding cp1250_croatian_ci collation.
 2005-05-06 20:11:00 +05:00
monty@mishka.local
805a5327d9 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mishka.local:/home/my/mysql-5.0
 2005-05-06 17:55:30 +03:00
jani@ibmlab.site
56a98396ab Fixed bugs 9820, 9799 and 9800. 2005-05-06 17:32:46 +03:00
holyfoot@hf-ibm.(none)
5aa0edf34c Trimmed fix for bug #9546 (Crashing with huge decimals) 2005-05-06 19:04:58 +05:00
antony@ltantony.mysql.com
bf17b75a28 Bug#6616 
MySQL server 100% CPU if FLUSH TABLES WITH READ LOCK + INSERT
  Infinite loop caused by missing update to thd version.
 2005-05-06 14:42:28 +01:00
bar@noter.(none)
b20cac254c Bug#6505 Wrong sorting order: 
latin2_croatian_ci collation was fixed.
 2005-05-06 18:41:41 +05:00
monty@mishka.local
3d03746899 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mishka.local:/home/my/mysql-5.0
 2005-05-06 16:34:09 +03:00
rburnett@bk-internal.mysql.com
ad6de2c05a Merge bk-internal.mysql.com:/users/rburnett/bug9721 
into bk-internal.mysql.com:/users/rburnett/mysql-5.0
 2005-05-06 15:15:48 +02:00
rburnett@bk-internal.mysql.com
c95e33fadf Merge bk-internal.mysql.com:/data0/bk/mysql-4.1 
into bk-internal.mysql.com:/users/rburnett/bug9721
 2005-05-06 15:10:01 +02:00
monty@mishka.local
015cd1cd21 merge 2005-05-06 13:51:58 +03:00
jani@ibmlab.site
0e91a7131f Merge ibmlab.site:/home/my/bk/mysql-4.1 
into ibmlab.site:/home/my/bk/mysql-5.0
 2005-05-06 13:42:30 +03:00
jani@ibmlab.site
27ee605090 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into ibmlab.site:/home/my/bk/mysql-4.1
 2005-05-06 13:22:56 +03:00
bar@noter.(none)
59129d9bbe bug#6504 Upper/Lower conversion bug: 
upper/lower conversion for LATIN LETTER D WITH STROKE
was wrong in latin2.
 2005-05-06 15:22:55 +05:00
jani@ibmlab.site
fa25b9b49d A fix for Bug#8467. 2005-05-06 12:18:37 +03:00
marko@hundin.mysql.fi
2f0424cd62 Merge 2005-05-06 11:45:59 +03:00
monty@mishka.local
a9f6aab4c9 Fixes while reviewing new code 
Added option --count to mysqlshow (to show number of rows)
Fixed possible core dump in information schema
 2005-05-06 11:39:30 +03:00
bar@mysql.com
5496b7babb Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/root/mysql-5.0
 2005-05-06 13:31:47 +05:00
bar@mysql.com
b1431c222a Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/root/mysql-5.0
 2005-05-06 13:08:28 +05:00
dlenev@mysql.com
917cb3dfbc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/dlenev/src/mysql-5.0-bg9841
 2005-05-06 11:18:37 +04:00
marko@hundin.mysql.fi
f9e7e2ee90 Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/marko/mysql-4.1
 2005-05-06 10:15:58 +03:00
bar@mysql.com
1f14cfcb35 merging cp932 from 4.1 2005-05-06 12:00:25 +05:00
ramil@mysql.com
788678d392 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/ram/work/5.0
 2005-05-06 11:48:55 +05:00
bar@mysql.com
b93385de8f Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/root/mysql-5.0
 2005-05-06 11:48:54 +05:00
ramil@mysql.com
802360fbc2 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/ram/work/5.0
 2005-05-06 08:34:50 +05:00
lenz@mysql.com
22a8b93cc5 Merge mysql.com:/space/my/mysql-4.1 
into mysql.com:/space/my/mysql-4.1-build
 2005-05-06 00:21:20 +02:00
lenz@mysql.com
b4d43939fb Merge mysql.com:/space/my/mysql-4.1-build 
into mysql.com:/space/my/mysql-5.0-build
 2005-05-06 00:18:13 +02:00
lenz@mysql.com
7550b0b4ea - fixed typo in variable name that caused compile errors on many platforms (tmp_error -> tmp_errno) 2005-05-06 00:16:33 +02:00
shuichi@mysql.com
2244ae8cef Added cp932 character set 2005-05-05 11:37:52 -07:00
bar@noter.(none)
153b928c10 Bug#9509 Optimizer: wrong result after AND with latin1_german2_ci 
We cannot propagate constants with tricky collations.
 2005-05-05 21:13:57 +05:00
dlenev@brandersnatch.localdomain
d60674d665 Fix for bug #9841 "Unexpected read lock when trying to update a view in 
a stored procedure" (version 2).

To handle updates and inserts into view in SP properly we should set
lock types for tables of the view's main select when we are opening
view for prelocking purproses.
 2005-05-05 19:49:15 +04:00
rburnett@bk-internal.mysql.com
e7d7c0f236 Bug #9721 net_write_timeout not used on Windows 
Added an extra parameter to all calls to timeout().  
1 means we want to set the write timeout
0 means we wnat to set the read timeout

viossl.c:
  Add which parameter to ssl timeout routine
vio_priv.h:
  Added which parameter to vio_ignore_timeout and vio_ssl_timeout
violite.h:
  Add which parameter to vio_timeout sigs
net_serv.cc:
  Use proper which code in call to vio_timeout to set the proper timeout
viosocket.c:
  Set the appropriate timeout in vio_timeout
 2005-05-05 17:17:57 +02:00
holyfoot@mysql.com
556504287b Merge 2005-05-05 20:10:50 +05:00
holyfoot@hf-ibm.(none)
2c8e9df232 A lot of fixes to Precision math 
Mostly about precision/decimals of the results of the operations
 2005-05-05 20:06:49 +05:00
ram@ram-book.(none)
65f5a15a2d Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into ram-book.(none):/home/ram/work/5.0
 2005-05-05 19:22:33 +05:00
gbichot@quadita2.mysql.com
d11607b08f Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita
 2005-05-05 14:40:10 +02:00
gbichot@quadita2.mysql.com
b72ae4fe57 Approximative fixes for BUG#2610,2611,9100 i.e. WL#2146 binlogging/replication of routines (stored procs and functions). 
Approximative, because it's using our binlogging way (what we call "query"-level) and this is not as good as record-level binlog (5.1) would be. It imposes several
  limitations to routines, and has caveats (which I'll document, and for which the server will try to issue errors but that is not always possible).
  Reason I don't propagate caller info to the binlog as planned is that on master and slave
  users may be different; even with that some caveats would remain.
 2005-05-05 14:20:53 +02:00
ramil@ram-book.(none)
b9ccbfd1f3 A fix (bug #10179: error in default value setting). 2005-05-05 17:17:55 +05:00
gluh@mysql.com
9f5a51e8d6 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/gluh/MySQL/Devel/mysql-4.1
 2005-05-05 16:23:39 +05:00
konstantin@mysql.com
753959cd88 Manual merge 2005-05-05 13:47:09 +04:00
konstantin@mysql.com
15dbab1c12 A fix and test case for Bug#9777 " Empty set returned by Prepared Statement when it 
should return a non empty one"
(see comments for the changed files for details).
 2005-05-05 12:55:09 +04:00
gluh@mysql.com
665cbabe07 Bug #5843: Server code does not check whether PID file was successfully written 2005-05-05 12:24:10 +05:00
jan@hundin.mysql.fi
3cddcc63fa Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/jan/mysql-4.1
 2005-05-05 10:15:15 +03:00
kent@mysql.com
c4acdc6e0f terminal.c, sql_bitmap.h, my_sys.h, configure.in, config.h: 
Initial Metrowerks CodeWarrior compiler support
 2005-05-05 09:15:14 +02:00
jan@hundin.mysql.fi
71f620890c Fig compiler error. 2005-05-05 08:08:39 +03:00
msvensson@neptunus.(none)
5b5565c30a BUG#10241 cygwin port: invalid pragma interface directives 
- Introduce ifdefs so we can control when to use #pragma interface on cygwin
 2005-05-04 15:05:56 +02:00
konstantin@mysql.com
0b6066e77a Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/opt/local/work/mysql-5.0-root
 2005-05-04 16:54:36 +04:00
konstantin@mysql.com
70a6d6c9de Post-merge fixes for Bug#9096 "select doesn't return all matched 
records if prepared statements is used" (see comments to 
the changed files).
 2005-05-04 16:53:10 +04:00
jan@hundin.mysql.fi
91640e9d60 Initial value for a auto_increment can now be set using ALTER TABLE 
AUTO_INCREMENT = X; or CREATE TABLE .. AUTO_INCREMENT = X; This
change is backported from 5.0 (Bug #7061).
 2005-05-04 12:24:56 +03:00
jan@hundin.mysql.fi
df8380e0dd Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/jan/mysql-4.1
 2005-05-04 12:24:55 +03:00
bell@book.sanja.is.com.ua
3be81d4299 Merge book.sanja.is.com.ua:/Users/bell/mysql/bk/mysql-5.0 
into book.sanja.is.com.ua:/Users/bell/mysql/bk/work-test-5.0
 2005-05-03 18:47:53 +03:00
konstantin@mysql.com
92e4e1a3f8 Manual merge of Bug#9096 2005-05-03 19:32:29 +04:00
konstantin@mysql.com
018b8025c0 Merge mysql.com:/opt/local/work/mysql-4.1-root 
into mysql.com:/opt/local/work/mysql-4.1-9096-fresh
 2005-05-03 12:49:22 +04:00
konstantin@mysql.com
3589e78fda A fix and test case for Bug#9096 "select doesn't return all matched 
records if prepared statements is used".
This fix changes equality evaluation method of basic constants from
by-name to by-value, thus effectively enabling use of parameter markers
in some optimizations (constants propagation, evaluation of possible
keys for query).
 2005-05-03 12:47:27 +04:00
sergefp@mysql.com
ee3bb57aa3 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-test-valgrind
 2005-05-03 07:42:36 +00:00
jan@hundin.mysql.fi
2f65c531a8 Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/jan/mysql-4.1
 2005-05-03 09:46:52 +03:00
sergefp@mysql.com
e9838c7c70 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-test-valgrind
 2005-05-03 10:23:10 +04:00
heikki@hundin.mysql.fi
e8233c3afc ha_innodb.cc: 
Return a value from innobase_repl_report_sent_binlog()
 2005-05-03 08:40:35 +03:00
jimw@mysql.com
7bab94f36b Clean up merge from 4.1 2005-05-02 10:19:37 -07:00
jimw@mysql.com
8e87db9318 Merge mysql.com:/home/jimw/my/mysql-4.1-9947 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-05-02 08:12:27 -07:00
jimw@mysql.com
0b0e4f1166 Merge mysql.com:/home/jimw/my/mysql-4.1-9761 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-05-02 08:12:03 -07:00
jimw@mysql.com
2aea94f483 Merge bk-internal:/home/bk/mysql-4.1 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-05-02 08:05:58 -07:00
msvensson@neptunus.(none)
3e03f3bf1a Fix typo in ha_backhole.cc 2005-05-02 11:25:01 +02:00
jan@hundin.mysql.fi
d3b849466c Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/jan/mysql-4.1
 2005-05-02 07:30:17 +03:00
serg@serg.mylan
530b6ba541 Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-05-01 23:10:55 +02:00
sergefp@mysql.com
c83b78169e Merge mysql.com:/home/psergey/mysql-4.1-bug9228 
into mysql.com:/home/psergey/mysql-5.0-bug10274-merge
 2005-05-01 19:07:01 +04:00
sergefp@mysql.com
acca8f7af3 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/psergey/mysql-4.1-bug9228
 2005-05-01 19:03:49 +04:00
serg@serg.mylan
9c332d8d2a yassl changeset 2: 
remove FIX_GCC_LINKING_PROBLEM and -DDEFINE_CXA_PURE_VIRTUAL
  replace echo in configure.in with AC_MSG_WARN/AC_MSG_ERROR
  don't set -DUSE_MYSYS_NEW for gcc 2.95
  set $USE_MYSYS_NEW even if CXX is g++
  yassl bugfixes
  instantiate all yassl templates explicitly
 2005-04-30 19:48:45 +02:00
bell@sanja.is.com.ua
4681d464b1 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into sanja.is.com.ua:/home/bell/mysql/bk/work-test-5.0
 2005-04-30 19:32:45 +03:00
bell@sanja.is.com.ua
906f56750c postreview changes 2005-04-30 19:27:22 +03:00
dlenev@brandersnatch.localdomain
8ee6d33bdd Fix for Bug #9913 "udf_deinit is not called after execution of PS" 
(aka "deinit is not called when calling udf from trigger").

We should call udf_deinit() function during cleanup phase after prepared
(or ordinary) statement execution instead of calling it from Item's
desctructor.

No test case is provided since it is hard to test UDF's from our test
suite.
 2005-04-30 20:23:40 +04:00
bell@sanja.is.com.ua
498a458f2a Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into sanja.is.com.ua:/home/bell/mysql/bk/work-test-5.0
 2005-04-30 17:50:57 +03:00
monty@mysql.com
28a5491d3d Merge with 4.1 2005-04-30 09:46:08 +03:00
monty@mysql.com
e16985ba15 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-04-30 09:37:07 +03:00
konstantin@mysql.com
6040b0abf6 A fix and a test case for Bug#9520 "SELECT DISTINCT crashes server 
with cursor". The patch refactors do_select/sub_select
functions, which implement the nested loop algorithm, and reuses them to
fetch rows for cursors as well.
Pushing with view.test failing (--ps-protocol).
 2005-04-30 09:54:35 +04:00
monty@mysql.com
c0e8a8d625 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-04-30 03:46:38 +03:00
monty@mysql.com
aa84afb983 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-04-30 03:45:12 +03:00
monty@mysql.com
129c604032 Setting a variable to CAST(NULL as X) set the result type of the variable to X. (Bug #6598) 2005-04-30 03:14:42 +03:00
bell@sanja.is.com.ua
19247ab91b Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into sanja.is.com.ua:/home/bell/mysql/bk/work-test-5.0
 2005-04-30 01:43:35 +03:00
sergefp@mysql.com
96aeab05d1 Fix for BUG#10274: In Protocol_simple::store_long don't make any assumptions about 
relative sizes of int/long/longlong.
 2005-04-30 01:05:15 +04:00
evgen@moonbone.local
4b9f462da7 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into moonbone.local:/usr/src/mysql-4.1
 2005-04-29 22:20:16 +04:00
serg@serg.mylan
328f2e434a Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-04-29 19:31:56 +02:00
evgen@moonbone.local
b11705a2b0 Fix bug #9703 "Error 1032 with GROUP BY query and large tables" 
Reset old error if tmp table was successfully created.

Test data is large and can be found in bug report along with test query.
 2005-04-29 21:19:39 +04:00
jimw@mysql.com
78ff49437f Manually resolve merge 2005-04-29 08:46:03 -07:00
hf@deer.(none)
c2339a6ff0 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into deer.(none):/home/hf/work/mysql-5.0.spaerrs
 2005-04-29 20:26:11 +05:00
hf@deer.(none)
054463f975 Fix for #6553 and #8776 (no errors on bad spatial data) 2005-04-29 20:23:02 +05:00
monty@mysql.com
fbf31c4a8c CAST(string_argument AS UNSIGNED) didn't work for big integers above the signed range. (Bug #7036) 
Produce warnings of wrong cast of strings to signed/unsigned.
Don't block not resolved IP's if DNS server is down (Bug #8467)
Fix compiler problems with MinGW (Bug #8872)
 2005-04-29 17:03:34 +03:00
ingo@mysql.com
673ef90a1b Merge mysql.com:/home/mydev/mysql-5.0 
into mysql.com:/home/mydev/mysql-5.0-5000
 2005-04-29 14:56:04 +02:00
mskold@mysql.com
a248774682 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-04-29 14:16:41 +02:00
mskold@mysql.com
0fc5a1678c Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-04-29 14:10:26 +02:00
ingo@mysql.com
fea20f9f18 Merge mysql.com:/home/mydev/mysql-5.0 
into mysql.com:/home/mydev/mysql-5.0-5000
 2005-04-29 12:54:15 +02:00
mskold@mysql.com
56499dbe54 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-04-29 11:56:38 +02:00
mskold@mysql.com
607b1a9987 Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-04-29 11:53:35 +02:00
mskold@mysql.com
aed38a0f49 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-04-29 11:49:54 +02:00
mskold@mysql.com
2428e7b1cc Fix for avoiding gettin Invalid schema object version when doing local changes, fixed found bug 2005-04-29 11:37:47 +02:00
heikki@hundin.mysql.fi
1e6dba4d88 ha_innodb.cc: 
Fix compilation error on Windows in innobase_report_binlog_offset_and_commit()
 2005-04-29 12:11:04 +03:00
ingo@mysql.com
e465c0e0f3 BUG#5964 - 4.1 MERGE tables regression from 4.0 
After merge fix.
 2005-04-29 10:59:34 +02:00
jan@hundin.mysql.fi
8e7ebf88b3 Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/jan/mysql-4.1
 2005-04-29 10:07:03 +03:00
ingo@mysql.com
de613e6b3d Merge mysql.com:/home/mydev/mysql-5.0 
into mysql.com:/home/mydev/mysql-5.0-5000
 2005-04-29 09:05:37 +02:00
ingo@mysql.com
7d5604af89 Merge mysql.com:/home/mydev/mysql-4.1 
into mysql.com:/home/mydev/mysql-4.1-4100
 2005-04-29 09:03:34 +02:00
bell@sanja.is.com.ua
29069ebfc6 if outer refernce (identifier) was resolved with help of cache all subqueries and resolved item itseld have to be correctly marked as dependent 
(BUG#10041)
 2005-04-29 02:43:56 +03:00
sergefp@mysql.com
908c5d74d4 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-bug9821
 2005-04-29 02:52:20 +04:00
jimw@mysql.com
8ef6ae7442 Fix 'CREATE TABLE ... LIKE ...' when lower_case_table_names 
is set on case-sensitive file systems and the source table
was specified in something other than lowercase. (Bug #9761)
 2005-04-28 15:30:42 -07:00
sergefp@mysql.com
a7a1d4dc1e Fix for BUG#10244: 
Make get_quick_select_for_ref() accept estimated # records as parameter and 
set QUICK_RANGE_SELECT::records, as this value is used to allocate buffers 
in Multi-Range Read.
 2005-04-29 01:16:32 +04:00
ingo@mysql.com
be34b54e1d Merge mysql.com:/home/mydev/mysql-4.1-4100 
into mysql.com:/home/mydev/mysql-5.0-5000
 2005-04-28 19:34:05 +02:00
sergefp@mysql.com
e31b850937 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-bug9298-merge
 2005-04-28 21:05:26 +04:00
ingo@mysql.com
8ccbea47e8 Merge mysql.com:/home/mydev/mysql-4.1-bug5964 
into mysql.com:/home/mydev/mysql-4.1-4100
 2005-04-28 18:34:47 +02:00
ingo@mysql.com
1f0d0a6729 BUG#5964 - 4.1 MERGE tables regression from 4.0 
Changed the creation of the .MRG file so that only the table  name
is written when the MyISAM table is in the same database as the
MERGE table, a relative path is used in other cases in mysqld,
and possibly an absolute path is used in an embedded server.
No test case is added as the external behaviour is unchanged.
Only the file names within the .MRG file are changed.
 2005-04-28 18:28:50 +02:00
sergefp@mysql.com
b2ebf51fbe Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/psergey/mysql-4.1-bug9298
 2005-04-28 19:58:52 +04:00
monty@mysql.com
948fce01b3 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-04-28 16:00:09 +03:00
msvensson@neptunus.(none)
5de370c534 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-04-28 13:32:52 +02:00
msvensson@neptunus.(none)
f78e1d1c44 Merge 2005-04-28 10:58:24 +02:00
mskold@mysql.com
78263507ab Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-04-28 10:57:08 +02:00
msvensson@neptunus.(none)
6b3e3b03d3 Merge neptunus.(none):/home/msvensson/mysql/bug9911 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-04-28 10:50:31 +02:00
msvensson@neptunus.(none)
9969e1c5ea BUG#9911 After review fixes 
- Remove ha_archive::rename_table and move the fix to handler::rename_table
 2005-04-28 10:49:18 +02:00
mskold@mysql.com
69c17fe46c Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-04-28 10:48:08 +02:00
mskold@mysql.com
92dc45c86f Fix for avoiding gettin Invalid schema object version when doing local changes, more post review fixes 2005-04-28 10:46:39 +02:00
mskold@mysql.com
47c2c96379 Merge 2005-04-28 10:28:56 +02:00
mskold@mysql.com
bbee23435d Fix for avoiding gettin Invalid schema object version when doing local changes, post review fixes 2005-04-28 09:39:29 +02:00
jimw@mysql.com
9c33716380 Clean up error message for connections-per-hour user limit 
being exceeded. (Bug #9947)
 2005-04-27 17:05:15 -07:00
monty@mysql.com
b40756c27e Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-04-28 00:41:39 +03:00
ingo@mysql.com
8ca745be65 Merge mysql.com:/home/mydev/mysql-5.0 
into mysql.com:/home/mydev/mysql-5.0-5000
 2005-04-27 23:00:17 +02:00
ingo@mysql.com
731c8da030 Bug#7823 - FLUSH TABLES WITH READ LOCK + INSERT DELAYED = deadlock 
After merge fix.
 2005-04-27 22:58:11 +02:00
msvensson@neptunus.(none)
1ba85ac979 BUG#9911 RENAME TABLE of type ARCHIVE fails with .ARN file error 
- Different behaviuor in 5.0 pushes a warning when renaming a non existent file. Avoid that by checking that the file exists before renaming.
 2005-04-27 22:20:58 +02:00
msvensson@neptunus.(none)
bdb1441a65 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-04-27 21:40:11 +02:00
sergefp@mysql.com
7a4f029ac5 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/psergey/mysql-4.1-bug9298
 2005-04-27 23:02:57 +04:00
ingo@mysql.com
15f9556ca2 Bug#7823 - FLUSH TABLES WITH READ LOCK + INSERT DELAYED = deadlock 
Merge from 4.1
 2005-04-27 21:02:38 +02:00
ingo@mysql.com
1df110057c Bug#7823 - FLUSH TABLES WITH READ LOCK + INSERT DELAYED = deadlock 
After merge fix.
 2005-04-27 20:54:19 +02:00
sergefp@mysql.com
83658e0bb1 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/psergey/mysql-4.1-bug9298
 2005-04-27 22:52:54 +04:00
sergefp@mysql.com
1d8fe5acef Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/psergey/mysql-4.1-bug9298
 2005-04-27 22:51:02 +04:00
sergefp@mysql.com
4732c3b516 Merge mysql.com:/home/psergey/mysql-4.1-bug9298 
into mysql.com:/home/psergey/mysql-5.0-bug9298-merge
 2005-04-27 22:49:42 +04:00
ingo@mysql.com
235d2295da Merge from 4.0 needs fixes 2005-04-27 18:59:31 +02:00
msvensson@neptunus.(none)
c76c23fcbc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-04-27 18:28:57 +02:00
mskold@mysql.com
5f9843aeee Fix for avoiding gettin Invalid schema object version when doing local changes 2005-04-27 18:17:41 +02:00
mskold@mysql.com
96b42c1241 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-04-27 17:12:08 +02:00
pem@mysql.comhem.se
f769a7a8b0 Post-review fixes of the patch for BUG#8408: Stored procedure crash if function contains SHOW 
(Review on irc by monty)
 2005-04-27 16:35:49 +02:00
monty@mysql.com
215be0264b Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-04-27 17:19:32 +03:00
monty@mysql.com
69b813a901 mysqladmin extended-status now displays global status 
Fixed problem with NULL in VARCHAR/BLOB keys for multi-part keys where VARCHAR/BLOB is first part
 2005-04-27 17:16:08 +03:00
joerg@mysql.com
4f1a696f9a Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/M41/mysql-4.1
 2005-04-27 15:50:11 +02:00
ramil@mysql.com
82fc2ce8b7 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/home/ram/work/4.1.b9803
 2005-04-27 17:20:29 +05:00
pem@mysql.com
79cf164767 Merge mysql.com:/usr/local/bk/mysql-5.0 
into mysql.com:/home/pem/work/mysql-5.0
 2005-04-27 14:10:33 +02:00
heikki@hundin.mysql.fi
ce2c8126a2 handler.cc: 
Fix compilation error if HAVE_REPLICATION is not defined
 2005-04-27 15:09:41 +03:00
georg@lmy002.wdf.sap.corp
9838ec71db Merge grichter@bk-internal1.mysql.com:/home/bk/mysql-5.0 
into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0
 2005-04-27 14:09:40 +02:00
georg@lmy002.wdf.sap.corp
09a30f913b Merge lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0-build 
into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0
 2005-04-27 14:07:58 +02:00
georg@lmy002.wdf.sap.corp
7d6c12313e fix for compile error (Windows) 2005-04-27 13:54:42 +02:00
pem@mysql.com
0290afcdb7 Merge mysql.com:/usr/local/bk/mysql-5.0 
into mysql.com:/home/pem/work/mysql-5.0
 2005-04-27 13:24:40 +02:00
msvensson@neptunus.(none)
203cdde955 Merge from 4.1 to 5.0 2005-04-27 12:56:01 +02:00
heikki@hundin.mysql.fi
af00b989df ha_innodb.cc: 
Correct an assertion
 2005-04-27 13:43:02 +03:00
ingo@mysql.com
0998abc831 Bug#7823 - FLUSH TABLES WITH READ LOCK + INSERT DELAYED = deadlock 
Added protection against global read lock while creating and
initializing a delayed insert handler.
Allowed to ignore a global read lock when locking the table
inside the delayed insert handler.
Added some minor improvements.
 2005-04-27 12:40:37 +02:00
heikki@hundin.mysql.fi
ab0dbb1fc6 ha_innodb.cc, mysqld.cc: 
Fix compilation error if HAVE_REPLICATION is not defined
 2005-04-27 13:36:58 +03:00
msvensson@neptunus.(none)
2627475a86 Merge neptunus.(none):/home/msvensson/mysql/bug9714 
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-04-27 12:30:11 +02:00
heikki@hundin.mysql.fi
e93f8ec420 ha_innodb.cc: 
Fix linking and compilation errors
 2005-04-27 13:19:40 +03:00
msvensson@neptunus.(none)
631f035ee9 Merge neptunus.(none):/home/msvensson/mysql/bug9911 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-04-27 12:17:07 +02:00
serg@serg.mylan
c35e690c12 Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-04-27 11:43:00 +02:00
jan@hundin.mysql.fi
138a1a9b1d Fixed a bug using mysqldump to InnoDB tables causes error (Bug #10200). 2005-04-27 12:28:25 +03:00
msvensson@neptunus.(none)
c12ee8dc16 BUG#9714 libsupc++ problem 
- Remove linking of libsupc++
 - Move all local static variables to filescope
 2005-04-27 11:25:08 +02:00
heikki@hundin.mysql.fi
36c1766f5d sql_repl.cc: 
Remove printf's from semi-sync code in sql_repl.cc
 2005-04-27 03:18:54 +03:00
heikki@hundin.mysql.fi
d694d5f1c9 Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0 
into hundin.mysql.fi:/home/heikki/mysql-5.0
 2005-04-27 02:59:05 +03:00
serg@serg.mylan
e7b2de98ee be sure to call top_level_item() on the new Item_cond_and, 
that merges ON and WHERE (BUG#10162)
 2005-04-27 01:32:44 +02:00
monty@mysql.com
972f86f1ee Cleanups during review 2005-04-26 23:24:59 +03:00
monty@mysql.com
3ca23bd918 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-04-26 21:09:42 +03:00
jimw@mysql.com
64f8ebc68b Merge mysql.com:/home/jimw/my/mysql-5.0-build 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-04-26 10:29:58 -07:00
joerg@mysql.com
af59b7502b Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/M41/mysql-4.1
 2005-04-26 19:26:51 +02:00
joerg@mysql.com
f0a5615383 Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/nptl-4.1 2005-04-26 19:22:43 +02:00
pem@mysql.comhem.se
406ea35128 Fixed memory leak in Item_func_sp::cleanup(). 2005-04-26 18:18:41 +02:00
pem@mysql.comhem.se
281c0a8130 Fixed BUG#8408: Stored procedure crash if function contains SHOW 
We simply have to disallow any kind of result set being sent back
  from a function. Can't see any way to make that to work.
 2005-04-26 17:31:59 +02:00
jimw@mysql.com
ef5ad50ccc Merge mysql.com:/home/jimw/my/mysql-4.1-9063 
into mysql.com:/home/jimw/my/mysql-5.0-build
 2005-04-26 08:20:51 -07:00
heikki@hundin.mysql.fi
f12cd8c708 Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0 
into hundin.mysql.fi:/home/heikki/mysql-5.0
 2005-04-26 17:57:15 +03:00
monty@mysql.com
220a01a838 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-04-26 16:03:20 +03:00
joerg@mysql.com
49ac2dac3e Automerge / manual check of the fixes for NPTL configuration (bug#2173, bug#5871, and bug#9497). 
Post-merge fix will follow.
 2005-04-26 12:03:37 +02:00
msvensson@neptunus.(none)
8d370fbcf9 BUG#9911 RENAME TABLE of type ARCHIVE fails with .ARN file error 
- Implemented ha_archive::rename_table
 - Added testcases for rename
 2005-04-26 11:35:52 +02:00
jimw@mysql.com
93ff028f9d Fix compile issues in Intel C/C++ compiler (Bug #9063) 2005-04-25 18:02:03 -07:00
sergefp@mysql.com
a27e830385 BUG#10037: A proper fix: Add 0.01 to cost of 'range' scans, don't add 0.01 to cost of the 'index' scan. 2005-04-26 01:56:10 +04:00
mskold@mysql.com
1589bdf3dc Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-04-25 11:55:27 +02:00
mskold@mysql.com
93498bdf5a Post review fix of ndbcluster_drop_database, typo 2005-04-25 11:54:00 +02:00
mskold@mysql.com
2fd313de2f Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-04-25 11:47:39 +02:00
mskold@mysql.com
4649d5c30f Post review fix of ndbcluster_drop_database, print error 2005-04-25 11:34:47 +02:00
mskold@mysql.com
3a9af0553b Post review fix of ndbcluster_drop_database 2005-04-25 11:31:16 +02:00
msvensson@neptunus.(none)
a24186c280 valgrind: initialise variable in QUICK_SELECT_I 2005-04-25 11:08:38 +02:00
dlenev@mysql.com
814d4bf3e8 Merge mysql.com:/home/dlenev/src/mysql-4.1-bg10040 
into mysql.com:/home/dlenev/src/mysql-5.0-merges
 2005-04-25 11:35:30 +04:00
dlenev@mysql.com
71c7c0d341 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-bg10040
 2005-04-25 11:26:20 +04:00
dlenev@brandersnatch.localdomain
a4a4c5cb69 Fix for func_sapdb failures on 64-bit platforms (aka Bug #10040 
"'func_sapdb' fails on 64bit build hosts")
 2005-04-25 11:25:40 +04:00
sergefp@mysql.com
db6cc1ed17 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-bug8490-2
 2005-04-25 04:25:32 +04:00
sergefp@mysql.com
ea347e5b06 Fix for BUG#8921: Make SHOW CREATE VIEW ignore temporary tables. 2005-04-25 04:00:35 +04:00
sergefp@mysql.com
51064c0575 Fix for BUG#10107: Memory leak in view over subquery: 
In mysql_make_view when joining subquery lists, take into account that both lists
can have length > 1 (see also fix for BUG#8490) 
(note to bk trigger: this commit is about BUG#10107)
 2005-04-23 06:55:43 +04:00
gbichot@quadita2.mysql.com
b75789e3d8 Fixes for BUG#10039 "MEMORY engine is reported as HEAP", 
BUG#9738 "SHOW VARIABLES still displays the deprecated 'log_update' in 5.0",
BUG#9542 "MySQL dies with signal 11 when it is using non-existent location of binary logs"
 2005-04-23 00:05:05 +02:00
sergefp@mysql.com
d7a1549b07 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-bug8490-2
 2005-04-23 00:52:33 +04:00
sergefp@mysql.com
307c0cf908 Fix for BUG#8490: In mysql_make_view for join algorithm views we need 
to insert view's subqueries into select_lex->slave(->next)* chain. 
In case a join has several such views, don't add the same subqueries several times
(this forms a loop on the above chain which breaks many parts of the code)
 2005-04-23 00:13:46 +04:00
ingo@mysql.com
a0c3aed75f Merge mysql.com:/home/mydev/mysql-5.0 
into mysql.com:/home/mydev/mysql-5.0-5000
 2005-04-22 19:16:10 +02:00
mskold@mysql.com
c27c54f49d Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-04-22 17:41:06 +02:00
mskold@mysql.com
fd7176121e Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-04-22 17:40:19 +02:00
mskold@mysql.com
5411f8a6e4 Merge 2005-04-22 17:38:28 +02:00
ingo@mysql.com
d859eafa83 Bug#7806 - insert on duplicate key and auto-update of timestamp 
Merged fix for bugfix to 5.0.
 2005-04-22 17:13:18 +02:00
mskold@mysql.com
9457551616 Fix for Bug #9318 drop database does not drop ndb tables 2005-04-22 15:28:23 +02:00
pem@mysql.com
5fcfb8a442 Merge mysql.com:/usr/local/bk/mysql-5.0 
into mysql.com:/home/pem/work/mysql-5.0
 2005-04-22 12:55:44 +02:00
pem@mysql.comhem.se
057b8aa9a8 Fixed BUG#9004: Inconsistent behaviour of SP re. warnings 2005-04-22 12:53:48 +02:00
ingo@mysql.com
0e7f6a601f Bug#7806 - insert on duplicate key and auto-update of timestamp 
A fix of the original patch.
Correctly clear a bit from an enum value.
 2005-04-22 12:30:09 +02:00
dlenev@mysql.com
51ca05b6e3 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/dlenev/src/mysql-5.0-bg9486
 2005-04-22 10:51:04 +04:00
msvensson@neptunus.(none)
0c23f81dcb C99 Portability fix 2005-04-21 21:47:58 +02:00
acurtis@xiphis.org
310c360465 C99 Portability fix 2005-04-21 18:38:34 +01:00
acurtis@xiphis.org
a6b68d51ec Bug#8861 
Correct previous bugfix
 2005-04-21 15:36:10 +01:00
acurtis@xiphis.org
c5d94db336 Merge 2005-04-21 13:34:39 +01:00
acurtis@xiphis.org
f67507588f Bug#8861 - If Return is a YEAR data type, value is not shown in year format 
Bug partially fixed by 9775/9102 work on SP function return.
 2005-04-21 13:22:47 +01:00
mskold@mysql.com
564eb3dc98 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-04-21 13:12:59 +02:00
mskold@mysql.com
29f8460e7b Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-04-21 13:10:05 +02:00
mskold@mysql.com
ad9fba9f38 Fix for failing ps_7ndb.test, force write_row when batching inserts so that update of primary key is done before next value to insert 2005-04-21 13:09:19 +02:00
pekka@mysql.com
f0c6908a5a Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/export/space/pekka/ndb/version/my50
 2005-04-21 12:55:19 +02:00
pekka@mysql.com
ae2346dd94 ndb - fix typo 2005-04-21 12:53:40 +02:00
lenz@mysql.com
acfd4070cb Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/space/my/mysql-5.0
 2005-04-21 12:43:12 +02:00
lenz@mysql.com
22bed10007 Merge mysql.com:/space/my/mysql-5.0 
into mysql.com:/space/my/mysql-5.0-build
 2005-04-21 10:39:15 +02:00
mskold@mysql.com
8c45ec5607 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-04-21 10:32:58 +02:00
ingo@mysql.com
eeda9b3f8c After merge fix. 2005-04-21 10:29:05 +02:00
lenz@mysql.com
f9a44aa249 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/my/mysql-4.1
 2005-04-21 10:27:37 +02:00
mskold@mysql.com
b1c8e44ead Merge 2005-04-21 10:26:14 +02:00
mskold@mysql.com
e0fe3e75c7 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-04-21 09:27:20 +02:00
lenz@mysql.com
03fccad9b4 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/my/mysql-4.1
 2005-04-21 09:08:09 +02:00
lenz@mysql.com
918ce29557 - manual merge 2005-04-21 08:30:59 +02:00