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

53371 commits

This branch
This branch
All branches
Author SHA1 Message Date
istruewing@stella.local
eabe082d6f Manual merge 2008-03-14 12:02:11 +01:00
kaa@kaamos.(none)
eac3a26efa Merge kaamos.(none):/data/src/opt/mysql-5.0-opt 
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
 2008-03-13 12:19:56 +03:00
kaa@kaamos.(none)
3bff5b59c6 Bug#35103 mysql_client_test::test_bug29948 causes sporadic failures 
Disable test case for bug 29948, which is causing sporadically
failures in other tests inside mysql_client_test.
 2008-03-13 12:14:14 +03:00
kaa@kaamos.(none)
06bf29cf0f Fixed test failures caused by insufficient cleanups in the tests for 
bug12713.
 2008-03-12 16:52:29 +03:00
kaa@kaamos.(none)
11c336b805 Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.1-opt 
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
 2008-03-12 13:56:50 +03:00
kaa@kaamos.(none)
28b4988ee4 Merge kaamos.(none):/data/src/opt/mysql-5.0-opt 
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
 2008-03-12 13:29:50 +03:00
kaa@kaamos.(none)
9c811ddec9 Post-merge fix. 2008-03-12 13:22:58 +03:00
kaa@kaamos.(none)
a48f1d24ab Re-enabled the test for mysql_insert_id() after merging from main. 2008-03-12 12:13:41 +03:00
kaa@kaamos.(none)
ae93d258aa Merge kaamos.(none):/data/src/opt/mysql-5.0-opt 
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
 2008-03-12 11:21:12 +03:00
kaa@kaamos.(none)
0a7052e4d3 Merge kaamos.(none):/data/src/mysql-5.1 
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
 2008-03-12 11:19:46 +03:00
kaa@kaamos.(none)
815898f3a8 Merge kaamos.(none):/data/src/opt/mysql-4.1-opt 
into  kaamos.(none):/data/src/opt/mysql-5.0-opt
 2008-03-12 11:00:52 +03:00
kaa@kaamos.(none)
d0eb90501d Merge kaamos.(none):/data/src/mysql-5.0 
into  kaamos.(none):/data/src/opt/mysql-5.0-opt
 2008-03-12 10:59:15 +03:00
kaa@kaamos.(none)
9510da1916 Merge kaamos.(none):/data/src/mysql-4.1 
into  kaamos.(none):/data/src/opt/mysql-4.1-opt
 2008-03-12 10:53:15 +03:00
kaa@kaamos.(none)
7e365efa30 Merge kaamos.(none):/data/src/opt/mysql-5.0-opt 
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
 2008-03-11 15:47:16 +03:00
mhansson/martin@riffraff.(none)
3d87b263d9 Merge mhansson@bk-internal:/home/bk/mysql-5.1-opt 
into  riffraff.(none):/data0/martin/bug34367/my51-bug34367-pushee
 2008-03-11 11:31:59 +01:00
istruewing@stella.local
df059d9ca6 Merge stella.local:/home2/mydev/mysql-5.1-ateam 
into  stella.local:/home2/mydev/mysql-5.1-axmrg
 2008-03-11 11:30:30 +01:00
holyfoot/hf@hfmain.(none)
e0851650e1 Merge bk@192.168.21.1:mysql-5.1-opt 
into  mysql.com:/home/hf/work/32801/my51-32801
 2008-03-11 11:20:36 +04:00
istruewing@stella.local
17a10cb40e Bug#31331 - MyISAM or Merge Table upgrade incompatibility with 5.1 
Post-pushbuild fixes. Added purecov comments.
 2008-03-10 19:00:45 +01:00
tnurnberg@white.intern.koehntopp.de
f5b93ab932 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  mysql.com:/misc/mysql/34749/51-34749
 2008-03-10 07:39:04 +01:00
tnurnberg@white.intern.koehntopp.de
3a87bbfe42 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/misc/mysql/34749/50-34749
 2008-03-10 07:11:12 +01:00
tnurnberg@white.intern.koehntopp.de
fd2bae9981 Merge mysql.com:/misc/mysql/34749/50-34749 
into  mysql.com:/misc/mysql/34749/51-34749
 2008-03-10 07:07:56 +01:00
tnurnberg@white.intern.koehntopp.de
10bf47abf3 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  mysql.com:/misc/mysql/29645/51-29645
 2008-03-10 06:52:32 +01:00
tnurnberg@white.intern.koehntopp.de
f2b153a2a5 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/misc/mysql/29645/50-29645
 2008-03-10 06:48:55 +01:00
tnurnberg@white.intern.koehntopp.de
6ad2340f63 Merge mysql.com:/misc/mysql/29645/50-29645 
into  mysql.com:/misc/mysql/29645/51-29645
 2008-03-10 06:44:31 +01:00
kaa@kaamos.(none)
71d67f7f51 Merge kaamos.(none):/data/src/opt/bug34889/my51 
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
 2008-03-08 14:21:21 +03:00
kaa@kaamos.(none)
ace5022619 Merge kaamos.(none):/data/src/opt/bug34889/my50 
into  kaamos.(none):/data/src/opt/mysql-5.0-opt
 2008-03-08 14:20:55 +03:00
kaa@kaamos.(none)
88a1ab6ce8 Merge kaamos.(none):/data/src/opt/bug34889/my50 
into  kaamos.(none):/data/src/opt/bug34889/my51
 2008-03-08 11:21:11 +03:00
antony@pcg5ppc.xiphis.org
bdc74bbda7 Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.1
 2008-03-07 14:07:01 -08:00
