1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-12 10:22:39 +03:00
Commit Graph

19274 Commits

Author SHA1 Message Date
unknown
47fb31aa46 Fix minor bug and add test of connection with new/old/without passwords
libmysql/libmysql.c:
  Small fix (resulted in connection without database even if one is specified)
sql/mini_client.cc:
  The same fix for replication copy
2002-12-05 14:01:15 +03:00
unknown
5fdd9f878f Merge with 3.23
BitKeeper/etc/ignore:
  auto-union
configure.in:
  Auto merged
BitKeeper/deleted/.del-global.h~e80d28157acfdcb5:
  Auto merged
libmysql/password.c:
  Auto merged
mysys/hash.c:
  Auto merged
mysys/my_static.c:
  Auto merged
mysys/my_static.h:
  Auto merged
mysys/my_tempnam.c:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
support-files/mysql.server.sh:
  Auto merged
mysql-test/t/temp_table.test:
  Added comment
sql/mysqld.cc:
  Don't apply change from 3.23
sql/sql_show.cc:
  Don't apply change from 3.23
sql/structs.h:
  Don't apply change from 3.23
2002-12-05 03:52:53 +02:00
unknown
591b058518 Removed copying of parameters as this leads to memory leaks in embedded server.
Fixed 'not initialized' memory error.


mysql-test/mysql-test-run.sh:
  Updates to be able to more easily use --valgrind
mysql-test/r/alter_table.result:
  Added missing drop table
mysql-test/t/alter_table.test:
  Added missing drop table
sql/field.cc:
  Simple optimizations
sql/ha_innodb.cc:
  Remove copying of parameters as this leads to memory leaks in MySQL.
  Should be instead fixed by, in embedded server, make a temporary copy of
  all parameters and free them on server-end
sql/log.cc:
  Simple optimization
sql/mysql_priv.h:
  Move external reference to struct to include file
sql/mysqld.cc:
  Added safety asserts
sql/sql_class.cc:
  Fixed non fatal 'not initialized memory reference error' in thread init
sql/sql_udf.cc:
  Clear current_thd for global thread
strings/strto.c:
  Simple optimization
2002-12-05 03:40:33 +02:00
unknown
339cf7ce7b Basically minor code optimizations and cleanups
client/mysqladmin.c:
  fix folding
libmysql/libmysql.c:
  Minor optimizations
sql/mini_client.cc:
  Minor optimizations
sql/password.c:
  Optimiations
sql/sql_acl.cc:
  Get rid of stage parameter and flag old passwords with '*' instead of zero
sql/sql_acl.h:
  fix prototype
sql/sql_parse.cc:
  Minor optimizations
2002-12-05 03:55:29 +03:00
unknown
5c377fc092 SCRAM Remove spaces from most changed files.
This alters not only my code so it looks like I'm not only one adding the spaces.



client/mysqladmin.c:
  cut spaces
include/mysql_com.h:
  cut soaces
sql/item_strfunc.cc:
  cut spaces
sql/mini_client.cc:
  cut spaces
sql/mysql_priv.h:
  cut spaces
sql/mysqld.cc:
  cut spaces
sql/password.c:
  cut spaces
sql/sql_parse.cc:
  cut spaces
sql/sql_yacc.yy:
  cut spaces
2002-12-05 01:14:51 +03:00
unknown
ada3e32545 some code cleanup
sql/sql_table.cc:
  code cleanup
2002-12-04 21:39:15 +02:00
unknown
c151ea1f12 Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/work/mysql
2002-12-04 20:52:42 +02:00
unknown
76c982ea92 A fix for double free'd pointer bug ...
BitKeeper/etc/ignore:
  Added innobase/stamp-h1 stamp-h1 to the ignore list
2002-12-04 20:51:18 +02:00
unknown
e955255cf6 - Portability fixes for HP compiler on HPUX11 (backport from 4.0 tree)
- sql_analyse.cc: Fixed bug in decimal handling


configure.in:
   - Portability fix for HP compiler on HPUX11
libmysql/password.c:
   - Portability fix for HP compiler on HPUX11
mysys/hash.c:
   - Portability fix for HP compiler on HPUX11
mysys/my_static.c:
   - Portability fix for HP compiler on HPUX11
mysys/my_static.h:
   - Portability fix for HP compiler on HPUX11
mysys/my_tempnam.c:
   - Portability fix for HP compiler on HPUX11
sql/sql_analyse.cc:
   - Fixed bug in decimal handling
2002-12-04 16:16:06 +01:00
unknown
91e1b1b11d Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/work/mysql
2002-12-04 16:13:32 +02:00
unknown
c76bce104a Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2002-12-04 15:28:16 +02:00
unknown
93bed6061b A fix for the bug in a SELECT with joined tables with ORDER BY and
LIMIT clause when filesort had to be used.

In that case LIMIT was applied to filesort of one of the tables, 
although it could not be.

This fix solved problems with LEFT JOIN too...
2002-12-04 15:27:08 +02:00
unknown
577cb3238b Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1


