Commit graph

47328 commits

Author SHA1 Message Date
istruewing@chilla.local
875cac1ffb Merge chilla.local:/home/mydev/mysql-5.1-amain
into  chilla.local:/home/mydev/mysql-5.1-axmrg
2007-06-15 20:23:20 +02:00
istruewing@chilla.local
b64b1a56d6 Merge chilla.local:/home/mydev/mysql-5.1-ateam
into  chilla.local:/home/mydev/mysql-5.1-axmrg
2007-06-15 19:23:29 +02:00
bar@mysql.com/bar.myoffice.izhnet.ru
f28a584287 Additional fix for bug N26402:
An attempt to open file with name '????????.frm'
can produce different errors:
- ER_NO_SUCH_TABLE on Unix
- ER_FILE_NOT_FOUND on Windows
because QUESTION MARK has special meaning on Windows.
Make sure that any of these two errors happens.
2007-06-15 11:53:46 +05:00
bar@bar.myoffice.izhnet.ru
615297df8b Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b28862
into  mysql.com:/home/bar/mysql-work/mysql-5.1.b28862
2007-06-15 11:27:10 +05:00
bar@mysql.com/bar.myoffice.izhnet.ru
caf85332ba Bug#28862 Extended Latin1 characters get lost in CVS engine
Problem: Temporary buffer which is used for quoting and escaping
  was initialized to character set utf8, and thus didn't allow
  to store data in other character sets.
  Fix: changing character set of the buffer to be able to
  store any arbitrary sequence of bytes.
2007-06-15 11:19:35 +05:00
antony@ppcg5.local
21c233440d Merge ppcg5.local:/Users/antony/Work/p2-bug25800.6
into  ppcg5.local:/Users/antony/Work/p2-bug25800.6.merge
2007-06-14 16:04:52 -07:00
holyfoot/hf@hfmain.(none)
e6a478dee6 Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
2007-06-14 23:03:12 +05:00
holyfoot/hf@hfmain.(none)
a877145db8 Merge mysql.com:/d2/hf/mrg/mysql-4.1-opt
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
2007-06-14 23:02:28 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
160add01a5 fix the binlog-stm_ps.test for the embedded-server 2007-06-14 20:33:57 +05:00
holyfoot/hf@hfmain.(none)
eabb672080 Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
2007-06-14 20:30:08 +05:00
gkodinov/kgeorge@magare.gmz
16a7a45bdc Merge magare.gmz:/home/kgeorge/mysql/work/valgrind-errs-5.0-opt
into  magare.gmz:/home/kgeorge/mysql/work/valgrind-errs-5.1-opt
2007-06-14 16:52:30 +03:00
gkodinov/kgeorge@magare.gmz
37deabacb2 Merge bk-internal:/home/bk/mysql-5.0-opt
into  magare.gmz:/home/kgeorge/mysql/work/valgrind-errs-merge-5.0-opt
2007-06-14 16:43:14 +03:00
gkodinov/kgeorge@magare.gmz
78f477c9d9 corrected valgrind problems for bug 28505 and 28934 2007-06-14 15:38:52 +03:00
holyfoot/hf@hfmain.(none)
a6c221d01e Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
2007-06-14 16:45:14 +05:00
holyfoot/hf@hfmain.(none)
1e9373fd60 Merge bk@192.168.21.1:mysql-5.1
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
2007-06-14 16:42:43 +05:00
holyfoot/hf@hfmain.(none)
8ccc50b303 Merge bk@192.168.21.1:mysql-5.0
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
2007-06-14 16:41:10 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
79062df3fb Merge bk@192.168.21.1:mysql-4.1
into  mysql.com:/d2/hf/mrg/mysql-4.1-opt
2007-06-14 16:35:46 +05:00
holyfoot/hf@hfmain.(none)
76e0a0768a Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
2007-06-14 16:35:20 +05:00
svoj@june.mysql.com
d122a8caf7 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-engines
into  mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.1-engines
2007-06-14 16:28:34 +05:00
bar@mysql.com/bar.myoffice.izhnet.ru
6d2ffe7b8e Bug#26402 Server crashes with old-style named table
Problem: crash on attempt to open a table
  having "#mysql50#" prefix in db or table name.
  Fix: This prefix is reserved for "mysql_upgrade"
  to access 5.0 tables  whose file names are not encoded
  according to "5.1 tablename to filename encoded".
  Don't try open tables whose db name or table name
  has this prefix.
