Commits · c86ba5f5e7aed6baefb1ec7d06a498485411768c · nexedi / MariaDB

01 Dec, 2005 4 commits

Fix for bug#11491 Misleading error message if not NULL column set to NULL, · c86ba5f5

unknown authored Dec 01, 2005

                  SQL mode TRADITIONAL
  Message is chenged from 'ER_WARN_NULL_TO_NOTNULL' to 'ER_BAD_NULL_ERROR'


mysql-test/r/auto_increment.result:
  Fix for bug#11491 Misleading error message if not NULL column set to NULL,
                    SQL mode TRADITIONAL
    result change
mysql-test/r/create.result:
  Fix for bug#11491 Misleading error message if not NULL column set to NULL,
                    SQL mode TRADITIONAL
    result change
mysql-test/r/insert.result:
  Fix for bug#11491 Misleading error message if not NULL column set to NULL,
                    SQL mode TRADITIONAL
    result change
mysql-test/r/insert_select.result:
  Fix for bug#11491 Misleading error message if not NULL column set to NULL,
                    SQL mode TRADITIONAL
    result change
mysql-test/r/key.result:
  Fix for bug#11491 Misleading error message if not NULL column set to NULL,
                    SQL mode TRADITIONAL
    result change
mysql-test/r/null.result:
  Fix for bug#11491 Misleading error message if not NULL column set to NULL,
                    SQL mode TRADITIONAL
    result change
mysql-test/r/null_key.result:
  Fix for bug#11491 Misleading error message if not NULL column set to NULL,
                    SQL mode TRADITIONAL
    result change
mysql-test/r/ps_2myisam.result:
  Fix for bug#11491 Misleading error message if not NULL column set to NULL,
                    SQL mode TRADITIONAL
    result change
mysql-test/r/ps_3innodb.result:
  Fix for bug#11491 Misleading error message if not NULL column set to NULL,
                    SQL mode TRADITIONAL
    result change
mysql-test/r/ps_4heap.result:
  Fix for bug#11491 Misleading error message if not NULL column set to NULL,
                    SQL mode TRADITIONAL
    result change
mysql-test/r/ps_5merge.result:
  Fix for bug#11491 Misleading error message if not NULL column set to NULL,
                    SQL mode TRADITIONAL
    result change
mysql-test/r/ps_6bdb.result:
  Fix for bug#11491 Misleading error message if not NULL column set to NULL,
                    SQL mode TRADITIONAL
    result change
mysql-test/r/ps_7ndb.result:
  Fix for bug#11491 Misleading error message if not NULL column set to NULL,
                    SQL mode TRADITIONAL
    result change
mysql-test/r/strict.result:
  Fix for bug#11491 Misleading error message if not NULL column set to NULL,
                    SQL mode TRADITIONAL
    result change
mysql-test/r/view.result:
  Fix for bug#11491 Misleading error message if not NULL column set to NULL,
                    SQL mode TRADITIONAL
    result change
mysql-test/r/warnings.result:
  Fix for bug#11491 Misleading error message if not NULL column set to NULL,
                    SQL mode TRADITIONAL
    result change
mysql-test/t/strict.test:
  Fix for bug#11491 Misleading error message if not NULL column set to NULL,
                    SQL mode TRADITIONAL
    test change

c86ba5f5

Fix for bug#9785 SELECT privilege for the whole database · 952c56ce

unknown authored Dec 01, 2005

                 is needed to do SHOW CREATE DATABASE
  To allow SHOW CREATE DATABASE when the user can use the database


mysql-test/r/show_check.result:
  Fix for bug#9785 SELECT privilege for the whole database 
                   is needed to do SHOW CREATE DATABASE
    test result
mysql-test/t/show_check.test:
  Fix for bug#9785 SELECT privilege for the whole database 
                   is needed to do SHOW CREATE DATABASE
    test case
sql/sql_show.cc:
  Fix for bug#9785 SELECT privilege for the whole database 
                   is needed to do SHOW CREATE DATABASE
    removed unnecessary code

952c56ce

Merge mysql.com:/home/gluh/MySQL/Merge/5.0 · 58007d82

unknown authored Dec 01, 2005

into mysql.com:/home/gluh/MySQL/Merge/5.1-new


mysql-test/r/information_schema.result:
  Auto merged
sql/sql_show.cc:
  Auto merged

58007d82

Fix for bug#14476 `information_schema`.`TABLES`.`TABLE_TYPE` with empty value · ba079bad

unknown authored Dec 01, 2005

  store TABLES.TABLE_TYPE in case of error during table opening


mysql-test/r/information_schema.result:
  Fix for bug#14476 `information_schema`.`TABLES`.`TABLE_TYPE` with empty value
    test case
