1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-13 21:42:58 +03:00
Commit Graph

19274 Commits

Author SHA1 Message Date
unknown
6361cd89fc merge with 3.23 to get:
- Better detection of crashed .MYI file
- Ignore writeable config files


mysql-test/mysql-test-run.sh:
  Auto merged
mysys/default.c:
  Auto merged
myisam/mi_open.c:
  merge with 3.23
sql/mysqld.cc:
  merge with 3.23
2003-03-11 21:45:39 +02:00
unknown
564a134ced Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-3.23
into sinisa.nasamreza.org:/mnt/work/mysql
2003-03-11 20:09:49 +02:00
unknown
fd59fb1031 A bug fix for multi-table updates with InnoDB storage engine 2003-03-11 19:40:49 +02:00
unknown
8162aec6b9 fixed bug of unchecked random part of WHERE clause (bug #142)
mysql-test/r/select.result:
  test of random WHERE clause
mysql-test/t/select.test:
  test of random WHERE clause
sql/sql_select.cc:
  fixed bug of unchecked random part of WHERE clause
2003-03-11 18:34:00 +02:00
unknown
11e0756966 - fixed C++-style comments in .c files to make IBM compiler happy
(it barfs on these with a syntax error)


sql/net_serv.cc:
   - fixed C++-style comment (this file is copied as libmysql_r/net.c)
strings/ctype-tis620.c:
   - fixed many C++-style comments
2003-03-11 15:37:31 +01:00
unknown
b65aee401c Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2003-03-11 15:40:09 +02:00
unknown
7b19426648 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-3.23
into sinisa.nasamreza.org:/mnt/work/mysql
2003-03-11 14:42:07 +02:00
unknown
4901295af1 Conflicts relsolving
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
sql/lex.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_repl.h:
  Auto merged
2003-03-11 16:32:17 +04:00
unknown
83814ef429 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-in-4.1


sql/item_cmpfunc.cc:
  Auto merged
2003-03-11 13:26:26 +02:00
unknown
79a6e9dcda fixed cached constsnt determination (bug #142 related)
mysql-test/r/subselect.result:
  test of constant redecing
mysql-test/t/subselect.test:
  test of constant redecing
sql/item_cmpfunc.cc:
  fixed cached constsnt determination
2003-03-11 12:43:30 +02:00
unknown
92457d6e45 Added 'PURGE LOGS BEFORE' command
Added expire-logs-days option 


mysql-test/r/rpl_rotate_logs.result:
  Added test for 'PURGE LOGS BEFORE'
mysql-test/t/rpl_rotate_logs.test:
  Added test for 'PURGE LOGS BEFORE'
sql/log.cc:
  For 'Purge logs before' command
sql/mysqld.cc:
  Added 'expire-logs-days' option
sql/set_var.cc:
  Added 'expire-logs-days' option
sql/sql_class.h:
  For 'Purge logs before' command
sql/sql_parse.cc:
  Added 'expire-logs-days' option
sql/sql_yacc.yy:
  For 'Purge logs before' command
2003-03-11 13:49:06 +04:00
unknown
0c1af74d8a processing of subselect in global ORDER BY (fifed crash of server)
this implementation have limitation: prohibited subselect in ORDER BY dependence of most outer query (will be solved after removing passing first select_lex as fake select for global mysql_select())


mysql-test/r/subselect.result:
  test of subselect in global ORDER BY
mysql-test/t/subselect.test:
  test of subselect in global ORDER BY
sql/sql_lex.cc:
  fixed comments
  processing of subselect in global ORDER BY
sql/sql_lex.h:
  processing of subselect in global ORDER BY
sql/sql_parse.cc:
  processing of subselect in global ORDER BY
sql/sql_yacc.yy:
  processing of subselect in global ORDER BY
2003-03-11 01:06:28 +02:00
unknown
e704dc5ee1 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-4.1


sql/mysqld.cc:
  Auto merged
2003-03-11 00:39:55 +02:00
unknown
80f6466c85 Portability fixes
cmd-line-utils/libedit/el.c:
  Portability fix
configure.in:
  Portability fix
  (Don't call AC_PROG_CC twice)
sql/mysqld.cc:
  Move stack checking to right position
2003-03-11 00:30:35 +02:00
unknown
fc5832de08 fixed cleanup bug
mysql-test/r/subselect.result:
  test of cleanup bug
mysql-test/t/subselect.test:
  test of cleanup bug
sql/sql_select.cc:
  fixed cleanup
2003-03-10 22:25:52 +02:00
unknown
bbc8f836c0 Fix for a bug with ROW(..) <=> ROW(...) 2003-03-10 20:54:18 +02:00
unknown
39dbf6cb9b A fix for an obvious bug in hash generating proram. 2003-03-10 17:14:01 +02:00
unknown
530659e8a0 A fix for privilege checking bug.
sql/sql_parse.cc:
  Fix for a privilege bug in multi-table updates.
  Seems like better fix then chec_table_access.
2003-03-10 16:58:07 +02:00
unknown
395714aa45 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-in-4.1


sql/item.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
2003-03-10 16:38:26 +02:00
unknown
c2ce5116f3 fixed crash on non-well-constructed reference
mysql-test/r/subselect.result:
  test of IN with error
mysql-test/t/subselect.test:
  test of IN with error
2003-03-10 16:38:06 +02:00
unknown
9bfbea6882 - typo fix for newly added error message 2003-03-10 13:41:37 +01:00
unknown
a6ea34ee5b merge
BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-delete.result:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/r/delete.result:
  Auto merged
mysql-test/r/type_datetime.result:
  Auto merged
mysql-test/t/delete.test:
  Auto merged
mysql-test/t/type_datetime.test:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_repl.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
2003-03-10 14:13:46 +02:00
unknown
5c100a6975 after merge fixes 2003-03-10 13:54:20 +02:00
unknown
012ffb5d50 Merge with 3.23 to get fixes for --user and BACKUP TABLE
BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-delete.result:
  Delete: mysql-test/r/delete.result
BitKeeper/deleted/.del-stamp-h.in~4a5d6676232516c5:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
include/my_sys.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/t/delete.test:
  Auto merged
mysql-test/t/join.test:
  Auto merged
mysql-test/t/type_datetime.test:
  Auto merged
mysys/my_copy.c:
  Auto merged
sql/field.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/sql_rename.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/mysql-test-run.sh:
  merge with 3.23.56
mysql-test/r/backup.result:
  merge (needs to be updated)
mysql-test/r/join.result:
  merge (needs to be updated)
mysql-test/r/type_datetime.result:
  merge (needs to be updated)
mysql-test/t/backup.test:
  merge with 3.23
scripts/mysqld_safe.sh:
  Only use first --user option
sql/ha_myisam.cc:
  Don't let BACKUP TABLE overwrite old files
sql/log_event.h:
  merge
sql/mysql_priv.h:
  merge
sql/mysqld.cc:
  Use first --user option
sql/slave.cc:
  use local version
sql/sql_repl.h:
  use local version
2003-03-10 12:48:43 +02:00
unknown
73c2d4ad49 Don't allow multiple --user options to mysqld
(First one is used)


scripts/safe_mysqld.sh:
  Don't allow multiple --user options
sql/mysqld.cc:
  Don't allow multiple --user options
2003-03-10 12:24:22 +02:00
unknown
66e8db8241 Fix that round(0.1,1) == round(0.1,1)
sql/slave.cc:
  Fixed problem with --debug output in handle_slave
2003-03-10 12:00:19 +02:00
unknown
ea826f215f Merge bk-internal.mysql.com:/home/bk/mysql-3.23
into narttu.mysql.fi:/my/mysql-3.23
2003-03-10 11:23:11 +02:00
unknown
68ae365395 Don't allow BACKUP TABLE to overwrite files
Fixed memory leak when replication restarts in debug mode


include/my_sys.h:
  Added option to not overwrite files to my_copy()
mysql-test/mysql-test-run.sh:
  Fixed --ddd option
  Fixed that mysqld is restarted if there is a testname-master.sh file
mysql-test/r/backup.result:
  Update for security fix in BACKUP TABLE
mysql-test/t/backup.test:
  Update for security fix in BACKUP TABLE
mysys/my_copy.c:
  Added option to not overwrite files to my_copy()
sql/ha_myisam.cc:
  Don't allow BACKUP TABLE to overwrite files
sql/slave.cc:
  Fixed problem with --debug output from 'handle_slave'
  Fixed memory leak when replication restarts in debug mode
2003-03-10 11:22:37 +02:00
unknown
64cf72900c Made it possible to use --max-delayed-threads=0 in order to disable
INSERT DELAYED.
2003-03-09 19:03:55 +02:00
unknown
249788280a Fix for a crashing bug 2003-03-08 22:19:41 +02:00
unknown
44c9a3893d Clearer error message when one forgot to grant REPLICATION SLAVE :
now we'll have something like this :
030308 18:46:58  Slave I/O thread: connected to master 'gb@localhost:3306',  replication started in log 'FIRST' at position 4
030308 18:46:58  While trying to obtain the list of slaves from the master 'localhost:3306', user 'gb' got the following error: 'Access denied. You need the REPLICATION SLAVE privilege for this operation'
030308 18:46:58  Slave I/O thread exiting, read up to log 'FIRST', position 4
instead of "Error updating slave list: Query error".
This fixes bug #80.


sql/repl_failsafe.cc:
  Clearer error message when one forgot to grant REPLICATION SLAVE
sql/repl_failsafe.h:
  Clearer error message when one forgot to grant REPLICATION SLAVE
sql/slave.cc:
  Updated for new syntax of update_slave_list
2003-03-08 18:53:32 +01:00
unknown
0c911187d4 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/mysql_priv.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-03-07 21:48:22 +02:00
unknown
c3122e9a6c An interim code cleanup.
Major re-write of code yet has to be done, to circumvent
assigning of UNIT to current select and to deal better with 
offset, limit.


mysql-test/r/union.result:
  A fix of merge fix
2003-03-07 21:47:04 +02:00
unknown
20bb527b80 error messages translated by Egor 2003-03-07 15:22:05 +01:00
unknown
157b36675e Fixed an unlikely optimizer bug that casued a core dump in pt_range.cc::sel_cmp()
mysql-test/r/join.result:
  Test of range optimizer bug
mysql-test/t/join.test:
  Test of range optimizer bug
sql/sql_rename.cc:
  Added missing DEBUG_PRINT()
2003-03-07 14:40:37 +02:00
unknown
6b941726f9 Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0


sql/mysqld.cc:
  Auto merged
2003-03-07 11:58:07 +01:00
unknown
5776261a3e missing grant check added 2003-03-07 11:55:07 +01:00
unknown
19a5b45477 Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0
BitKeeper/etc/ignore:
  auto-union
configure.in:
  Auto merged
2003-03-07 12:37:18 +02:00
unknown
efadca6441 Fixed AUTO_INCREMENT handling in MyISAM (last auto_increment patch broke things)
Some after merge fixes


mysql-test/r/ctype_latin1_de.result:
  Changed test to have more relevant results
mysql-test/r/delete.result:
  Updated results after merge
mysql-test/r/select.result:
  Remove explicit database usage
mysql-test/r/type_datetime.result:
  Updated results after merge
mysql-test/t/ctype_latin1_de.test:
  Changed test to have more relevant results
mysql-test/t/select.test:
  Remove explicit database usage
sql/ha_myisam.cc:
  Fixed AUTO_INCREMENT handling in MyISAM (last auto_increment patch broke things)
2003-03-07 12:36:52 +02:00
unknown
9f6256563c item_func.cc, item_cmpfunc.cc, unireg.cc, table.cc, sql_base.cc:
some default_charset_info were removed


sql/sql_base.cc:
  some default_charset_info were removed
sql/table.cc:
  some default_charset_info were removed
sql/unireg.cc:
  some default_charset_info were removed
sql/item_cmpfunc.cc:
  some default_charset_info were removed
sql/item_func.cc:
  some default_charset_info were removed
2003-03-07 13:39:53 +04:00
unknown
fb4ee80cfd sql_load.cc:
LOAD DATA INFILE now uses database character set instead of server character set. This is not excellent but at least allows to load for example cyrillic data into cyrillic database if server charset is latin1. In the future we should add a syntax to specify file charset or evern charset of each field.


sql/sql_load.cc:
  LOAD DATA INFILE now uses database character set instead of server character set. This is not excellent but at least allows to load for example cyrillic data into cyrillic database if server charset is latin1. In the future we should add a syntax to specify file charset or evern charset of each field.
2003-03-07 12:55:55 +04:00
unknown
11da9dede6 sql_acl.cc, item.h:
use of new argument
sql_analyse.h:
  macros from mysql_priv.h. Should be deleted soon.
mysql_priv.h:
  _default_charset_info has been removed
item_cmpfunc.h:
  Use cmp_charset
hostname.cc, hash_filo.h:
  Move charset to constructor argument


sql/hash_filo.h:
  Move charset to constructor argument
sql/hostname.cc:
  Move charset to constructor argument
sql/item_cmpfunc.h:
  Use cmp_charset
sql/mysql_priv.h:
  _default_charset_info has been removed
sql/sql_analyse.h:
  macros from mysql_priv.h. Should be deleted soon.
sql/item.h:
  use of new argument
sql/sql_acl.cc:
  use of new argument
2003-03-07 12:21:32 +04:00
unknown
8d9d12d182 New syntax to change client collation:
SET COLLATION latin1
SET COLLATION 'latin1'
SET COLLATION DEFAULT
2003-03-07 11:54:26 +04:00
unknown
08b3e0702a Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-lookup-4.1


sql/sql_yacc.yy:
  Auto merged
2003-03-07 09:05:17 +02:00
unknown
81f368cc54 Merge to get fix for LOCK TABLES + DROP TABLE in another thread
BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-delete.result:
  Delete: mysql-test/r/delete.result
client/mysqlbinlog.cc:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/t/delete.test:
  Auto merged
mysql-test/t/type_datetime.test:
  Auto merged
sql/field.h:
  Auto merged
sql/lock.cc:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/r/type_datetime.result:
  Update results after merge
sql/log_event.h:
  Use local version
sql/mysql_priv.h:
  Use local version
sql/mysqld.cc:
  Use local version
sql/sql_repl.h:
  Use local version
2003-03-07 01:20:56 +02:00
unknown
64a7e9fd1b Merge kishkin.ru:/home/wax/mysql-4n into kishkin.ru:/home/wax/mysql-4nh
sql/mysqld.cc:
  Auto merged
2003-03-07 03:44:15 +05:00
unknown
2395cd9805 remove spaces according to coding rules 2003-03-06 22:53:58 +01:00
unknown
65b62bd474 Fix so that INSERT DELAYED cares about SQL_LOG_BIN=0 (bug #104) 2003-03-06 22:46:24 +01:00
unknown
6b3c898655 Fixed reentrantness bugs in select (lex->result) and select_dumpvar, and added cool
prime number test example.


mysql-test/r/sp.result:
  New prime number example. (Good for future benchmarkings too.)
mysql-test/t/sp.test:
  New prime number example. (Good for future benchmarkings too.)
sql/sql_class.cc:
  Reset row_count in select_dumpvar when preparing, to make it reentrant as a lex member.
sql/sql_select.cc:
  Don't delete result if it's a lex member (since lex needs to be reentrant).
2003-03-06 19:16:46 +01:00
unknown
c4f89626ee do not allow to cache queries with INTO clause
mysql-test/r/query_cache.result:
  INTO OUTFILE/DUMPFILE test
mysql-test/t/query_cache.test:
  INTO OUTFILE/DUMPFILE test
2003-03-06 17:37:12 +02:00