Commit graph

21937 commits

Author SHA1 Message Date
pem@mysql.comhem.se
387afb3d29 Fixed BUG#9856: Stored procedures: crash if handler for sqlexception, not found. 2005-04-13 16:57:49 +02:00
pem@mysql.comhem.se
6a46d0cd8a Added test case for BUG#6129: Stored procedure won't display @@sql_mode value. 2005-04-13 16:09:28 +02:00
serg@serg.mylan
32221d9b9e Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-04-12 23:12:26 +02:00
serg@serg.mylan
b3e54c9aee mysql-test/r/flush_block_commit.result
correct result after bugfix
sql/sql_class.cc
    initialize net.query_cache_query
2005-04-12 23:08:19 +02:00
ramil@mysql.com
f93ebc20ac Bit type: code clean-up. 2005-04-12 23:12:00 +05:00
pem@mysql.com
24d4264d02 Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0
2005-04-12 18:13:29 +02:00
serg@serg.mylan
3ab03ccbb0 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-04-12 17:22:14 +02:00
serg@serg.mylan
d4a0becc8a FLUSH TABLES WITH READ LOCK should block writes to binlog too 2005-04-12 17:15:54 +02:00
msvensson@neptunus.(none)
8cf7979e0f Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-04-12 17:11:45 +02:00
ramil@mysql.com
eae4d9c073 Bit type: code cleanup. 2005-04-12 19:36:21 +05:00
pem@mysql.comhem.se
9c21006f81 Fixed BUG#7185: Stored procedure crash if identifier is AVG 2005-04-12 15:43:24 +02:00
pem@mysql.comhem.se
e0e281ecb8 Fixed BUG#6663: Stored Procedures code report non-selected DB
when CREATE but not when ALTER
2005-04-12 14:52:54 +02:00
msvensson@neptunus.(none)
a1c4918a6c Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-04-12 14:51:03 +02:00
georg@lmy002.wdf.sap.corp
480063e077 Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0
into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0
2005-04-12 13:42:40 +02:00
msvensson@neptunus.(none)
7387030e67 BUG#8924 'Explain' shows different strategy
- If number of records in table is 4, the calculated cost for using "index" and "range" become so close so that any rounding errors becomes visible.
 - Added one more record to the tables for heap test and expoect "range" to be selected
 - Decrease number of records in t1 for range and expect "index" to be choosen.