mysql-test/t/information_schema.test:
  Fix for bug#14476 `information_schema`.`TABLES`.`TABLE_TYPE` with empty value
    test case

ba079bad

30 Nov, 2005 12 commits

Merge mysql.com:/home/jimw/my/mysql-5.1-release · 9c81773b

unknown authored Nov 30, 2005

into  mysql.com:/home/jimw/my/mysql-5.1-clean


mysql-test/t/alter_table.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/table.cc:
  Auto merged
mysql-test/r/show_check.result:
  Resolve conflict
sql/authors.h:
  Resolve conflicts, update replication/backup developers

9c81773b

After-merge cleanups to alter_table test · 8486e64f

unknown authored Nov 30, 2005


mysql-test/r/alter_table.result:
  Add drop table that got axed in merge
mysql-test/t/alter_table.test:
  Fix merge

8486e64f

Merge mysql.com:/home/jimw/my/mysql-5.0-clean · eae62b1d
unknown authored Nov 30, 2005
```
into  mysql.com:/home/jimw/my/mysql-5.1-clean
```
eae62b1d
Merge mysql.com:/home/jimw/my/mysql-5.0-14610 · 3c8a8de4
unknown authored Nov 30, 2005
```
into  mysql.com:/home/jimw/my/mysql-5.0-clean
```
3c8a8de4
Fix union.result · b775d23f
unknown authored Nov 30, 2005
```
mysql-test/r/union.result:
  Fix order of test results
```
b775d23f

Merge mysql.com:/home/jimw/my/mysql-5.0-clean · 6653213a

unknown authored Nov 30, 2005

into  mysql.com:/home/jimw/my/mysql-5.1-clean


VC++Files/sql/mysqld.dsp:
  Auto merged
sql/item.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/r/alter_table.result:
  Resolve conflict
mysql-test/t/alter_table.test:
  Resolve conflict

6653213a

Merge bk-internal:/home/bk/mysql-5.0 · 03e057cd

unknown authored Nov 30, 2005

into  mysql.com:/home/jimw/my/mysql-5.0-clean


vio/viosslfactories.c:
  Auto merged

03e057cd

Merge tkatchaounov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 30dfba37
unknown authored Nov 30, 2005
```
into  mysql.com:/home/timka/mysql/src/5.0-virgin
```
30dfba37
Merge mysql.com:/home/gluh/MySQL/Merge/4.1 · c3937487
unknown authored Nov 30, 2005
```
into mysql.com:/home/gluh/MySQL/Merge/5.0


vio/viosslfactories.c:
  Auto merged
```
c3937487

WL#2486 - natural/using join according to SQL:2003 · e26eb47b

unknown authored Nov 30, 2005

Commented out one failing query in the regression test (reported as a bug).


mysql-test/r/join.result:
  Commented out failing query.
mysql-test/t/join.test:
  Commented out failing query.

e26eb47b

WL#2486 - natural/using join according to SQL:2003. · 7c38fc51

unknown authored Nov 30, 2005

Implemented specialized regression test for the WL.


mysql-test/r/join.result:
  Test results for natural join tests.
mysql-test/t/join.test:
  Specialized test for natural join, and join ... on.

7c38fc51

check-cpu: · fc289724

unknown authored Nov 30, 2005

  Add XEON detection (fix)


BUILD/check-cpu:
  Add XEON detection (fix)

fc289724

29 Nov, 2005 21 commits

Merge mysql.com:/home/jimw/my/mysql-4.1-clean · d9d1337e

unknown authored Nov 29, 2005

into  mysql.com:/home/jimw/my/mysql-5.0-clean


mysql-test/r/union.result:
  Auto merged
sql/item.cc:
  Auto merged
vio/viosslfactories.c:
  Auto merged
mysql-test/t/union.test:
  Resolve conflict

d9d1337e

Fix for bug#5323, no bug, new error code · 9d04ab0e
unknown authored Nov 29, 2005

9d04ab0e
Merge mysql.com:/home/jimw/my/mysql-4.1-14216 · a171aa69
unknown authored Nov 29, 2005
```
into  mysql.com:/home/jimw/my/mysql-4.1-clean


sql/item.cc:
  Auto merged
```
a171aa69
Disable a few failing NDB tests until they can be investigated · e49cd90f
unknown authored Nov 29, 2005
```
mysql-test/t/disabled.def:
  Disable failing NDB tests
```
e49cd90f
Merge mysql.com:/M50/mysql-5.0 into mysql.com:/M51/merge-5.1 · 4ac451a6
unknown authored Nov 29, 2005
```
mysql-test/t/alter_table.test:
  Auto merged
```
4ac451a6
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 · e77da4fc
unknown authored Nov 29, 2005
```
into  mysql.com:/home/alexi/dev/mysql-5.0-build
```
e77da4fc
More Win32 byte* vs. char* fixes. · b6547d09
unknown authored Nov 29, 2005