2007-06-14 16:28:33 +05:00
svoj@june.mysql.com
09cd5b5ef8 Merge mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.0-engines
into  mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.1-engines
2007-06-14 16:19:47 +05:00
svoj@mysql.com/june.mysql.com
01c9419cec BUG#26976 - Missing table in merge not noted in related error msg +
SHOW CREATE TABLE fails
Addition to the fix: report db name + table name instead of table path.
This solves embedded merge test failure.
2007-06-14 16:18:01 +05:00
gkodinov/kgeorge@magare.gmz
2372767bbd Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into  magare.gmz:/home/kgeorge/mysql/autopush/B28991-5.1-opt
2007-06-14 12:54:52 +03:00
gkodinov/kgeorge@magare.gmz
56290f2690 Bug #28991: rpl_events failure in pushbuild
In tests waiting on a timeout is not deterministic enough
to make sure that an event actually finished executing.
Fixed the test by waiting in a loop and checking the effect
that the event is supposed to produce.
2007-06-14 12:53:13 +03:00
igor@olga.mysql.com
20ad515003 Fixed bug #28980: the result of ROUND(<decimal expr>,<int column>)
was erroneously converted to double, while the result of
ROUND(<decimal expr>, <int literal>) was preserved as decimal.
As a result of such a conversion the value of ROUND(D,A) could
differ from the value of ROUND(D,val(A)) if D was a decimal expression.

Now the result of the ROUND function is never converted to 
double if the first argument is decimal.
2007-06-13 09:32:36 -07:00
mhansson@dl145s.mysql.com
b87dbfe949 Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into  dl145s.mysql.com:/users/mhansson/mysql/autopush/5.1o-bug27634
2007-06-13 16:01:16 +02:00
antony@ppcg5.local
3bb1769bc0 Bug#25800
"Embedded server requires mysql.plugin"
  Embedded builds should not print any error when the mysql.plugin
  table does not exist. This is achieved by checking for the existance
  of the mysql.plugin table before attempting to open it and proceed
  silently if it does not exist.
2007-06-12 19:28:05 -07:00
gkodinov/kgeorge@magare.gmz
72f395a559 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into  magare.gmz:/home/kgeorge/mysql/autopush/B27816-5.1-opt
2007-06-12 19:24:48 +03:00
gkodinov/kgeorge@magare.gmz
0d6bae220e Merge bk-internal:/home/bk/mysql-5.1-opt
into  magare.gmz:/home/kgeorge/mysql/work/merge-5.1-opt
2007-06-12 18:42:43 +03:00
gkodinov/kgeorge@magare.gmz
eb1fb60975 5.0-opt -> 5.1-opt merge 2007-06-12 18:41:56 +03:00
gkodinov/kgeorge@magare.gmz
fbefe9d552 Merge bk-internal:/home/bk/mysql-5.0-opt
into  magare.gmz:/home/kgeorge/mysql/work/merge-5.1-opt
2007-06-12 16:34:54 +03:00
holyfoot/hf@hfmain.(none)
79f0900f9a Merge bk@192.168.21.1:mysql-5.1-opt
into  mysql.com:/home/hf/work/28757/my51-28757
2007-06-12 18:33:49 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
7093310760 Bug #28757 Test program / embedded server crash in test "unsafe_binlog_innodb"
the reported test failure is fixed by the patch to 28333,
but there's a bit more to fix in the test itself - to
drop tables created in this test at the test's beginning.
2007-06-12 17:53:16 +05:00
mhansson/martin@linux-st28.site
660d647526 Bug#27634: group_by test fails
On many architectures, e.g. 68000, x86, the double registers have higher precision 
than the IEEE standard prescribes. When compiled with flags -O and higher, some double's 
go into registers and therefore have higher precision. In one test case the cost 
information of the best and second-best key were close enough to be influenced by this 
effect, causing a failed test in distribution builds.