2005-04-12 12:04:43 +02:00
ramil@mysql.com
3b1c3d8c68 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/ram/work/5.0.bit_class
2005-04-12 12:30:09 +05:00
ramil@mysql.com
c4376b2bc6 Bit type support for non-MyISAM tables. 2005-04-12 12:27:43 +05:00
georg@lmy002.wdf.sap.corp
1cbe701d78 Fix for verification tests: loss of decimal places should not
return an error
2005-04-12 08:51:26 +02:00
gbichot@quadita2.mysql.com
2b7ec71836 all-local instead of all (to not have double "all:" in Makefile) 2005-04-11 17:44:28 +02:00
gbichot@quadita2.mysql.com
f356fb08d6 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) (thx Serg).
In sql/share/Makefile.am using "all:" leads to double-"all:" in Makefile (thx Konstantin).
2005-04-11 17:37:49 +02:00
gbichot@quadita2.mysql.com
e0831dce7a merge from 4.1 2005-04-11 16:59:06 +02:00
gbichot@quadita2.mysql.com
e42312c05d Merge gbichot@bk-internal.mysql.com://home/bk/mysql-4.1
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-4.1-4ita
2005-04-11 16:47:39 +02:00
gbichot@quadita2.mysql.com
c7c928f168 Fix for BUG#9149 "OPTIMIZE TABLE statement on InnoDB table is logged twice in the binary log"
if we fall back to mysql_alter_table() (for InnoDB), don't do binlogging in mysql_alter_table(), as mysql_admin_table()
is not supposed to do any binlogging (it is done by the caller).
2005-04-11 16:46:03 +02:00
reggie@mdk10.(none)
4bb4a285ab Merge mdk10.(none):/home/reggie/bk/mysql-4.1
into mdk10.(none):/home/reggie/bk/mysql-5.0
2005-04-11 09:29:49 -05:00
reggie@mdk10.(none)
d07945c23b Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
into mdk10.(none):/home/reggie/bk/mysql-4.1
2005-04-11 09:19:49 -05:00
petr@mysql.com
c53c3b1118 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/cps/mysql/trees/mysql-5.0
2005-04-11 17:46:21 +04:00
petr@mysql.com
9c015f2a09 Merge mysqldev@production.mysql.com:my/mysql-5.0-build
into mysql.com:/home/cps/mysql/trees/mysql-5.0
2005-04-11 17:20:29 +04:00
petr@mysql.com
da1d303001 make server logs less frightening, when using IM 2005-04-11 17:19:12 +04:00
petr@mysql.com
48b3332b8a Fix for bug #9808 2005-04-11 17:14:40 +04:00
petr@mysql.com
ace47c77be Fix for Bug #9589 2005-04-11 17:08:34 +04:00
bar@mysql.com
c6e1a4821e Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/bar/mysql-5.0
2005-04-11 17:06:40 +05:00
pekka@mysql.com
fd5b9f7ed7 ndb - csc#4847 - manual merge 4.1->5.0 2005-04-11 12:43:58 +02:00
georg@lmy002.wdf.sap.corp
698399dc98 Fix for verification tests: truncation of post digits should not return an error 2005-04-11 12:25:44 +02:00
bar@mysql.com
71f530c4ea merge 2005-04-11 15:11:52 +05:00
joerg@mysql.com
fc0e6aa274 Manual transfer of the change in "configure.in" (4.1) to "config/ac-macros/character_sets.m4". 2005-04-11 11:24:30 +02:00
joerg@mysql.com
198b6117f9 Proper handling of "utf8-general-cs" clollation: Missing parts in configuration. 2005-04-11 11:12:08 +02:00
joreland@mysql.com
588559e3d8 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-04-11 10:26:18 +02:00
joreland@mysql.com
ed95158337 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2005-04-11 10:22:30 +02:00
dlenev@brandersnatch.localdomain
831a612483 Merging fix for bug #9796 "Query Cache caches queries with CURRENT_USER()
function" into 4.1 tree.
2005-04-11 10:44:48 +04:00
dlenev@mysql.com
b0dd388190 Merge mysql.com:/home/dlenev/src/mysql-4.0-bg9796
into mysql.com:/home/dlenev/src/mysql-4.1-merges
2005-04-11 09:53:54 +04:00
dlenev@mysql.com
06e3647274 Fix for bug #9796 "Query Cache caches queries with CURRENT_USER()
function".

We should not cache queries using CURRENT_USER() function as we do it
for some other functions, e.g. USER() function.
2005-04-11 00:30:23 +04:00
bar@mysql.com
16e186779f ctype_collate.result, ctype_collate.test, union.result, union.test:
fixing tests accordingly
item.cc:
  Allow mixing non-binary collation and binary collation
  even if coercibility is the same. 
  For easier 4.0 -> 4.1 migrating.
2005-04-10 12:40:33 +05:00
pekka@mysql.com
dbae73bfa8 ndb - testOIBasic.cpp: 4.1->5.0 fix 2005-04-10 07:55:30 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
b47f7902d3 New versions of mail_to_db.pl and pmail.pl.
Added email threading capabilities to both
programs.
2005-04-09 18:37:32 +03:00
acurtis@xiphis.org
aae638bbb2 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into xiphis.org:/.amd_mnt/bk.anubis/host/work-acurtis/bug6776.1
2005-04-09 07:37:00 +01:00
jimw@mysql.com
9b4f106045 Fix warning and error when compiling on Windows. 2005-04-09 03:05:47 +02:00
acurtis@xiphis.org
dcc40a080d Merge xiphis.org:/var/db/bk/work-acurtis/bug6776.1
into xiphis.org:/var/db/bk/work-acurtis/bug6776.2
2005-04-09 00:36:08 +01:00
acurtis@xiphis.org
0998ec4264 Fix typos in Bug#6776 2005-04-09 00:21:51 +01:00
mskold@mysql.com
402ceb3222 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-04-08 22:49:08 +02:00
acurtis@xiphis.org
e82edda6c6 Merge xiphis.org:/var/db/bk/work-acurtis/bug6776
into xiphis.org:/var/db/bk/work-acurtis/bug6776.1
2005-04-08 21:40:50 +01:00