summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* union.result:unknown2004-05-042-2/+2
| | | | | | | | | | | | fixing typo union.test: fixing type mysql-test/t/union.test: fixing type mysql-test/r/union.result: fixing typo
* union.result, union.test:unknown2004-05-042-0/+2
| | | | | | | | | | a small fix for the test case mysql-test/t/union.test: a small fix for the test case mysql-test/r/union.result: a small fix for the test case
* Fix for a bug involving UNION's and SET SQL_SELECT_LIMIT unknown2004-05-033-3/+27
| | | | | | | | | | | mysql-test/r/union.result: Results for a test case for bug involving UNION's and SET SQL_SELECT_LIMIT mysql-test/t/union.test: Test case for bug involving UNION's and SET SQL_SELECT_LIMIT sql/sql_union.cc: Patch for a bug involving UNION's and SET SQL_SELECT_LIMIT
* - enabled compiling with NDB cluster in compile-pentium-debug-maxunknown2004-05-031-1/+1
| | | | | BUILD/compile-pentium-debug-max: - enable compiling with NDB cluster
* mysql-test-run: -start-from added, cleanupunknown2004-05-031-19/+19
| | | | | | mysql-test/mysql-test-run.sh: -start-from added cleanup
* Merge bk-internal:/home/bk/mysql-4.1/unknown2004-05-012-40/+65
|\ | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| * Fix client_test to use new statement assertion macrosunknown2004-04-301-3/+3
| |
| * Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1unknown2004-04-301-40/+7
| |\ | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.1
| | * - reverted change to fill_help_tables.sh ("Added checking of maximumunknown2004-04-301-40/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | length of line in output (Bug #2874)" from last ChangeSet (should not have been applied) scripts/fill_help_tables.sh: - reverted change "Added checking of maximum length of line in output (Bug #2874)" from last ChangeSet (should not have been applied)
| * | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-04-301-0/+58
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | into mysql.com:/dbdata/psergey/mysql-4.1-bug3420 tests/client_test.c: Auto merged
| | * Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-04-301-0/+58
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/dbdata/psergey/mysql-4.1-bug3420 tests/client_test.c: Auto merged
| | | * Testcase for BUG#3420. The bug itself has been fixed by some previous PS ↵unknown2004-04-141-0/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | code changes made since 4.1.1a tests/client_test.c: Testcase for BUG#3420
* | | | myisam_data_pointer_sizeunknown2004-05-017-6/+17
| | | | | | | | | | | | | | | | | | | | include/mysql.h: compatibility fix
* | | | note that --[skip-]opt include --set-charsetunknown2004-05-011-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | make --set-charset affect only what's going into *dump* not client-server communication
* | | | removed duplicated check for thd->killedunknown2004-04-301-2/+0
| | | |
* | | | Merge bk-internal:/home/bk/mysql-4.1/unknown2004-04-306-560/+860
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| * | | Only calculate MYSQL_FIELD->max_length if mysql_stmt_attr_set(..., ↵unknown2004-04-302-33/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | STMT_ATTR_UPDATE_MAX_LENGTH) is done. tests/client_test.c: Test mysql_stmt_attr_set(...STMT_ATTR_UPDATE_MAX_LENGTH)
| * | | Mergeunknown2004-04-306-529/+816
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | libmysql/libmysql.c: Auto merged tests/client_test.c: Auto merged include/mysql.h: SCCS merged
| | * | Update 'MYSQL_FIELD->max_length' on mysql_stmt_store_result() (Bug #1647)unknown2004-04-306-529/+816
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added checking of cut read lines in bootstrap thread (Bug #2874) include/mysql.h: Added length to MYSQL_ROWS to enable sanity checking of packets Update 'MYSQL_FIELD->max_length' on mysql_stmt_store_result() libmysql/libmysql.c: Update 'MYSQL_FIELD->max_length' on mysql_stmt_store_result() (Bug #1647) scripts/fill_help_tables.sh: Added checking of maximum length of line in output (Bug #2874) scripts/mysql_install_db.sh: Added error message if help tables couldn't be done (Bug #2874) sql/sql_parse.cc: Added checking of cut read lines in bootstrap thread (Bug #2874) tests/client_test.c: Added --debug Changed some strange define names Less output Added testing of max_length for prepared statements
* | | | Merge bk-internal:/home/bk/mysql-4.1/unknown2004-04-301-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| * | | compatibility fix (bug#3606)unknown2004-04-301-1/+1
| | | |
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-04-307-46/+220
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/kostja/mysql/mysql-4.1-u2 include/mysql.h: Auto merged libmysql/libmysql.c: Auto merged sql/sql_prepare.cc: Auto merged tests/client_test.c: Auto merged
| * | | | Fix for Bug#3035 "Prepared statement integer inserts": now unsignedunknown2004-04-307-46/+220
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | flag is sent to server with placeholder types. There were no need to extend the protocol as one additional byte was reserved for placeholder code, when placeholder code is in range 0-255. So this byte is now used for flags. Post-review fixes added. include/config-win.h: added floaststore implementation include/my_global.h: added floatstore implementation include/mysql.h: Bug#3035: added 'is_unsigned' member binary_data wasn't used, removed null_field wasn't necessary, removed include/mysql_com.h: Unused defines were removed. libmysql/libmysql.c: Function store_param_type was removed - too much for a function, especially with bug in it. New implementation is inline and takes into account signedness of placeholder. Fixed store functions to not perform double network-host order conversion on high-byte-first systems (should also fix Bug#3578 "Prepared statement integer conversions work wrong in 64-bit Power Mac G5 CPUs"). null_field removed. sql/sql_prepare.cc: Placeholder sign is taken into account when reading data from network. tests/client_test.c: Test for BUG#3035 added: insert and retrieve minimum and maximum of all integer types.
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-04-303-0/+75
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/kostja/mysql/mysql-4.1-root
| * | | | Implementation of mysql_stmt_attr_get and mysql_stmt_attr_set unknown2004-04-303-0/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | requested by Monty for Bug#1647 (No way to determine what size blob/clob is being returned into bound buffer) include/mysql.h: Implementation of mysql_stmt_attr_get and mysql_stmt_attr_set requested by Monty for Bug#1647. libmysql/libmysql.c: Implementation of mysql_stmt_attr_get and mysql_stmt_attr_set requested by Monty for Bug#1647. libmysql/libmysql.def: Windows .defs added for new API calls
* | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-04-294-22/+58
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | into mc05.(none):/space/tomas/mysql-4.1-make
| * | | | SrcDist.sh, Epilogue.mk:unknown2004-04-292-16/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | improved distdir ndb/Epilogue.mk: improved distdir ndb/SrcDist.sh: improved distdir
| * | | | configure.in:unknown2004-04-293-13/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added configure options PACKAGE and VERSION for ndb GuessConfig.sh: added options for PACKAGE and VERSION Epilogue.mk: Added target distdir ndb/Epilogue.mk: Added target distdir ndb/config/GuessConfig.sh: added options for PACKAGE and VERSION configure.in: added configure options PACKAGE and VERSION for ndb
* | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-04-302025-5761/+513099
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/dbdata/psergey/mysql-4.1-my-ps-bugs tests/client_test.c: Auto merged
| * | | | SrcDist.sh:unknown2004-04-291-0/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | new file
| * | | | - added option for building/packaging the NDB cluster to Do-compileunknown2004-04-291-2/+8
| | |/ / | |/| | | | | | | | | | | | | | Build-tools/Do-compile: - added option for building/packaging the NDB cluster
| * | | Merge bk-internal:/home/bk/mysql-4.1/unknown2004-04-291-16/+13
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| | * | postreview fixesunknown2004-04-291-16/+13
| | | |
| * | | Allow one to send empty strings with mysql_stmt_send_long_data()unknown2004-04-283-4/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql_stmt_reset() now resets param->long_data_used Abort if --defaults-file=path-name uses a non-existing file (Bug #3413) Fixed problem with symlink test (bug in 4.1.2) libmysql/libmysql.c: Allow one to send empty strings with mysql_stmt_send_long_data() mysql_stmt_reset() now resets param->long_data_used mysys/default.c: Abort if --defaults-file=path-name uses a non-existing file (Bug #3413) sql/unireg.cc: Fixed problem with symlink test: .frm table was not properly deleted if handler create failed
| * | | removed ndb odbc from compile and releaseunknown2004-04-282-18/+3
| | | |
| * | | Renamed MY_LEX_COLON to MY_LEX_SEMICOLON (at Serg's request)unknown2004-04-283-3/+3
| | | |
| * | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-04-27132-4974/+4733
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | into mysql.com:/dbdata/psergey/mysql-4.1-bug3567
| | * | after-merge fix: make concurrent-insert-skip code ft2-awareunknown2004-04-273-7/+20
| | | | | | | | | | | | | | | | | | | | mysql-test/t/func_group.test: no innodb is not an error
| | * | Fixed results for previous patchunknown2004-04-273-13/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure that mysqldump doesn't give an error about missing Index.xml when it's not needed client/mysqldump.c: Added better default --debug option mysql-test/r/show_check.result: Fixed result after Type->Engine conversion mysys/charset.c: Don't give error if Index.xml doesn't exists (If we can't find the character set, the later error will include the used patch to the Index.xml file)
| | * | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-04-27130-4959/+4699
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mishka.local:/home/my/mysql-4.1 BitKeeper/etc/logging_ok: auto-union sql/set_var.cc: Auto merged
| | | * | After merge fixesunknown2004-04-2726-248/+185
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed 'SHOW FIELD STATUS' to use 'Engine' instead of 'Type' client/client_priv.h: Added option 'create_options' for mysqldump client/mysqldump.c: Changed '--all' to '--create-options' as the old name was meaningless innobase/buf/buf0buf.c: After merge fixes innobase/buf/buf0lru.c: After merge fixes innobase/buf/buf0rea.c: After merge fixes innobase/dict/dict0load.c: After merge fixes innobase/fil/fil0fil.c: After merge fixes innobase/ibuf/ibuf0ibuf.c: After merge fixes innobase/include/fil0fil.h: After merge fixes innobase/include/row0mysql.h: After merge fixes innobase/include/ut0mem.h: After merge fixes innobase/log/log0recv.c: After merge fixes innobase/row/row0mysql.c: After merge fixes innobase/row/row0sel.c: After merge fixes innobase/srv/srv0start.c: After merge fixes innobase/sync/sync0rw.c: After merge fixes innobase/sync/sync0sync.c: After merge fixes myisam/ft_boolean_search.c: After merge fixes myisam/ft_nlq_search.c: After merge fixes mysql-test/r/mysqldump.result: After merge fixes mysql-test/t/mysqldump.test: Make result file smaller Some new tests sql/ha_innodb.cc: After merge fixes sql/set_var.cc: Removed compiler warning sql/slave.cc: After merge fixes sql/slave.h: After merge fixes sql/sql_show.cc: Type -> Engine
| | | * | Merge with 4.0unknown2004-04-26125-4780/+4583
| | | |\ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | innobase/dict/dict0boot.c: Auto merged innobase/dict/dict0load.c: Auto merged innobase/dict/dict0mem.c: Auto merged innobase/fut/fut0lst.c: Auto merged innobase/include/buf0lru.h: Auto merged innobase/include/dict0mem.h: Auto merged innobase/include/fsp0fsp.h: Auto merged innobase/include/ha0ha.h: Auto merged innobase/include/ibuf0ibuf.h: Auto merged innobase/include/lock0lock.h: Auto merged innobase/include/log0log.h: Auto merged innobase/include/mem0pool.h: Auto merged innobase/include/mtr0mtr.h: Auto merged innobase/include/os0file.h: Auto merged innobase/include/rem0rec.h: Auto merged innobase/include/rem0rec.ic: Auto merged innobase/include/srv0srv.h: Auto merged innobase/include/sync0sync.h: Auto merged innobase/include/trx0sys.h: Auto merged innobase/include/ut0byte.h: Auto merged innobase/include/ut0ut.h: Auto merged innobase/mem/mem0pool.c: Auto merged innobase/mtr/mtr0mtr.c: Auto merged innobase/os/os0proc.c: Auto merged innobase/pars/lexyy.c: Auto merged innobase/pars/pars0opt.c: Auto merged innobase/row/row0ins.c: Auto merged innobase/row/row0purge.c: Auto merged innobase/row/row0uins.c: Auto merged innobase/row/row0umod.c: Auto merged innobase/row/row0undo.c: Auto merged innobase/row/row0upd.c: Auto merged innobase/trx/trx0purge.c: Auto merged innobase/trx/trx0roll.c: Auto merged innobase/trx/trx0sys.c: Auto merged innobase/trx/trx0undo.c: Auto merged innobase/ut/ut0byte.c: Auto merged pstack/bucomm.h: Auto merged pstack/budbg.h: Auto merged sql/item_sum.h: Auto merged sql/slave.cc: Auto merged sql/sql_db.cc: Auto merged support-files/mysql.spec.sh: Auto merged tests/insert_test.c: Auto merged mysql-test/t/func_group.test: Merge with 4.0 Put 4.1 tests lasts sql/ha_innodb.cc: Merge with 4.0 Added checking of results from my_malloc() BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| | | | * ha_innodb.cc, sync0sync.h, sync0sync.c:unknown2004-04-093-3/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use only noninlined InnoDB functions in ha_innodb.cc innobase/sync/sync0sync.c: Use only noninlined InnoDB functions in ha_innodb.cc innobase/include/sync0sync.h: Use only noninlined InnoDB functions in ha_innodb.cc sql/ha_innodb.cc: Use only noninlined InnoDB functions in ha_innodb.cc
| | | | * Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-04-093-0/+14
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b3376
| | | | | * A fix. (Bug #3376: AVG(constant) returns constant if no rows in result set)unknown2004-04-093-0/+14
| | | | | |
| | | | * | - Merged in changes from mysqld_multi 2.6unknown2004-04-091-12/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Changed reading of config file so that one can use a separate config file for [mysqld_multi] also. In other words --config-file=file will read group [mysqld_multi] from this file, earlier it wouldn't have.
| | | | * | Fix for BUG#3422 "In 3.23 -> 4.0 replication, slave segfault when ↵unknown2004-04-081-2/+14
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | replicating LOAD DATA INFILE": as we transform the 3.23 Load_log_event into a 4.0 Create_file_log_event which is one byte longer, we need to increment event_len. The bug was that we did not increment it, so later in code the end 0 was not seen so there was for example a segfault in strlen(fname) because fname was not 0-terminated. Other problems remain in 3.23->4.0 replication of LOAD DATA INFILE but they are less serious: Exec_master_log_pos and Relay_log_space are incorrect. I'll document them. They are not fixable without significant code changes (if you fix those problems in 4.0, you get assertion failures somewhere else etc), * which are already done in 5.0.0 *. sql/slave.cc: In 3.23->4.0 replication of LOAD DATA INFILE: as we transform the 3.23 Load_log_event into a 4.0 Create_file_log_event which is one byte longer, we need to increment event_len. So we need to modify the event_len stored in the event. And we need to decrement event_len when we compute the offset in the master's binlog.
| | | | * Merge marko@build.mysql.com:/home/bk/mysql-4.0unknown2004-04-081-3/+4
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into hundin.mysql.fi:/home/marko/j/mysql-4.0
| | | | | * InnoDB: Fix a preprocessor error introduced in ChangeSet 1.1772unknown2004-04-081-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | innobase/sync/sync0sync.c: Fix a preprocessor error introduced in ChangeSet 1.1772
| | | | * | sql_select.cc:unknown2004-04-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a glitch reported by Philippe Lewicki on the general mailing list: do not print a warning to the .err log if read_key fails with a lock wait timeout error 146 sql/sql_select.cc: Fix a glitch reported by Philippe Lewicki on the general mailing list: do not print a warning to the .err log if read_key fails with a lock wait timeout error 146
View Lorry Controller Status