Commits · 46e12a2b482fbd133920c780042463ed03c790b3 · nexedi / MariaDB

28 Nov, 2004 4 commits

Fix for division by zero problem: · 46e12a2b

unknown authored Nov 28, 2004

 * Don't try building ROR-intersect if the queried table has zero rows
 * Don't ever produce an estimate of zero returned rows.

46e12a2b

fix for decimal.c · d2c7736c
unknown authored Nov 28, 2004
```
strings/decimal.c:
  fix
```
d2c7736c

protection: TRASH in delete · 30db8445

unknown authored Nov 28, 2004

fixed a bug that it discovered


include/my_sys.h:
  move TRASH to my_sys.h from sql_list.h
sql/field.h:
  use TRASH macro
sql/item.h:
  TRASH in delete
sql/item_func.h:
  never delete item's manually!
sql/opt_range.cc:
  TRASH in delete
sql/sql_lex.h:
  TRASH in delete
sql/sql_list.h:
  move TRASH to my_sys.h from sql_list.h
sql/sql_parse.cc:
  don't use properties of deleted objects (even when it's safe)
sql/sql_select.cc:
  TRASH in delete
sql/sql_show.cc:
  TRASH in delete
sql/sql_string.h:
  TRASH in delete

30db8445

Merge bk-internal:/home/bk/mysql-5.0 · 7a1ffc06
unknown authored Nov 28, 2004
```
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
```
7a1ffc06

27 Nov, 2004 7 commits

create/drop/rename user cleanup · 257763a9

unknown authored Nov 27, 2004


dbug/user.r:
  help cralified
include/mysqld_error.h:
  new error message added
mysql-test/r/grant.result:
  results updated
mysql-test/r/grant2.result:
  results updated
mysql-test/t/grant.test:
  results updated
mysql-test/t/grant2.test:
  results updated
sql/share/czech/errmsg.txt:
  error message updated
sql/share/danish/errmsg.txt:
  error message updated
sql/share/dutch/errmsg.txt:
  error message updated
sql/share/english/errmsg.txt:
  error message updated
sql/share/estonian/errmsg.txt:
  error message updated
sql/share/french/errmsg.txt:
  error message updated
sql/sql_acl.cc:
  changed error reporting for create/drop/rename user to be consistent with drop table
sql/share/german/errmsg.txt:
  error message updated
sql/share/greek/errmsg.txt:
  error message updated
sql/share/hungarian/errmsg.txt:
  error message updated
sql/share/italian/errmsg.txt:
  error message updated
sql/share/japanese/errmsg.txt:
  error message updated
sql/share/korean/errmsg.txt:
  error message updated
sql/share/norwegian-ny/errmsg.txt:
  error message updated
sql/share/norwegian/errmsg.txt:
  error message updated
sql/share/polish/errmsg.txt:
  error message updated
sql/share/portuguese/errmsg.txt:
  error message updated
sql/share/romanian/errmsg.txt:
  error message updated
sql/share/russian/errmsg.txt:
  error message updated
sql/share/serbian/errmsg.txt:
  error message updated
sql/share/slovak/errmsg.txt:
  error message updated
sql/share/spanish/errmsg.txt:
  error message updated
sql/share/swedish/errmsg.txt:
  error message updated
sql/share/ukrainian/errmsg.txt:
  error message updated

257763a9

Change sql_mode BROKEN_NOT to HIGH_NOT_PRECEDENCE · d777a9aa
unknown authored Nov 27, 2004

d777a9aa
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 · cf1de7d9
unknown authored Nov 27, 2004
```
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
```
cf1de7d9
fix decimal2longlong too · df1f7cab
unknown authored Nov 27, 2004
```
mysql-test/r/rpl_start_stop_slave.result:
  results updated
```
df1f7cab

mysql_priv.h: · 4a9e7d38

unknown authored Nov 27, 2004

  Reverts incomplete change of insert_fields()


sql/mysql_priv.h:
  Reverts incomplete change of insert_fields()

4a9e7d38