sql/mysql_priv.h:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2002-12-04 16:26:29 +03:00
unknown
07f797a9bf Return a warning for DROP DATABASE/TABLE IF EXISTS <non_existing_db/table(s)> 2002-12-04 03:19:08 -08:00
unknown
5a0f1c749e merged
libmysql/libmysql.c:
  Auto merged
sql/opt_sum.cc:
  Auto merged
support-files/mysql.server.sh:
  Auto merged
2002-12-04 10:16:19 +01:00
unknown
265bf23895 changing in Item_row according last review (SCRUM)
sql/item.h:
  changing in Item_row according last review
sql/item_cmpfunc.cc:
  changing in Item_row according last review
sql/item_cmpfunc.h:
  changing in Item_row according last review
sql/item_func.h:
  changing in Item_row according last review
sql/item_row.h:
  changing in Item_row according last review
2002-12-04 11:01:48 +02:00
unknown
faefac308f proper casting in COM_TABLE_DUMP (backported from 4.0) 2002-12-04 09:54:58 +01:00
unknown
2e28e76fff fixed error message 2002-12-04 01:32:45 +02:00
unknown
e753fa4d8d Security bug: password length check should be in check_user, not check_connections(),
otherwise COM_CHANGE_USER is unprotected and can be used for both privilege escalation and buffer overrun
2002-12-04 00:27:09 +01:00
unknown
bea20ec34a Merge work:/home/bk/mysql-4.1 into hundin.mysql.fi:/my/mysql-4.1
sql/sql_yacc.yy:
  Auto merged
2002-12-03 13:11:18 +02:00
unknown
80b143c111 Change of internal key_field=NULL handling to avoid error messages.
Optimized SELECT DISTINCT ... ORDER BY ... LIMIT
Fixed reference to uninitalized variable


mysql-test/r/distinct.result:
  Updated results for new tests
mysql-test/r/func_math.result:
  Fixed test of RND()
mysql-test/r/innodb.result:
  Updated results for new tests
mysql-test/r/null.result:
  Updated results for new tests
mysql-test/t/distinct.test:
  New distinct test
mysql-test/t/func_math.test:
  Fixed test of RND()
mysql-test/t/innodb.test:
  Test for bugs
mysql-test/t/null.test:
  TEst for bugs
sql/field.h:
  Change of NULL handling to avoid error messages
sql/field_conv.cc:
  Change of NULL handling to avoid error messages
sql/item.cc:
  Change of NULL handling to avoid error messages
sql/item.h:
  Change of NULL handling to avoid error messages
sql/item_cmpfunc.cc:
  Change of NULL handling to avoid error messages
sql/item_func.cc:
  Change of NULL handling to avoid error messages
sql/item_func.h:
  Cleaned up RND() handling
sql/item_timefunc.cc:
  Change of NULL handling to avoid error messages
sql/item_timefunc.h:
  Change of NULL handling to avoid error messages
sql/opt_range.cc:
  Fixed bug in <=> NULL
sql/password.c:
  Indentation cleanup
sql/sql_base.cc:
  Change of NULL handling to avoid error messages
sql/sql_class.cc:
  Fixed reference to uninitalized variable
sql/sql_handler.cc:
  Change of NULL handling to avoid error messages
sql/sql_select.cc:
  Change of NULL handling to avoid error messages
  Optimized SELECT DISTINCT ... ORDER BY ... LIMIT
sql/sql_select.h:
  Change of NULL handling to avoid error messages
sql/unireg.cc:
  Change of NULL handling to avoid error messages
2002-12-03 13:08:25 +02:00
unknown
930b3fa897 it's INSERT ... ON DUPLICATE KEY UPDATE , not INSERT ON DUPLICATE KEY UPDATE SET 2002-12-02 22:04:26 +01:00
unknown
694c7334b3 merged
sql/mysql_priv.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2002-12-02 20:41:34 +01:00
unknown
0029b4e794 INSERT ... ON DUPLICATE KEY UPDATE ... 2002-12-02 20:38:00 +01:00
unknown
a0efe927ec Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/work/mysql
2002-12-02 21:22:56 +02:00
unknown
47af809c61 Proper handling of ORDER BY table.column in UNION's 2002-12-02 20:18:51 +02:00
unknown
36429430c6 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2002-12-02 18:47:52 +02:00
unknown
67c9ab3888 Merge work:/home/bk/mysql-4.1 into hundin.mysql.fi:/my/mysql-4.1
sql/sql_yacc.yy:
  Auto merged
sql/sql_lex.cc:
  Auto merged
2002-12-02 17:58:48 +02:00
unknown
68b4940a6b Merge work:/home/bk/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1 2002-12-02 17:58:47 +02:00
unknown
59dec1bcd2 Fixed bug when creating keys in temporary HEAP tables.
(This caused the DISTINCT test to fail)
Removed one inline as this caused compiler problems


heap/hp_create.c:
  Comment
heap/hp_update.c:
  Indentation cleanup
heap/hp_write.c:
  Indentation cleanup
mysql-test/mysql-test-run.sh:
  Better options for valgrind