Fixed by removing some rows from the table in question so that cost information is not
influenced by decimals beyond standard definition of double.
2007-06-12 15:10:33 +03:00
gkodinov/kgeorge@magare.gmz
2a6ac40e11 removed compilation warning 2007-06-12 14:45:30 +03:00
gkodinov/kgeorge@magare.gmz
32d9644489 Merge bk-internal:/home/bk/mysql-5.0-opt
into  magare.gmz:/home/kgeorge/mysql/autopush/B28992-5.0-opt
2007-06-12 14:37:14 +03:00
gkodinov/kgeorge@magare.gmz
5ea9964b9f Bug #28992: trigger fails in pushbuild
- fixed wrong test case for bug 20903
 - closed the dangling connections in trigger.test
 - GET_LOCK() and RELEASE_LOCK() now produce more detailed log
 - fixed an omission in GET_LOCK() : assign the thread_id when
    acquiring the lock.
2007-06-12 14:35:36 +03:00
gkodinov/kgeorge@magare.gmz
0fa279e5e2 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  magare.gmz:/home/kgeorge/mysql/autopush/B28934-5.0-opt
2007-06-12 11:11:12 +03:00
gkodinov/kgeorge@magare.gmz
b9876c6e9c Bug #28934: server crash when receiving malformed com_execute packets
Sometimes a parameter slot may not get a value because of the protocol
 data being plain wrong.
 Such cases should be detected and handled by returning an error.
 Fixed by checking data stream constraints where possible (like maximum
 length) and reacting to the case where a value cannot be constructed.
2007-06-12 11:02:34 +03:00
evgen@moonbone.local
4cdbe25a6b Bug#28904: INSERT .. ON DUPLICATE was silently updating rows when it shouldn't.
When the INSERT .. ON DUPLICATE KEY UPDATE has to update a matched row but
the new data is the same as in the record then it returns as if
no rows were inserted or updated. Nevertheless the row is silently
updated. This leads to a situation when zero updated rows are reported 
in the case when data has actually been changed.

Now the write_record function updates a row only if new data differs from
that in the record.
2007-06-12 01:41:23 +04:00
evgen@moonbone.local
9e8299f69e grant2.result:
Post merge fix.
2007-06-11 22:55:21 +04:00
istruewing@chilla.local
1d9c30473e Merge chilla.local:/home/mydev/mysql-5.0-axmrg
into  chilla.local:/home/mydev/mysql-5.1-axmrg
2007-06-11 19:26:52 +02:00
istruewing@chilla.local
630450679a Merge chilla.local:/home/mydev/mysql-5.1-amain
into  chilla.local:/home/mydev/mysql-5.1-axmrg
2007-06-11 19:25:12 +02:00
istruewing@chilla.local
2e8cea5a5a Merge chilla.local:/home/mydev/mysql-4.1-axmrg
into  chilla.local:/home/mydev/mysql-5.0-axmrg
2007-06-11 17:40:53 +02:00
istruewing@chilla.local
86f495d53c Merge chilla.local:/home/mydev/mysql-5.0-amain
into  chilla.local:/home/mydev/mysql-5.0-axmrg
2007-06-11 17:40:01 +02:00
istruewing@chilla.local
491e9d2292 Merge chilla.local:/home/mydev/mysql-4.1-amain
into  chilla.local:/home/mydev/mysql-4.1-axmrg
2007-06-11 16:24:29 +02:00
evgen@moonbone.local
24ea0909c9 Merge moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql
into  moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql
2007-06-11 17:14:16 +04:00
evgen@moonbone.local
e1cde8aabe error_simulation.result, item.cc, subselect.result, error_simulation.test:
Post merge fix.
2007-06-11 17:02:16 +04:00
evgen@moonbone.local
76f4f23f54 Merge moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql
into  moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql
2007-06-11 14:20:52 +04:00
evgen@moonbone.local
dcc1d8229b item_cmpfunc.cc, field.cc, sql_insert.cc, sql_class.h, sql_yacc.yy:
Post merge fix.
2007-06-11 13:38:37 +04:00