1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Commit Graph

6099 Commits

Author SHA1 Message Date
unknown
7560ffcfaf Merge work:/home/bk/mysql-4.0
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0


sql/mysqld.cc:
  Auto merged
2002-12-20 19:13:15 +01:00
unknown
0c9a1ba592 Merge work:/home/bk/mysql
into sergbook.mysql.com:/usr/home/serg/Abk/mysql
2002-12-20 19:11:33 +01:00
unknown
09781c3bc2 merged 2002-12-20 18:50:34 +01:00
unknown
313b296b2e removed chroot() bugfix, now --chroot in 3.23 is broken again :(( 2002-12-20 18:39:53 +01:00
unknown
ede01c2b20 Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0
configure.in:
  Auto merged
2002-12-20 14:59:35 +02:00
unknown
791e9fb37e Changed thd variables max_join_size and select_limit to type ha_rows.
This fixed some optimization problems when using -DBIG_TABLES
Portabilty fixes for OpenUnix and HPUX
Added C and C++ version numbers to mysqlbug


Docs/mysqld_error.txt:
  Added new error message
acinclude.m4:
  Fix for configure problem on OpenUnix
configure.in:
  Fix for OpenUnix
  Added C and C++ versions to mysqlbug
mysql-test/r/variables.result:
  Update of max_join_size handling
mysql-test/t/variables.test:
  Update of max_join_size handling
mysys/Makefile.am:
  Removed duplicate row
mysys/my_alloc.c:
  Safety fixes (not fatal)
scripts/Makefile.am:
  Added C and C++ compiler versions to mysqlbug
scripts/mysqlbug.sh:
  Added C and C++ compiler versions to mysqlbug
sql/item_func.cc:
  Fixed that user variables that changes are not threated as constants.
sql/item_func.h:
  Fixed that user variables that changes are not threated as constants.
sql/mysqld.cc:
  Changed thd variables max_join_size and select_limit to type ha_rows
sql/repl_failsafe.cc:
  Removed not needed cast
sql/set_var.cc:
  Changed thd variables max_join_size and select_limit to type ha_rows
sql/set_var.h:
  Changed thd variables max_join_size and select_limit to type ha_rows
sql/slave.cc:
  Removed not needed cast
sql/sql_class.h:
  Changed thd variables max_join_size and select_limit to type ha_rows
sql/sql_parse.cc:
  Removed not needed cast
  Fixed security problem with mysql_drop_db()
sql/sql_show.cc:
  Changed thd variables max_join_size and select_limit to type ha_rows
sql/structs.h:
  Changed thd variables max_join_size and select_limit to type ha_rows
2002-12-20 14:58:27 +02:00
unknown
63c9b06a62 - tagged ChangeSet 1.1477 as MySQL 4.0.6
- bumped up version number in configure.in to 4.0.7-gamma


configure.in:
   - bumped up version number in configure.in to 4.0.7-gamma
2002-12-20 12:56:00 +01:00
unknown
05ef8a612a ha_innobase.cc:
Better error message to help users who created tables with < 3.23.54 where MySQL implicitly added a PRIMARY KEY definition


sql/ha_innobase.cc:
  Better error message to help users who created tables with < 3.23.54 where MySQL implicitly added a PRIMARY KEY definition
2002-12-19 20:58:07 +02:00
unknown
3522a78600 server-cfg.sh:
Corrected some typo.


sql-bench/server-cfg.sh:
  Corrected some typo.
2002-12-19 14:08:25 +05:00
unknown
0a506d2e23 Merge akishkin@work.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/walrus/bk/40
2002-12-19 00:42:34 +05:00
unknown
4debc21500 crash-me.sh:
Wrap long lines,
  New test - date_format_inresult (returns which date
  format dbms uses in the result set)
  New tests:
    -date_format_ISO 
    -date_format_ISO_with_date (checks if DBMS supports 
          YYYY-MM-DD or DATE 'YYYY-MM-DD' formats)
    -date_format_EUR
    -date_format_EUR_with_date (the same but 'DD.MM.YYYY' 
          format)
    -date_format_USA
    -date_format_USA_with_date ( the same but 'MM/DD/YYYY' format)
    -date_format_YYYYMMDD
    -date_format_YYYYMMDD_with_date 


sql-bench/crash-me.sh:
  Wrap long lines,
  New test - date_format_inresult (returns which date
  format dbms uses in the result set)
  New tests:
    -date_format_ISO 
    -date_format_ISO_with_date (checks if DBMS supports 
          YYYY-MM-DD or DATE 'YYYY-MM-DD' formats)
    -date_format_EUR
    -date_format_EUR_with_date (the same but 'DD.MM.YYYY' 
          format)
    -date_format_USA
    -date_format_USA_with_date ( the same but 'MM/DD/YYYY' format)
    -date_format_YYYYMMDD
    -date_format_YYYYMMDD_with_date
2002-12-19 00:38:38 +05:00
unknown
53239a714a Fix for found rows in multi-table updates 2002-12-18 19:00:00 +02:00
unknown
7a896f3695 Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/work/mysql
2002-12-16 22:17:34 +02:00
unknown
e003d42e4a fix for a bug in CASE ...WHEN ...
sql/sql_db.cc:
  fix for lower case ...
2002-12-16 22:16:57 +02:00
unknown
172d5acb6d Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2002-12-16 20:50:10 +02:00
unknown
a14ab39b76 Merge akishkin@work.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/walrus/bk/40
2002-12-16 23:26:21 +05:00
unknown
f1c832d397 Add log lines to crash-me result file
sql-bench/crash-me.sh:
  add tagline for emacs 
  add log lines to result file
  remove wrong prompt for WEEK()
sql-bench/server-cfg.sh:
  cleanup field conversation
2002-12-16 22:55:29 +05:00
unknown
bf2e1efd02 Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2002-12-16 17:29:58 +02:00
unknown
c82d6fddb9 Use delayed create index for LOAD DATA INFILE, INSERT ... SELECT and CREATE ... SELECT
(Accidently disabled by a recent push)
2002-12-16 17:28:53 +02:00
unknown
db4a9c8018 perror.c:
Add to perror the code 150 about wrong foreign key def


extra/perror.c:
  Add to perror the code 150 about wrong foreign key def
2002-12-14 22:38:33 +02:00
unknown
0bc6909f02 Fix for a bug with mysql_select_db() on manually created
database and lower case table names.
2002-12-14 15:32:36 +02:00
unknown
68b583d88b Merge mashka.mysql.fi:/home/my/mysql-3.23
into mashka.mysql.fi:/home/my/mysql-4.0


mysys/my_rename.c:
  Auto merged
2002-12-14 13:02:30 +02:00
unknown
0c8582b3c3 On windows, delete any conflicting 'to' files on rename(from,to)
This fixes a bug with REPAIR TABLE t1 USE_FRM on windows.


mysys/my_rename.c:
  On windows, delete any conflicting 'to' files on rename(from,to)
2002-12-14 12:57:12 +02:00
unknown
f66adf2b89 Merge with 3.23 to get patch for lower_case_table_names for MacOSX
configure.in:
  merge with 3.23
sql/log.cc:
  Use local file
sql/mysqld.cc:
  Get patch for lower_case_table_names for MacOSX
2002-12-14 12:49:55 +02:00
unknown
b512c8b83a Transactions in AUTOCOMMIT=0 mode didn't rotate binary log
Don't enable any bulk insert or record caching code if inserting less than MIN_ROWS_TO_USE_BULK_INSERT rows (100)


myisam/mi_check.c:
  Fixed bug in copying statistics for disabled index
mysql-test/r/distinct.result:
  Fix result after not doing key statistics for first insert.
mysql-test/r/fulltext.result:
  Fix result after not doing key statistics for first insert.
mysql-test/r/insert.result:
  Fix result after not doing key statistics for first insert.
mysql-test/r/key_diff.result:
  Fix result after not doing key statistics for first insert.
mysql-test/r/order_by.result:
  Fix result after not doing key statistics for first insert.
mysql-test/r/select.result:
  Fix result after not doing key statistics for first insert.
mysql-test/r/show_check.result:
  Fix result after not doing key statistics for first insert.
sql/ha_myisam.cc:
  Don't disable index when inserting only a few rows
sql/log.cc:
  Transactions in AUTOCOMMIT=0 mode didn't rotate binary log.
sql/sql_insert.cc:
  Don't enable any bulk insert or record caching code if inserting less than MIN_ROWS_TO_USE_BULK_INSERT
2002-12-14 12:45:31 +02:00
unknown
697f939e2c Make --lower-case-table-names default on MacOSX 2002-12-14 12:25:33 +02:00
unknown
05e6b27a13 Transactions in AUTOCOMMIT=0 mode didn't rotate binary log. 2002-12-14 12:05:45 +02:00
unknown
fd977631f5 Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2002-12-13 17:54:14 +02:00
unknown
50d569a3ec Fixed syntax error in sql_yacc.yy (with bison 1.75).
sql/sql_yacc.yy:
  Fixed syntax error (with bison 1.75).
2002-12-13 16:38:52 +01:00
unknown
606d695345 Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2002-12-13 16:42:32 +02:00
unknown
094c801d9b - HP/UX 11 compile fix: fixed "records_in_range" class definition
in sql/ha_myisammrg.h (removed "ha_myisammrg::")
2002-12-13 15:42:31 +01:00
unknown
8277893cff Merge patch for LOCK TABLES and SLAVE STOP
configure.in:
  merge with 4.0
scripts/mysqld_safe.sh:
  Don't apply patch from 3.23
2002-12-13 16:36:08 +02:00
unknown
d2bae46534 Fixed possible replication problem in LOAD DATA INFILE with innodb tables. 2002-12-13 16:28:15 +02:00
unknown
446f23568a Merge work:/home/bk/mysql into mashka.mysql.fi:/home/my/mysql-3.23 2002-12-13 16:03:59 +02:00
unknown
f84ce68116 Forbid SLAVE STOP if the thread executing the query has locked
tables.  This removes a possible deadlock situation.
2002-12-13 16:01:51 +02:00
unknown
726f29f7e5 - fixed another typo in NOHUP_NICENESS testing 2002-12-13 13:47:25 +01:00
unknown
6a2ce08600 RESET SLAVE and CHANGE MASTER will now give an error if slave is running.
This fixes a problem in replication where RESET SLAVE could crash a running slave.


mysql-test/r/rpl_failsafe.result:
  Added missing drop
mysql-test/r/rpl_log_pos.result:
  Added slave stop before change master
mysql-test/t/rpl_log_pos.test:
  Added slave stop before change master
sql/sql_parse.cc:
  reset_slave() sends it's own errors
sql/sql_repl.cc:
  reset_slave() sends it own error.
  RESET SLAVE and CHANGE MASTER will now give an error if slave is running.
  This fixes a problem in replication where RESET SLAVE could crash a running slave.
2002-12-13 12:05:24 +02:00
unknown
d8a0617508 - added missing "test" to $NOHUP_NICENESS test (thanks to Nick Gaugler for
spotting and reporting this)
2002-12-13 09:56:02 +01:00
unknown
e6783a8785 Removed compiler warnings
Fixed wrong variable name for Windows


VC++Files/innobase/innobase.dsp:
  Don't use precompiled headers (doesn't work with samba)
VC++Files/myisammrg/myisammrg.dsp:
  Add missing files
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
  Fixed included paths
VC++Files/mysqldemb/mysqldemb.dsp:
  Don't use precompiled headers (doesn't work with samba)