antony@pcg5ppc.xiphis.org
bfa8eeaf5a Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.0 
into  pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.1
 2008-03-07 13:48:41 -08:00
antony@pcg5ppc.xiphis.org
820068f1b7 Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.1-engines 
into  pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.1
 2008-03-07 13:46:29 -08:00
antony@pcg5ppc.xiphis.org
9c4e4640ad Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.0-engines 
into  pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.0
 2008-03-07 13:41:11 -08:00
bar@bar.myoffice.izhnet.ru
ba600ac12f Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  mysql.com:/home/bar/mysql-work/mysql-5.1.b27580
 2008-03-08 01:15:38 +04:00
bar@mysql.com/bar.myoffice.izhnet.ru
84e6d960e0 After merge fix 2008-03-08 01:14:56 +04:00
svoj@june.mysql.com
38f91fc277 Merge mysql.com:/home/svoj/devel/mysql/BUG34656/mysql-5.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG13861/mysql-5.1-engines
 2008-03-07 21:22:39 +04:00
svoj@june.mysql.com
e84d5f92f0 Merge mysql.com:/home/svoj/devel/mysql/BUG13861/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG13861/mysql-5.1-engines
 2008-03-07 21:21:49 +04:00
svoj@june.mysql.com
99ca77afc9 Merge mysql.com:/home/svoj/devel/bk/mysql-5.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG13861/mysql-5.1-engines
 2008-03-07 21:20:49 +04:00
svoj@june.mysql.com
cc5b8de811 Merge mysql.com:/home/svoj/devel/bk/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG13861/mysql-5.0-engines
 2008-03-07 21:19:30 +04:00
svoj@mysql.com/june.mysql.com
553d70d0ee BUG#34656 - KILL a query = Assertion failed: m_status == DA_ERROR || 
m_status == DA_OK

Reading from information_scema.tables or information_schema.columns
may cause assertion failure in debug builds. This may happen under
rare circumstances when information_schema fails to get information
about a table (e.g. when a connection is killed).

This happens because open_normal_and_derived_tables() can return an
error without setting an error message in THD. But information_schema
attempts to get an error message from THD unconditionally.

With this fix information_schema attempts to get an error message
from THD only in case error message is set in THD.
 2008-03-07 18:41:50 +04:00
mhansson/martin@riffraff.(none)
bcb6d2bec5 Bug #34367: sql/sql_show.cc: create_schema_table should handle 
MYSQL_TYPE_NEWDECIMAL

Added support for the type MYSQL_TYPE_NEWDECIMAL. It now works like
MYSQL_TYPE_DECIMAL. Unfortunately there cannot be a test case until
we have a working information_schema plugin as part of the source
distribution.
 2008-03-07 13:56:15 +01:00
bar@bar.myoffice.izhnet.ru
c49eccfe71 Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b27580v2 
into  mysql.com:/home/bar/mysql-work/mysql-5.1.b27580
Additonal after merge fix
 2008-03-07 15:28:51 +04:00
bar@bar.myoffice.izhnet.ru
d079c2c49d Merge mysql.com:/home/bar/mysql-work/mysql-5.0-engines 
into  mysql.com:/home/bar/mysql-work/mysql-5.1-engines
 2008-03-07 14:58:12 +04:00
gkodinov/kgeorge@magare.gmz
dbc3ef6c9f Merge magare.gmz:/home/kgeorge/mysql/work/B34909-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/work/B34909-5.1-opt
 2008-03-07 11:19:51 +02:00
gkodinov/kgeorge@magare.gmz
560ec24079 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B34909-5.0-opt
 2008-03-07 11:17:31 +02:00
gkodinov/kgeorge@magare.gmz
11cd97ed6b Bug #34909: mysqldump returns a 0 status on error when using 
--master-data

No error code was returned by mysqldump if it detects that binary
logging is not enabled on the server.
Fixed by returning error code.
 2008-03-07 11:15:49 +02:00
sergefp@pslp.mylan
f883250fa9 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/home/psergey/mysql-5.0-bug34945
 2008-03-06 22:45:07 +03:00
bar@mysql.com/bar.myoffice.izhnet.ru
86d9b5e9dc additional test fixes for bug 27580 2008-03-06 09:58:49 +04:00
bar@bar.myoffice.izhnet.ru
34da9303ef Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b27580 
into  mysql.com:/home/bar/mysql-work/mysql-5.0.b27580v2
 2008-03-06 08:41:05 +04:00
kaa@kaamos.(none)
80d89023ea Fix for bug #34889: mysql_client_test::test_mysql_insert_id test fails 
sporadically

Under some circumstances, the mysql_insert_id() value after SELECT ...
INSERT could return a wrong value. This could happen when the last
SELECT ... INSERT did not involve an AUTO_INCREMENT column, but the
value of mysql_insert_id() was changed by some previous statements.

Fixed by checking the value of thd->insert_id_used in
select_insert::send_eof() and returning 0 for mysql_insert_id() if it
is not set.
 2008-03-05 16:02:33 +03:00
bar@mysql.com/bar.myoffice.izhnet.ru
640a4d59fd Bug#23097 mysql can't insert korean on mysql prompt. 
Problem: libedit is a very pure-ASCII oriented library,
and it is not aware of extended (0x80..0xFF) or even multi-byte
characters. It considered such characters as non-printable
and didn't allow to input them.
Fix: make libedit think that all bytes >= 0x80 are printable.
 2008-03-04 16:13:08 +04:00
joerg@trift2.
d4025ce1a6 Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M51/mysql-5.1
 2008-03-03 21:23:19 +01:00