Commit graph

28545 commits

Author SHA1 Message Date
gluh@eagle.intranet.mysql.r18.ru
21cc3ae561 Fix for bug#11491 Misleading error message if not NULL column set to NULL,
SQL mode TRADITIONAL
  Message is chenged from 'ER_WARN_NULL_TO_NOTNULL' to 'ER_BAD_NULL_ERROR'
2005-12-01 15:30:11 +04:00
gluh@eagle.intranet.mysql.r18.ru
fb057f13fb Fix for bug#9785 SELECT privilege for the whole database
is needed to do SHOW CREATE DATABASE
  To allow SHOW CREATE DATABASE when the user can use the database
2005-12-01 13:04:19 +04:00
gluh@mysql.com
55ee78ed86 Merge mysql.com:/home/gluh/MySQL/Merge/5.0
into mysql.com:/home/gluh/MySQL/Merge/5.1-new
2005-12-01 11:08:13 +04:00
gluh@eagle.intranet.mysql.r18.ru
1faac904f5 Fix for bug#14476 information_schema.TABLES.TABLE_TYPE with empty value
store TABLES.TABLE_TYPE in case of error during table opening
2005-12-01 11:00:33 +04:00
jimw@mysql.com
0538845963 Merge mysql.com:/home/jimw/my/mysql-5.1-release
into  mysql.com:/home/jimw/my/mysql-5.1-clean
2005-11-30 13:51:23 -08:00
jimw@mysql.com
5ccc2c0b05 After-merge cleanups to alter_table test 2005-11-30 13:41:40 -08:00
jimw@mysql.com
b3ba66495c Merge mysql.com:/home/jimw/my/mysql-5.0-clean
into  mysql.com:/home/jimw/my/mysql-5.1-clean
2005-11-30 13:12:35 -08:00
jimw@mysql.com
085e7784b0 Merge mysql.com:/home/jimw/my/mysql-5.0-14610
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-11-30 13:10:50 -08:00
jimw@mysql.com
37ff730866 Fix union.result 2005-11-30 13:10:08 -08:00
jimw@mysql.com
0597c510c8 Merge mysql.com:/home/jimw/my/mysql-5.0-clean
into  mysql.com:/home/jimw/my/mysql-5.1-clean
2005-11-30 12:17:01 -08:00
jimw@mysql.com
70c30c8d93 Merge bk-internal:/home/bk/mysql-5.0
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-11-30 10:18:11 -08:00
timour@mysql.com
33405b01e7 Merge tkatchaounov@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/timka/mysql/src/5.0-virgin
2005-11-30 19:43:53 +02:00
gluh@mysql.com
c2a9d3bf70 Merge mysql.com:/home/gluh/MySQL/Merge/4.1
into mysql.com:/home/gluh/MySQL/Merge/5.0
2005-11-30 21:29:31 +04:00
timour@mysql.com
ecb78b4d10 WL#2486 - natural/using join according to SQL:2003
Commented out one failing query in the regression test (reported as a bug).
2005-11-30 19:13:29 +02:00
timour@mysql.com
3b672d7e67 WL#2486 - natural/using join according to SQL:2003.
Implemented specialized regression test for the WL.
2005-11-30 19:06:58 +02:00
vtkachenko@quadxeon.mysql.com
5ad6b9b4f3 check-cpu:
Add XEON detection (fix)
2005-11-30 09:57:40 +01:00
jimw@mysql.com
f8afbe6f0c Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-11-29 15:33:58 -08:00
marty@linux.site
0c8d641878 Fix for bug#5323, no bug, new error code 2005-11-29 22:54:16 +01:00
jimw@mysql.com
f353bec511 Merge mysql.com:/home/jimw/my/mysql-4.1-14216
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-11-29 11:52:58 -08:00
jimw@mysql.com
eae275ea46 Disable a few failing NDB tests until they can be investigated 2005-11-29 10:22:17 -08:00
joerg@mysql.com
18a3374347 Merge mysql.com:/M50/mysql-5.0 into mysql.com:/M51/merge-5.1 2005-11-29 17:05:48 +01:00
aivanov@mysql.com
04d1ef90dd Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/alexi/dev/mysql-5.0-build
2005-11-29 18:06:56 +03:00
knielsen@mysql.com
e4cfee01d1 More Win32 byte* vs. char* fixes. 2005-11-29 15:18:31 +01:00
knielsen@mysql.com
6246425ef1 Merge bk-internal:/home/bk/mysql-5.0
into  mysql.com:/usr/local/mysql/mysql-5.0
2005-11-29 14:08:49 +01:00
knielsen@mysql.com
84d6dc67e4 Merge mysql.com:/usr/local/mysql/mysql-5.0
into  mysql.com:/usr/local/mysql/mysql-5.1-new
2005-11-29 13:58:33 +01:00
holyfoot@deer.(none)
655c9b93a0 test fixed 2005-11-29 16:46:51 +04:00
knielsen@mysql.com
4fc659bf49 Moved long running query to type_newdecimal-big.test
Removed warnings that depends on floating point comparisions in type_newdecimal.test which caused failures in some setups
[Backported from mysql-5.1-new @1.1961.1.1]
2005-11-29 13:42:45 +01:00
holyfoot@mysql.com
c60b8e3027 Merge bk@192.168.21.1:mysql-5.0
into mysql.com:/home/hf/work/mysql-5.0.14693
2005-11-29 13:33:56 +04:00
gluh@mysql.com
572e338fa8 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/gluh/MySQL/Merge/4.1
2005-11-29 13:07:56 +04:00
gluh@eagle.intranet.mysql.r18.ru
4b6a94ffb4 Fix for bug#14221 SSL support breaks going from OpenSSL 0.9.7i to 0.9.8a
added SSL_library_init()
2005-11-29 12:15:48 +04:00
knielsen@mysql.com
0da7c25528 Fix byte * vs. char * mismatches that break Win32 compilation. 2005-11-29 09:07:21 +01:00
bar@mysql.com
23c4c3abc0 Merge mysql.com:/usr/home/bar/mysql-5.0
into  mysql.com:/usr/home/bar/mysql-5.1-new
2005-11-29 09:30:29 +04:00
bar@mysql.com
0f73558ee3 Merge mysql.com:/usr/home/bar/mysql-4.1.b10446
into  mysql.com:/usr/home/bar/mysql-5.0
2005-11-29 09:25:51 +04:00
bar@mysql.com
5c1ba75cfd Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-4.1.b10446
2005-11-29 09:21:57 +04:00
brian@zim.(none)
22183f2342 Fixed typo where I did --replace-names intead of --replace.
Thanks Paul for pointing it out :)
2005-11-28 19:44:55 -08:00
jimw@mysql.com
0f9f53c321 Add Ingo to SHOW AUTHORS 2005-11-28 18:28:31 -08:00
jimw@mysql.com
30bafb78a8 Small tweaks to SHOW AUTHORS list 2005-11-28 18:14:16 -08:00
jimw@mysql.com
d0c2f3cfd6 Update list of authors with information from documentation. 2005-11-28 15:32:26 -08:00
jimw@mysql.com
1a391f71f5 Merge bk-internal:/home/bk/mysql-5.0
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-11-28 12:55:27 -08:00
pem@mysql.com
632d497c23 Updated show_check.result. 2005-11-28 21:27:46 +01:00
knielsen@mysql.com
fc1ee24f8a Merge bk-internal:/home/bk/mysql-5.0
into  mysql.com:/usr/local/mysql/mysql-5.0
2005-11-28 20:42:26 +01:00
aivanov@mysql.com
6680d33a4c Changed mysqld.dsp to avoid compilation error in VC++ 2005-11-28 22:15:43 +03:00
pem@mysql.com
b2a9961abf Merge mysql.com:/usr/local/bk/mysql-5.0
into  mysql.com:/usr/home/pem/mysql-5.1-new
2005-11-28 20:14:12 +01:00
jimw@mysql.com
5f7e5b46c6 Merge mysql.com:/home/jimw/my/mysql-4.1-5792
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-11-28 10:52:52 -08:00
jimw@mysql.com
9df4951acb Merge mysql.com:/home/jimw/my/mysql-5.0-14956
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-11-28 10:51:54 -08:00
jimw@mysql.com
99297e44d4 Merge mysql.com:/home/jimw/my/mysql-4.1-14155
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-11-28 10:50:23 -08:00
joerg@mysql.com
379d3ee98c Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/M50/mysql-5.0
2005-11-28 17:26:56 +01:00
joerg@mysql.com
fc57b9c548 Merge mysql.com:/M50/testbugs-5.0 into mysql.com:/M50/mysql-5.0 2005-11-28 17:17:17 +01:00
joerg@mysql.com
5f5fc654df Merge mysql.com:/M50/testbugs-5.0 into mysql.com:/M51/clone-5.1 2005-11-28 17:09:22 +01:00
joerg@mysql.com
41e9dc8352 mysql-test/t/alter_table.test
Care for case-insignificant platforms (Mac OS X, Windows).
2005-11-28 17:07:54 +01:00