b6547d09
Merge bk-internal:/home/bk/mysql-5.0 · b37a5f0f
unknown authored Nov 29, 2005
```
into  mysql.com:/usr/local/mysql/mysql-5.0
```
b37a5f0f

Merge mysql.com:/usr/local/mysql/mysql-5.0 · 63187f29

unknown authored Nov 29, 2005

into  mysql.com:/usr/local/mysql/mysql-5.1-new


BitKeeper/deleted/.del-type_newdecimal-big.result:
  Delete: mysql-test/r/type_newdecimal-big.result
BitKeeper/deleted/.del-type_newdecimal-big.test:
  Delete: mysql-test/t/type_newdecimal-big.test
mysql-test/r/type_newdecimal.result:
  Auto merged
mysql-test/t/type_newdecimal.test:
  Auto merged

63187f29

test fixed · 2985bc7a
unknown authored Nov 29, 2005
```
mysql-test/r/type_ranges.result:
  result fixed
```
2985bc7a

Moved long running query to type_newdecimal-big.test · c6f9e7bf

unknown authored Nov 29, 2005

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]


mysql-test/r/type_newdecimal.result:
  Moved long running query to type_newdecimal-big.test
  Removed warnings that depends on floating point comparisions
  [Backported from mysql-5.1-new]
mysql-test/t/type_newdecimal.test:
  Moved long running query to type_newdecimal-big.test
  Removed warnings that depends on floating point comparisions
  [Backported from mysql-5.1-new]

c6f9e7bf

Merge bk@192.168.21.1:mysql-5.0 · 88822b35

unknown authored Nov 29, 2005

into mysql.com:/home/hf/work/mysql-5.0.14693


sql/sql_table.cc:
  Auto merged

88822b35

Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 5d7b85e5
unknown authored Nov 29, 2005
```
into mysql.com:/home/gluh/MySQL/Merge/4.1
```
5d7b85e5
Fix for bug#14221 SSL support breaks going from OpenSSL 0.9.7i to 0.9.8a · 9e33fc73
unknown authored Nov 29, 2005
```
  added SSL_library_init()
```
9e33fc73
Fix byte * vs. char * mismatches that break Win32 compilation. · 27555e54
unknown authored Nov 29, 2005

27555e54

Merge mysql.com:/usr/home/bar/mysql-5.0 · f967d43c

unknown authored Nov 29, 2005

into  mysql.com:/usr/home/bar/mysql-5.1-new


client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/table.cc:
  Auto merged

f967d43c

Merge mysql.com:/usr/home/bar/mysql-4.1.b10446 · 5b6a28d1

unknown authored Nov 29, 2005

into  mysql.com:/usr/home/bar/mysql-5.0


mysql-test/r/ctype_recoding.result:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged

5b6a28d1

Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 0fa8fc66
unknown authored Nov 29, 2005
```
into  mysql.com:/usr/home/bar/mysql-4.1.b10446


sql/item.cc:
  Auto merged
```
0fa8fc66

Fixed typo where I did --replace-names intead of --replace. · c6cf4bee

unknown authored Nov 28, 2005

Thanks Paul for pointing it out :)


client/mysqldump.c:
  Oops, obvious typo aye? Should hae had --replace not --replace-names

c6cf4bee

Add Ingo to SHOW AUTHORS · c9de3de0
unknown authored Nov 28, 2005
```
sql/authors.h:
  Add Ingo
```
c9de3de0
Small tweaks to SHOW AUTHORS list · 0bf6eb88
unknown authored Nov 28, 2005
```
sql/authors.h:
  Put Krow in parens to be consistent with other nicknames
```
0bf6eb88

28 Nov, 2005 3 commits

Update list of authors with information from documentation. · ccdb1ee9

unknown authored Nov 28, 2005


mysql-test/r/show_check.result:
  Remove authors from test result
mysql-test/t/show_check.test:
  Don't put list of authors in results, just test that SHOW AUTHORS doesn't
  give us any sort of error
sql/authors.h:
  Add copyright notice, fix formatting of comments, update and alphabetize
  list of authors, fix up formatting of entries.

ccdb1ee9

Merge bk-internal:/home/bk/mysql-5.0 · 00274bc5
unknown authored Nov 28, 2005
```
into  mysql.com:/home/jimw/my/mysql-5.0-clean
```
00274bc5
Updated show_check.result. · 594ac515
unknown authored Nov 28, 2005
```
mysql-test/r/show_check.result:
  Updated result.
```
594ac515