VC++Files/mysqlserver/mysqlserver.dsp:
  Don't use precompiled headers (doesn't work with samba)
VC++Files/sql/mysqld.dsp:
  Fixed paths
innobase/include/univ.i:
  Removed compiler warning
myisammrg/myrg_open.c:
  Removed compiler warning
sql/ha_myisam.cc:
  Removed compiler warning
  Fixed wrong (but not dangerous) if statement
sql/ha_myisammrg.cc:
  Removed compiler warning
sql/mysqld.cc:
  Fixed wrong variable name for Windows
sql/sql_update.cc:
  Removed not used label
2002-12-12 21:01:32 +02:00
unknown
25c8f58ac7 - Fix handling of suffix option
- Replace function 'check_reserved_words' with correct one


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-12-12 11:06:55 +02:00
unknown
b870cfa595 log.cc:
We must not commit inside InnoDB when LOAD DATA INFILE just writes a block to the binlog; only commit if the log event type is QUERY_EVENT or EXECUTE_LOAD_EVENT


sql/log.cc:
  We must not commit inside InnoDB when LOAD DATA INFILE just writes a block to the binlog; only commit if the log event type is QUERY_EVENT or EXECUTE_LOAD_EVENT
2002-12-11 21:24:28 +02:00
unknown
7c625dc5bc Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2002-12-11 21:24:27 +02:00
unknown
182de7c203 Add CHARSET keyword (missing from last push)
sql/field.cc:
  Small safety fix