Merge bk-internal:/home/bk/mysql-5.0 · 87347253
unknown authored Nov 27, 2004
```
into serg.mylan:/usr/home/serg/Abk/mysql-5.0


sql/sql_parse.cc:
  Auto merged
```
87347253
better overflow checks in decimal2ulonglong · 368cde22
unknown authored Nov 27, 2004
```
better truncation check in decimal2ulonglong
```
368cde22

26 Nov, 2004 20 commits

portability fix (some printf lack of NULL support in strings) · 24ad655a
unknown authored Nov 26, 2004

24ad655a
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · 24be20e8
unknown authored Nov 26, 2004
```
into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
```
24be20e8
fixed ndb_grant test · 7f9125b2
unknown authored Nov 26, 2004

7f9125b2
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 65a1eb18
unknown authored Nov 26, 2004
```
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
```
65a1eb18
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · f01820f2
unknown authored Nov 26, 2004
```
into mysql.com:/home/jonas/src/mysql-5.0
```
f01820f2
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 9cb0bd79
unknown authored Nov 26, 2004
```
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0.1
```
9cb0bd79

portability fix(for powermac) · 04d6d45f

unknown authored Nov 26, 2004

Fix for bug#6756: Crash if SHOW INDEX


mysql-test/r/information_schema.result:
  portability fix(for powermac)
mysql-test/t/information_schema.test:
  portability fix(for powermac)

04d6d45f

portability fix (some printf lack of NULL support in strings) · 12163e08
unknown authored Nov 26, 2004

12163e08

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 42af43e3

unknown authored Nov 26, 2004

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


BitKeeper/etc/logging_ok:
  auto-union
innobase/buf/buf0buf.c:
  Auto merged
innobase/buf/buf0lru.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
ndb/src/mgmsrv/main.cpp:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_repl.cc:
  Auto merged

42af43e3

added error code message for 897 · b0d586e5
unknown authored Nov 26, 2004

b0d586e5
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · 8d97c013
unknown authored Nov 26, 2004
```
into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
```
8d97c013

wl2126 - ndb - batching of range scans · a6b14b8d

unknown authored Nov 26, 2004

  between 80% and 360% performance improvement measured


ndb/docs/wl2077.txt:
  Update figures after batching of range scans and pekka's blob fixes
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Don't close scan if other ranges exists

a6b14b8d

fixed redifinition of variable · 88ac0564
unknown authored Nov 26, 2004

88ac0564
Merge mysql.com:/home/mydev/mysql-5.0 · 92e9f24d
unknown authored Nov 26, 2004
```
into mysql.com:/home/mydev/mysql-5.0-wl2050-new
```
92e9f24d

Changed test to remove node name from output. · 2c2333e5

unknown authored Nov 26, 2004

