- 26 May, 2005 18 commits
-
-
unknown authored
BitKeeper/deleted/.del-ha_isam.cc~4dce65904db2675e: Auto merged BitKeeper/deleted/.del-ha_isammrg.cc~dc682e4755d77a2e: Auto merged client/sql_string.cc: Auto merged client/sql_string.h: Auto merged include/my_global.h: Auto merged include/my_sys.h: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysys/my_open.c: Auto merged mysys/raid.cc: Auto merged ndb/src/kernel/blocks/dbtux/Dbtux.hpp: Auto merged sql/field.cc: Auto merged sql/ha_berkeley.cc: Auto merged sql/ha_blackhole.cc: Auto merged sql/ha_heap.cc: Auto merged sql/ha_innodb.cc: Auto merged sql/ha_myisam.cc: Auto merged sql/ha_myisammrg.cc: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/handler.cc: Auto merged sql/item.cc: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_func.cc: Auto merged sql/item_geofunc.cc: Auto merged sql/item_strfunc.cc: Auto merged sql/item_subselect.cc: Auto merged sql/item_sum.cc: Auto merged sql/item_timefunc.cc: Auto merged sql/item_uniq.cc: Auto merged sql/item_uniq.h: Auto merged sql/log_event.cc: Auto merged sql/log_event.h: Auto merged sql/procedure.cc: Auto merged sql/protocol.cc: Auto merged sql/protocol_cursor.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_analyse.cc: Auto merged sql/sql_analyse.h: Auto merged sql/sql_lex.cc: Auto merged sql/sql_map.cc: Auto merged sql/sql_olap.cc: Auto merged sql/sql_string.cc: Auto merged sql/sql_udf.cc: Auto merged sql/tztime.cc: Auto merged sql/opt_range.cc: Manual merge sql/sql_parse.cc: Use select_lex pointer instead of lex->select_lex sql/sql_repl.cc: Function moved to log.cc, fix made there instead sql/sql_class.cc: Auto merged sql/sql_select.cc: Auto merged
-
unknown authored
- Add O_SHARE when opening file. sql/log.cc: Add O_SHARE when opening file. This is from mysql-4.1 but since function has been moved from sql_repl.cc, it was missed during merge.
-
unknown authored
into mysql.com:/home/psergey/mysql-5.0-conf-fixes-2 sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_select.cc: Auto merged sql/sql_show.cc: Auto merged sql/structs.h: Auto merged
-
unknown authored
-
unknown authored
into mysql.com:/M50/mysql-5.0 sql/item.cc: Auto merged sql/sql_yacc.yy: Auto merged
-
unknown authored
mysql-test/r/select.result: Corrected merge error (two test blocks inserted in wrong order).
-
unknown authored
-
unknown authored
Moved detection of wrong decimal fields before decimal field was created to avoid ASSERT() for DECIMAL(1)
-
unknown authored
client/client_priv.h: Correction of merge mishandling.
-
unknown authored
mysql-test/t/select.test: SCCS merged
-
unknown authored
client/mysqldump.c: Auto merged include/my_global.h: Auto merged mysql-test/r/mysqldump.result: Auto merged mysql-test/r/select.result: Auto merged mysql-test/t/mysqldump.test: Auto merged sql/item.cc: Auto merged sql/sql_yacc.yy: Auto merged support-files/mysql.spec.sh: Auto merged client/client_priv.h: Manual merge (still to be corrected!)
-
unknown authored
ndb/src/kernel/blocks/dbtux/Dbtux.hpp: Removed second forward declaration of "struct DescEnt"
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-4.1 include/my_global.h: Auto merged sql/ha_myisammrg.cc: Auto merged sql/item.cc: Auto merged
-
unknown authored
Added some more ifdefs for "#pragma interface" client/sql_string.cc: USE_PRAGMA_IMPLEMENTATION client/sql_string.h: USE_PRAGMA_INTERFACE include/my_global.h: Use pragma implementation for gcc pre version 3 mysys/raid.cc: USE_PRAGMA_IMPLEMENTATION sql/field.cc: USE_PRAGMA_IMPLEMENTATION sql/ha_berkeley.cc: USE_PRAGMA_IMPLEMENTATION sql/ha_blackhole.cc: USE_PRAGMA_IMPLEMENTATION sql/ha_heap.cc: USE_PRAGMA_IMPLEMENTATION sql/ha_innodb.cc: USE_PRAGMA_IMPLEMENTATION sql/ha_isam.cc: USE_PRAGMA_IMPLEMENTATION sql/ha_isammrg.cc: USE_PRAGMA_IMPLEMENTATION sql/ha_myisam.cc: USE_PRAGMA_IMPLEMENTATION sql/ha_myisammrg.cc: USE_PRAGMA_IMPLEMENTATION sql/ha_ndbcluster.cc: USE_PRAGMA_IMPLEMENTATION sql/handler.cc: USE_PRAGMA_IMPLEMENTATION sql/hash_filo.cc: USE_PRAGMA_IMPLEMENTATION sql/item.cc: USE_PRAGMA_IMPLEMENTATION sql/item_cmpfunc.cc: USE_PRAGMA_IMPLEMENTATION sql/item_func.cc: USE_PRAGMA_IMPLEMENTATION sql/item_geofunc.cc: USE_PRAGMA_IMPLEMENTATION sql/item_strfunc.cc: USE_PRAGMA_IMPLEMENTATION sql/item_subselect.cc: USE_PRAGMA_IMPLEMENTATION sql/item_sum.cc: USE_PRAGMA_IMPLEMENTATION sql/item_timefunc.cc: USE_PRAGMA_IMPLEMENTATION sql/item_uniq.cc: USE_PRAGMA_IMPLEMENTATION sql/item_uniq.h: USE_PRAGMA_INTERFACE sql/log_event.cc: USE_PRAGMA_IMPLEMENTATION sql/log_event.h: USE_PRAGMA_INTERFACE sql/opt_range.cc: USE_PRAGMA_IMPLEMENTATION sql/procedure.cc: USE_PRAGMA_IMPLEMENTATION sql/protocol.cc: USE_PRAGMA_IMPLEMENTATION sql/protocol_cursor.cc: USE_PRAGMA_IMPLEMENTATION sql/set_var.cc: USE_PRAGMA_IMPLEMENTATION sql/sql_analyse.cc: USE_PRAGMA_IMPLEMENTATION sql/sql_analyse.h: USE_PRAGMA_INTERFACE sql/sql_class.cc: USE_PRAGMA_IMPLEMENTATION sql/sql_crypt.cc: USE_PRAGMA_IMPLEMENTATION sql/sql_crypt.h: USE_PRAGMA_IMPLEMENTATION sql/sql_list.cc: USE_PRAGMA_IMPLEMENTATION sql/sql_map.cc: USE_PRAGMA_IMPLEMENTATION sql/sql_map.h: USE_PRAGMA_INTERFACE sql/sql_olap.cc: USE_PRAGMA_IMPLEMENTATION sql/sql_select.cc: USE_PRAGMA_IMPLEMENTATION sql/sql_string.cc: USE_PRAGMA_IMPLEMENTATION sql/sql_udf.cc: USE_PRAGMA_IMPLEMENTATION sql/tztime.cc: USE_PRAGMA_IMPLEMENTATION
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
-
unknown authored
ndb/src/common/debugger/SignalLoggerManager.cpp: Remove unused arg
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/bug9879
-
unknown authored
Updated test data in system tables mysql-test/lib/init_db.sql: Updated test data in system tables
-
- 25 May, 2005 18 commits
-
-
unknown authored
into mysql.com:/Users/kent/mysql/bk/mysql-5.0 myisammrg/myrg_open.c: Auto merged mysys/my_getwd.c: Auto merged sql/unireg.cc: Auto merged
-
unknown authored
fix from the main 5.0 tree. (Bug #10687) myisammrg/myrg_open.c: Call fn_format() if file has a path. mysys/my_getwd.c: Check for '/' even if it is not FN_LIBCHAR in has_path()
-
unknown authored
sql/item.cc: Move function to make it easier to debug sql/item.h: Move function to make them easier to debug
-
unknown authored
sql/sql_lex.h: Auto merged sql/sql_yacc.yy: Auto merged
-
unknown authored
into mysql.com:/data0/mysqldev/tomas/mysql-5.0-build
-
unknown authored
-
unknown authored
-
unknown authored
into mysql.com:/home/my/mysql-5.0 sql/sql_base.cc: Auto merged sql/sql_insert.cc: Auto merged
-
unknown authored
We will however give a warning when opening such a table that users should use ALTER TABLE ... FORCE to fix the table. In future release we will fix that REPAIR TABLE will be able to handle this case sql/sql_lex.h: Support for ALTER TABLE ... FORCE sql/sql_table.cc: CHECK TABLE now gives a note if table->s->crashed was set sql/sql_yacc.yy: Support for ALTER TABLE ... FORCE sql/table.cc: Fix that we can read tables with the 'older' decimal format used in 5.0.3 & 5.0.4 (Now we store display length in the .frm table while we previously stored precision) sql/table.h: Store in TABLE_SHARE version number of MySQL where table was created (or checked)
-
unknown authored
Added ASSERT() to detect wrongly packed fields sql/field.h: Fixed comments to right format sql/opt_range.cc: Merged code sql/sql_base.cc: Fixed indentation sql/sql_insert.cc: Fixed comments to right format sql/sql_select.cc: Simplify code sql/unireg.cc: Simply code for calculating key_buff_length Added ASSERT() to detect wrongly packed fields
-
unknown authored
Added a missing "make clean" to the RPM "spec" file which had caused the original 4.1.12 RPMs to be broken. (bug#10674, bug#10681) support-files/mysql.spec.sh: Added a missing "make clean" which had caused the original 4.1.12 RPMs to be broken. (bug#10674, bug#10681)
-
unknown authored
Merge with latest yaSSL, fix compilation error for SSE2 processors. extra/yassl/include/yassl_int.hpp: Merge with latest yaSSL. extra/yassl/src/log.cpp: Merge with latest yaSSL. extra/yassl/src/yassl_int.cpp: Merge with latest yaSSL. extra/yassl/taocrypt/include/integer.hpp: Merge with latest yaSSL. extra/yassl/taocrypt/src/integer.cpp: Fix compilation error for SSE2 processors.
-
unknown authored
into mysql.com:/home/my/mysql-4.1 sql/sql_parse.cc: Auto merged
-
unknown authored
Faster detection of wrong table names (like PRN) on windows include/my_sys.h: Added check_if_legal_filename() mysys/my_access.c: Added check_if_legal_filename() Set errno if my_access() fails mysys/my_fopen.c: USe check_if_legal_filename() instead of my_access() to detect wrong file names on windows mysys/my_open.c: USe check_if_legal_filename() instead of my_access() to detect wrong file names on windows sql/sql_lex.cc: Portability fix sql/sql_parse.cc: Simple cleanup sql/sql_repl.cc: Cleanup during code review
-
unknown authored
innobase_shutdown_for_mysql(): Do very fast shutdown only if srv_fast_shutdown==2, not if srv_fast_shutdown!=0 (Bug #9673) innobase/srv/srv0start.c: innobase_shutdown_for_mysql(): Do very fast shutdown only if srv_fast_shutdown==2, not if srv_fast_shutdown!=0 (Bug #9673)
-
unknown authored
mysql-test/mysql-test-run.sh: Add master id to end of MASTER_MY_ERR so that both masters doesnt write to the same file.
-
unknown authored
ndb/src/common/util/File.cpp: my_stat returns NULL on failure, not non-zero. i.e. exactly the opposite of stat(2). providing confusion for unix programmers, who expect errors to be non-zero. Clean up File_class::exists(char*) to use the my_stat interface properly.
-
unknown authored
BUILD/check-cpu: Add no_march variable to indicate that this architecture doesn't support the -march flag to GCC
-
- 24 May, 2005 4 commits