2002-12-11 21:22:57 +02:00
unknown
aaf9a98e13 - moved manual pages from "man" to "man/man1" for the binary distribution 2002-12-11 19:37:09 +01:00
unknown
ff50fc4fe5 - tagged ChangeSet 1.1276.3.1 as MySQL 3.23.54
- bumped up version number in configure.in to 3.23.55
2002-12-11 18:27:46 +01:00
unknown
1891aea755 Merge mysql.com:/space/my/mysql-4.0
into mysql.com:/space/my/mysql-4.0-build
2002-12-11 16:34:09 +01:00
unknown
934f5cc466 Ensure that BEGIN / COMMIT is handled properly if slave dies
Added syntax support for
CREATE TABLE foo (a char CHARACTER SET latin1) CHARSET=latin1;


Docs/internals.texi:
  Update binary protocol description
innobase/include/db0err.h:
  Merge from 3.23
mysql-test/r/insert.result:
  Updated test result from 3.23
sql/log.cc:
  Fixed bug in replication and log rotation
sql/log_event.cc:
  Ensure that BEGIN / COMMIT is handled properly if slave dies
sql/slave.cc:
  Fixed bug in replication and log rotation
sql/slave.h:
  Ensure that BEGIN / COMMIT is handled properly if slave dies
sql/sql_analyse.cc:
  Moved usage of res before res is destroyed (by bzero(&s...))
sql/sql_yacc.yy:
  Added syntax support for
  
  CREATE TABLE foo (a char CHARACTER SET latin1) CHARSET=latin1;
  
  To be able to read MySQL 4.1 dump files.
2002-12-11 15:46:39 +02:00
unknown
3c9b877b19 Merge with 3.23
innobase/dict/dict0dict.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
innobase/include/db0err.h:
  Skiped merge (Heikki wants to do this)
innobase/row/row0mysql.c:
  Skiped merge (Heikki wants to do this)
sql/sql_show.cc:
  Use local code
2002-12-11 13:32:31 +02:00
unknown
49162e0e54 Added back -max to server name if we are using InnoDB.
libmysql/libmysql.c:
  Compatibility fix
sql/mysqld.cc:
  Added back -max if we are using InnoDB.
  (This should not be done in the 3.23 version)
2002-12-11 12:59:55 +02:00
unknown
2076f2b44c Merge work:/home/bk/mysql into mashka.mysql.fi:/home/my/mysql-3.23 2002-12-11 12:44:50 +02:00