(was from WL#2050 - CREATE USER and DROP USER and RENAME USER)


mysql-test/r/grant2.result:
  Replaced test results after removing node name from output.
  (was from WL#2050 - CREATE USER and DROP USER and RENAME USER)

2c2333e5

Portability fix: we had problems with -1.1E-38, -2.2E-308 values · 31e9caa0

unknown authored Nov 26, 2004

on 64-bit platforms (due to compiler's optimization).
-1.1E-38  replaced with -1.1E-37
-2.2E-308 replaced with -2.2E-307

31e9caa0

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · b18b1be9
unknown authored Nov 26, 2004
```
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
```
b18b1be9

cleaned up code a bit · 33d654d7

unknown authored Nov 26, 2004

    added command CONNECT in management client
    added some verbose printouts
    removed prompt printout on !isatty(0)


ndb/src/mgmapi/mgmapi.cpp:
  improved verbose printouts on connecting to management server
ndb/src/mgmclient/CommandInterpreter.cpp:
  cleaned up code a bit
  added command CONNECT in management client
  added some verbose printouts
ndb/src/mgmclient/main.cpp:
  removed prompt printout on !isatty(0)
ndb/src/mgmclient/ndb_mgmclient.hpp:
  added verbose opotion

33d654d7

merge · a72a5f12
unknown authored Nov 26, 2004

a72a5f12

ndb - bugfix testScanPerf · 8d117174

unknown authored Nov 26, 2004


ndb/test/ndbapi/testScanPerf.cpp:
  1) Fix so that values are read even when using -q
  2) Divide by correct number

8d117174

25 Nov, 2004 9 commits

ha_innodb.cc: · 5557ae74

unknown authored Nov 26, 2004

Add conversion of the InnoDB error DB_LOCK_TABLE_FULL to the corresponding MySQL error

sql/ha_innodb.cc:
Add conversion of the InnoDB error DB_LOCK_TABLE_FULL to the corresponding MySQL error

5557ae74

Many files: · a560f0fa

unknown authored Nov 26, 2004

Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup

innobase/buf/buf0buf.c:
Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup
innobase/buf/buf0lru.c:
Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup
innobase/include/buf0lru.h:
Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup
innobase/include/db0err.h:
Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup
innobase/include/row0sel.h:
Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup
innobase/include/ut0mem.h:
Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup
innobase/mem/mem0pool.c:
Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup
innobase/row/row0mysql.c:
Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup
innobase/row/row0sel.c:
Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup
innobase/srv/srv0start.c:
Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup
innobase/ut/ut0mem.c:
Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup

a560f0fa

Merge mysql.com:/home/mydev/mysql-5.0 · 036a61c2
unknown authored Nov 25, 2004
```
into mysql.com:/home/mydev/mysql-5.0-wl2050-new
```
036a61c2
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · bf39ae6a
unknown authored Nov 25, 2004
```
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
```
bf39ae6a

moved default setting to config.ini to MgmtSrvr · 00534590

unknown authored Nov 25, 2004

only try to connect to other ndb_mgmd if connect_string explicitly given or config_file not given


ndb/src/mgmsrv/main.cpp:
  moved default setting to config.ini to MgmtSrvr

00534590

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · a58afeeb
unknown authored Nov 26, 2004
```
into mysql.com:/home/cps/mysql/trees/mysql-5.0
```
a58afeeb

Merge mysql.com:/home/mydev/mysql-5.0 · fbededc8

unknown authored Nov 25, 2004

into mysql.com:/home/mydev/mysql-5.0-wl2050-new


sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

fbededc8

Fix for the unixware: non-posix sigwait · e67586b3
unknown authored Nov 25, 2004
```
server-tools/instance-manager/manager.cc:
  Use my_sigwait instead of sigwait
```
e67586b3

WL#2050 - CREATE USER and DROP USER and RENAME USER · 75e2c2fd

unknown authored Nov 25, 2004

Added new commands CREATE USER and RENAME USER.
Changed behaviour of DROP USER.
Changed an error messages for the new commands.


Docs/mysqld_error.txt:
  WL#2050 - CREATE USER and DROP USER and RENAME USER
  Modified an error message for more general use.
include/mysqld_error.h:
  WL#2050 - CREATE USER and DROP USER and RENAME USER
  Changed an error code for more general use.
mysql-test/r/grant.result:
  WL#2050 - CREATE USER and DROP USER and RENAME USER
  Changed test results.
mysql-test/r/grant2.result:
  WL#2050 - CREATE USER and DROP USER and RENAME USER
  New test results.
mysql-test/r/ps_1general.result:
  WL#2050 - CREATE USER and DROP USER and RENAME USER
  Changed test results.
mysql-test/t/grant.test:
  WL#2050 - CREATE USER and DROP USER and RENAME USER
  Updated old tests for new behaviour of DROP USER.
  It does now implicitly remove all privileges and
  does not fail when privileges are still in place.
  Fixed a typo, which left an user in the database,
  whereby other tests could be confused.
  Added a DROP USER for another test user.
mysql-test/t/grant2.test:
  WL#2050 - CREATE USER and DROP USER and RENAME USER
  Added new tests for the new features.
sql/share/czech/errmsg.txt:
  WL#2050 - CREATE USER and DROP USER and RENAME USER
  Modified an error message for more general use.
sql/share/danish/errmsg.txt:
  WL#2050 - CREATE USER and DROP USER and RENAME USER
  Modified an error message for more general use.
sql/share/dutch/errmsg.txt:
  WL#2050 - CREATE USER and DROP USER and RENAME USER
  Modified an error message for more general use.
sql/share/english/errmsg.txt:
  WL#2050 - CREATE USER and DROP USER and RENAME USER
  Modified an error message for more general use.
sql/share/estonian/errmsg.txt:
  WL#2050 - CREATE USER and DROP USER and RENAME USER
  Modified an error message for more general use.
sql/share/french/errmsg.txt:
  WL#2050 - CREATE USER and DROP USER and RENAME USER
  Modified an error message for more general use.
sql/share/german/errmsg.txt:
  WL#2050 - CREATE USER and DROP USER and RENAME USER
  Modified an error message for more general use.
sql/share/greek/errmsg.txt:
  WL#2050 - CREATE USER and DROP USER and RENAME USER
  Modified an error message for more general use.
sql/share/hungarian/errmsg.txt:
  WL#2050 - CREATE USER and DROP USER and RENAME USER
  Modified an error message for more general use.
sql/share/italian/errmsg.txt:
  WL#2050 - CREATE USER and DROP USER and RENAME USER
  Modified an error message for more general use.
sql/share/japanese/errmsg.txt:
  WL#2050 - CREATE USER and DROP USER and RENAME USER
  Modified an error message for more general use.
sql/share/korean/errmsg.txt:
  WL#2050 - CREATE USER and DROP USER and RENAME USER
  Modified an error message for more general use.
sql/share/norwegian-ny/errmsg.txt:
  WL#2050 - CREATE USER and DROP USER and RENAME USER
  Modified an error message for more general use.
sql/share/norwegian/errmsg.txt:
  WL#2050 - CREATE USER and DROP USER and RENAME USER
  Modified an error message for more general use.
sql/share/polish/errmsg.txt:
  WL#2050 - CREATE USER and DROP USER and RENAME USER
  Modified an error message for more general use.
sql/share/portuguese/errmsg.txt:
  WL#2050 - CREATE USER and DROP USER and RENAME USER
  Modified an error message for more general use.
sql/share/romanian/errmsg.txt:
  WL#2050 - CREATE USER and DROP USER and RENAME USER
  Modified an error message for more general use.
sql/share/russian/errmsg.txt:
  WL#2050 - CREATE USER and DROP USER and RENAME USER
  Modified an error message for more general use.
sql/share/serbian/errmsg.txt:
  WL#2050 - CREATE USER and DROP USER and RENAME USER
  Modified an error message for more general use.
sql/share/slovak/errmsg.txt:
  WL#2050 - CREATE USER and DROP USER and RENAME USER
  Modified an error message for more general use.
sql/share/spanish/errmsg.txt:
  WL#2050 - CREATE USER and DROP USER and RENAME USER
  Modified an error message for more general use.
sql/share/swedish/errmsg.txt:
  WL#2050 - CREATE USER and DROP USER and RENAME USER
  Modified an error message for more general use.
sql/share/ukrainian/errmsg.txt:
  WL#2050 - CREATE USER and DROP USER and RENAME USER
  Modified an error message for more general use.
sql/sql_acl.cc:
  WL#2050 - CREATE USER and DROP USER and RENAME USER
  Added a destructor for the GRANT_TABLE object to get
  rid of a hash_column in cases where a nonsense row was
  read from the privilege tables. Added code to delete
  such an object when it is not entered into the 
  column_priv_hash due to a nonsense row.
  Added function comments to two unmodified functions.
  Replaced mysql_drop_user() by the implementation of all
  of the functions as specified in the Low Level Design.
sql/sql_acl.h:
  WL#2050 - CREATE USER and DROP USER and RENAME USER
  Added prototypes for new functions.
sql/sql_lex.h:
  WL#2050 - CREATE USER and DROP USER and RENAME USER
  Added new command codes for CREATE USER and
  RENAME USER.
sql/sql_parse.cc:
  WL#2050 - CREATE USER and DROP USER and RENAME USER
  Added case clauses for the new commands CREATE USER
  and RENAME USER.
sql/sql_yacc.yy:
  WL#2050 - CREATE USER and DROP USER and RENAME USER
  Added syntax for the new commands CREATE USER and 
  RENAME USER, reworked DROP USER, introduced a new
  'user_list' and 'rename_list', renamed the old 
  'user_list' to 'grant_list'. The difference is that
  'grant_list' contains 'grant_user' (with optional
  IDENTIFIED BY), while 'user_list' contains 'user'.
  Concentrated privilege initializazions into a new
  section 'clear_privileges'.

75e2c2fd