sql/item_sum.cc:
  Removed inline as this caused compiler problems with gcc 3.2
  (Was also non standard usage of inline)
sql/item_sum.h:
  Removed inline as this caused compiler problems with gcc 3.2
sql/sql_class.cc:
  Fixed reference to uninitialized value
sql/sql_lex.cc:
  Indentation cleanup
sql/sql_select.cc:
  Fixed bug when creating keys in temporary HEAP tables.
2002-12-02 17:52:22 +02:00
unknown
007b739f3f Proper fix for SHOW VARS on 64-bit systems 2002-12-02 15:33:16 +02:00
unknown
0df9ecc32b moving fix elsewhere ...
sql/sql_show.cc:
  moving a fix to 4.1.
2002-12-02 15:12:56 +02:00
unknown
b79b6c357d Merge work:/my/mysql-3.23 into hundin.mysql.fi:/my/mysql-3.23
mysql-test/r/group_by.result:
  Auto merged
mysql-test/t/group_by.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
2002-12-02 14:17:04 +02:00
unknown
e462abe648 Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/work/mysql
2002-12-02 14:17:03 +02:00
unknown
3e5d156223 Fix for sum_func IN (..) 2002-12-02 14:16:02 +02:00
unknown
e3cecfd10c Fixed bug in MAX() optimization when used with JOIN and ON expressions
(Patch from 4.0.5)


mysql-test/r/group_by.result:
  Updated results
mysql-test/t/group_by.test:
  Test for bug
sql/item_cmpfunc.cc:
  Fixed bug in MAX() optimization when used with JOIN and ON expressions
sql/item_cmpfunc.h:
  Fixed bug in MAX() optimization when used with JOIN and ON expressions
sql/opt_sum.cc:
  Fixed bug in MAX() optimization when used with JOIN and ON expressions
2002-12-02 13:41:08 +02:00
unknown
a3f9f721bc Fixed bug in <=> NULL handling 2002-12-02 10:47:15 +02:00
unknown
86331f40ec Got rid of the (previously) intentional SELECT/UNION reduce/reduce conflict.
There should be no more reduce/reduce conflicts in sql_yacc.yy from now on!


sql/sql_yacc.yy:
  Got rid of the (previously) intentional SELECT/UNION reduce/reduce conflict
  (in the optional_order_or_limit clause).
2002-12-01 17:10:13 +01:00
unknown
f621d551dd Merge work.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/pem/work/mysql-4.1


sql/sql_yacc.yy:
  Auto merged
2002-12-01 16:03:42 +01:00
unknown
0da49160c6 Merge work:/home/bk/mysql-4.1 into hundin.mysql.fi:/my/mysql-4.1
sql/sql_lex.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2002-12-01 15:05:35 +02:00
unknown
9b045452c9 Fixed that one can use in identifiers: CREATE TABLE fo`a ...
Added BOOLEAN as synonym for tinyint


sql/sql_lex.cc:
  Fixed that one can use ` in identifiers:  CREATE TABLE `fo``a` ...
sql/sql_yacc.yy:
  Added BOOLEAN as synonym for tinyint
2002-12-01 14:59:06 +02:00
unknown
526ff493bc Megrge new changes in...
sql/mysql_priv.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/sql_parse.cc:
  Manual Merge
2002-12-01 11:18:19 +03:00
unknown
4f221e351d Merge work:/my/mysql-4.0 into hundin.mysql.fi:/my/mysql-4.0
sql/mysqld.cc:
  Auto merged
2002-12-01 00:48:36 +02:00
unknown
b22dc24cbb Fixed some bugs from last multi-table-update push.
More tests for multi-table-update & timestamp handling


mysql-test/r/innodb.result:
  New multi-table-update tests
mysql-test/r/multi_update.result:
  New multi-table-update tests
mysql-test/r/type_timestamp.result:
  New timestamp tests
mysql-test/t/innodb.test:
  New multi-table-update tests
mysql-test/t/multi_update.test:
  New multi-table-update tests
mysql-test/t/type_timestamp.test:
  New timestamp tests
sql/sql_select.cc:
  Fixed bug in safe mode checking
sql/sql_update.cc:
  Fixed bug in autocommit in multi-table-update
2002-12-01 00:48:35 +02:00
unknown
9fcbfc0d12 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-crash-4.1


mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2002-12-01 00:17:33 +02:00
unknown
1941d9b597 fix of error handling
mysql-test/r/subselect.result:
  test of error handling with subselect
mysql-test/t/subselect.test:
  test of error handling with subselect
2002-12-01 00:11:22 +02:00
unknown
d5be7db312 Fixed --datadir for embedded server 2002-12-01 00:02:58 +02:00
unknown
61daab7900 A better fix 2002-11-30 23:13:00 +02:00
unknown
255ace8bfd Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/work/mysql
2002-11-30 22:55:43 +02:00
unknown
bbbae0dbf7 A bug fix for ORDER BY on table.column in provisional entire UNION
ORDER clause, where table is one of union'ed tables.
2002-11-30 22:53:50 +02:00