summaryrefslogtreecommitdiff
path: root/BitKeeper
Commit message (Collapse)AuthorAgeFilesLines
* Merge with 3.23 tree to get latest bug fixesunknown2003-07-011-0/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union sql/item_func.cc: Auto merged mysql-test/t/user_var.test: Auto merged sql/log_event.cc: Auto merged sql/log_event.h: Auto merged sql/nt_servc.cc: Auto merged configure.in: Use local version innobase/os/os0file.c: Use local version innobase/page/page0page.c: Use local version innobase/row/row0sel.c: Use local version innobase/row/row0vers.c: Use local version mysql-test/r/order_by.result: Use local version mysql-test/r/user_var.result: merge with 3.23 mysql-test/t/order_by.test: Use local version (test is already in range.test) sql/log.cc: Use local version sql/share/spanish/errmsg.txt: merge sql/slave.cc: Use local version sql/sql_class.h: Use local version sql/sql_select.cc: Use patch in 4.0 for range with NULL problem
| * Tagged ChangeSet 1.1385 as mysql-3.23.57unknown2003-06-191-0/+1
| | | | | | | | | | | | | | configure.in: Updated AM_INIT_AUTOMAKE to following version BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| * InstallShield Files requested by Gregunknown2003-06-181-0/+1
| | | | | | | | | | BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| * Translation updatedunknown2003-06-081-0/+1
| | | | | | | | | | BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| * Merge bk-internal.mysql.com:/home/bk/mysql-3.23unknown2003-04-291-3/+5
| |\ | | | | | | | | | | | | | | | | | | into narttu.mysql.fi:/my/mysql-3.23
| | * Put changeset number in emailsunknown2003-04-241-3/+5
| | |
| * | Merge bk-internal:/home/bk/mysql-3.23/unknown2003-04-281-0/+3
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql client/mysqldump.c: Auto merged BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| | * fux bug #183unknown2003-04-031-0/+1
| | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| | * Do not silently do RESET MASTER when one does 'mysqldump --master-data' ;unknown2003-03-191-0/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | | | only do it if the user specifies --delete-master-logs (new option). Safer + fixes bug #159. client/client_priv.h: New option --delete-master-logs for mysqldump client/mysqldump.c: New option --delete-master-logs for mysqldump BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| * fixed functions to be able work with group function as argumentunknown2003-01-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | made bisone 1.75 compatible code mysql-test/r/group_by.result: test of function with agregate function inside mysql-test/t/group_by.test: test of function with agregate function inside sql/item_cmpfunc.cc: fixed functions to be able work with group function as argument sql/item_cmpfunc.h: fixed functions to be able work with group function as argument sql/item_func.cc: fixed functions to be able work with group function as argument sql/item_func.h: fixed functions to be able work with group function as argument sql/item_strfunc.cc: fixed functions to be able work with group function as argument sql/item_strfunc.h: fixed functions to be able work with group function as argument sql/sql_yacc.yy: made bisone 1.75 compatible code BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | Merge bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-06-231-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | into sergbook.mylan:/usr/home/serg/Abk/mysql-4.0 BitKeeper/etc/logging_ok: auto-union
| * | fixed bug in references column grantsunknown2003-06-231-0/+1
| | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | Fix error msg. Bug #681unknown2003-06-191-0/+1
|/ / | | | | | | | | BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | Bugfix for #614unknown2003-06-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Item_extract needs special implementation for eq(). Item_func::eq doesn't work correctly because we have to compare Item_extract::int_type parameters also We need to propagate this to 4.1 sql/item_timefunc.cc: Item_extract::eq implementation added sql/item_timefunc.h: Item_extract::eq definition added BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | Merge jani@192.168.0.2:/my/mysql-4.0unknown2003-05-261-0/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | into ua126d19.elisa.omakaista.fi:/home/my/bk/mysql-4.0 BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| * | my_global.h:unknown2003-05-161-0/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | - QNX 6.2.1 actually defines HAVE_RINT - fixed rint(A) #define as it was causing compile errors on QNX include/my_global.h: - QNX 6.2.1 actually defines HAVE_RINT - fixed rint(A) #define as it was causing compile errors on QNX BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | CURRENT_USER() and "access denied" error messages now report hostname ↵unknown2003-04-291-0/+1
| | | | | | | | | | | | | | exactly as it was specified in the GRANT command (with wildcards, that is) BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | fixed incorrect number of affected rows in REPLACE...SELECT... (bug 130)unknown2003-04-261-0/+1
| | | | | | | | | | | | | | sql/sql_insert.cc: fixed incorrect number of affected rows in REPLACE...SELECT... BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | config-win.h:unknown2003-04-231-0/+1
| | | | | | | | | | | | | | | | | | | | Enable 'LOAD LOCAL INFILE', for parity with unix binaries. include/config-win.h: Enable 'LOAD LOCAL INFILE', for parity with unix binaries. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | Modify PeterG's internals documentation per Monty. Added unknown2003-04-231-0/+1
| | | | | | | | | | | | | | | | | | more detailed explanation of record header and column storage. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0unknown2003-03-251-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/LOADDATA_BUG/mysql-4.0 BitKeeper/etc/logging_ok: auto-union sql/log_event.cc: Auto merged
| * | fix bug with parameters of LOAD DATA INFILE in exec_eventunknown2003-03-251-0/+1
| | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | Added PeterG's new internals documenation.unknown2003-03-121-0/+1
| | | | | | | | | | | | | | | | | | | | | Docs/internals.texi: Added PeterG's new internals documentation. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-03-111-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gluh.mysql.r18.ru:/home/gluh/mysql-4.0.last BitKeeper/etc/logging_ok: auto-union client/mysqltest.c: Auto merged mysql-test/mysql-test-run.sh: Auto merged
| * | | Openssl testunknown2003-03-111-0/+1
| |/ / | | | | | | | | | | | | | | | | | | client/mysqltest.c: For openssl test BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | Handling of log-error added in embedded serverunknown2003-03-101-0/+1
| | | | | | | | | | | | | | | | | | | | | libmysqld/lib_sql.cc: handling of log-error added to embedded server BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | When the SQL thread cannot read an event from the relay logunknown2003-03-021-0/+1
|/ / | | | | | | | | | | | | | | | | | | ("Event too big" etc), stop this thread instead of going on with the next event, which would certainly lead to slave's data corruption. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | opt_sum.cc:unknown2003-02-231-0/+1
| | | | | | | | | | | | | | | | | | | | Correction for min/max optimization of queries with outer joins sql/opt_sum.cc: Correction for min/max optimization of queries with outer joins BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | mwldnlm, mwenv, mwccnlm, mwasmnlm, nwconfigure, nwbootstrap:unknown2003-02-181-0/+1
| | | | | | | | | | | | | | | | new file BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | - really deleted makefile.w32 to resolve a namespace conflict on unknown2003-02-031-0/+1
| | | | | | | | | | | | | | case-insensitive File Systems (e.g. Mac OS X)
* | Many files:unknown2003-02-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | new file Makefile.am: Changes from Novell diff netware/Makefile.am: Changes from Novell diff BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | Fix for the QUOTE() function.unknown2003-01-031-0/+1
| | | | | | | | | | BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | - Fix handling of suffix optionunknown2002-12-121-0/+1
| | | | | | | | | | | | | | | | - Replace function 'check_reserved_words' with correct one BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | merge Ranger's patches to crash-me, add new tests ( DEFAULT VALUES )unknown2002-12-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to crash-me sql-bench/crash-me.sh: new tests: - INSERT with DEFAULT: - INSERT with empty value list: - Insert DEFAULT VALUES; ------- -checking of reserved keywords (by courtesy of Ranger) -------- - added "--suffix" option - added description of "--config-file" to help section - fixed test for DIFFERENCE() - fixed small bug in safe_query_result (was s/,/,/ should s/,/./) (by courtesy of Ranger) sql-bench/server-cfg.sh: remove "KERNEL" and add "SAPDB" to sapdb version BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | A better way to get the ChangeSet revision for the Subject: line.unknown2002-11-281-1/+1
| |
* | Add the ChangeSet id to Subject: in all emails.unknown2002-11-271-3/+5
| | | | | | | | | | BitKeeper/etc/ignore: Added autom4te-2.53.cache/output.0 autom4te-2.53.cache/requests autom4te-2.53.cache/traces.0 bdb/dist/autom4te-2.53.cache/output.0 bdb/dist/autom4te-2.53.cache/requests bdb/dist/autom4te-2.53.cache/traces.0 bkpull.log build.log innobase/autom4te-2.53.cache/output.0 innobase/autom4te-2.53.cache/requests innobase/autom4te-2.53.cache/traces.0 pull.log to the ignore list
* | Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0unknown2002-11-141-2/+2
|\ \
| * | Portability fix when using -DBIG_TABLESunknown2002-11-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/config: Changed Sasha to sys client/mysqlbinlog.cc: Fixed that --position open works. sql/item_timefunc.cc: Portability fix sql/log_event.cc: Portability fix sql/set_var.cc: Portability fix
* | | mergedunknown2002-11-131-0/+38
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | | | | | BitKeeper/etc/gone: auto-union BitKeeper/etc/logging_ok: auto-union sql/ha_myisam.cc: Auto merged innobase/row/row0sel.c: merged (ul - as 3.23's fix was a backport from 4.0) mysql-test/r/myisam.result: merged - ul
| * Merge akeremidarski@work.mysql.com:/home/bk/mysqlunknown2002-11-111-0/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | into geopard.(none):/storage/bk/mysql-3.23 BitKeeper/etc/gone: auto-union BitKeeper/etc/logging_ok: auto-union
| | * fixing gone file ONCE AGAINunknown2002-11-081-37/+0
| | |
| | * Mergeunknown2002-10-241-0/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/gone: auto-union BitKeeper/deleted/.del-skipkeys~3f37511a1865c4ea: 'Auto converge rename' BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| | | * BK automatic LOD removal.unknown2002-10-243-95/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/skipkeys: auto add BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| * | | Merge akeremidarski@work.mysql.com:/home/bk/mysqlunknown2002-10-231-0/+1
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into geopard.(none):/storage/bk/mysql-3.23 BitKeeper/etc/gone: auto-union BitKeeper/deleted/.del-skipkeys~508193a0775828ab: 'Auto converge rename' BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| | * | BK automatic LOD removal.unknown2002-10-233-97/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted BitKeeper/etc/skipkeys: auto add
* | | | fixed gone file ONCE AGAINunknown2002-11-081-38/+0
| | | |
* | | | Merge akishkin@work.mysql.com:/home/bk/mysql-4.0unknown2002-11-091-0/+38
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/walrus/bk/40 BitKeeper/etc/logging_ok: auto-union
| * \ \ \ Merge akishkin@work.mysql.com:/home/bk/mysql-4.0unknown2002-11-051-0/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/walrus/bk/40 BitKeeper/etc/gone: auto-union BitKeeper/etc/logging_ok: auto-union
* | | | | | Portability fixes for Fortre C++ 5.0 (on Sun) in 32 and 64 bit modes.unknown2002-11-071-0/+1
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client/mysqlbinlog.cc: Portability fix configure.in: Added use of ASFLAGS (For Solaris with Forte 5.0) include/my_global.h: Portability fix include/myisam.h: Portability fix include/queues.h: Portability fix innobase/include/ut0ut.h: Portability fix innobase/log/log0log.c: Portability fix innobase/rem/rem0cmp.c: Portability fix innobase/trx/trx0sys.c: Portability fix isam/pack_isam.c: Portability fix myisam/ft_boolean_search.c: Portability fix myisam/mi_dynrec.c: Code change to go around bug in Forte 5.0 myisam/sort.c: Portability fix mysys/my_aes.c: Portability fix scripts/Makefile.am: Support for ASFLAGS scripts/mysqlbug.sh: Support for ASFLAGS sql/field.cc: Portability fix sql/filesort.cc: Portability fix sql/gen_lex_hash.cc: Portability fix sql/ha_innodb.cc: Portability fix Changed SHOW INNODB STATUS to return error instead of writing message to log file. sql/ha_isammrg.cc: Portability fix sql/ha_myisam.cc: Portability fix sql/ha_myisammrg.cc: Portability fix sql/hash_filo.h: Portability fix sql/hostname.cc: Portability fix sql/item_cmpfunc.h: Indentation change sql/item_func.cc: Portability fix sql/item_func.h: Portability fix sql/log.cc: Portability fix sql/log_event.cc: Portability fix sql/mysql_priv.h: Portability fix sql/mysqld.cc: Portability fix Fixed bug with rpl_recovery_rank command line option on 64 bit systems sql/opt_range.cc: Portability fix sql/repl_failsafe.cc: Portability fix sql/slave.cc: Portability fix sql/slave.h: Portability fix sql/sql_acl.cc: Portability fix sql/sql_base.cc: Portability fix sql/sql_cache.cc: Portability fix sql/sql_cache.h: Portability fix sql/sql_class.cc: Portability fix sql/sql_delete.cc: Portability fix sql/sql_insert.cc: Portability fix sql/sql_manager.cc: Portability fix sql/sql_parse.cc: Portability fix BUILD/compile-solaris-sparc-forte: C sql/sql_udf.cc: Portability fix sql/sql_update.cc: Portability fix strings/Makefile.am: Portability fix strings/bmove_upp-sparc.s: Fix so that this works on 32 and 64 bit sparcs strings/str_test.c: Cleanup strings/strappend-sparc.s: Fix so that this works on 32 and 64 bit sparcs strings/strend-sparc.s: Fix so that this works on 32 and 64 bit sparcs strings/strmake-sparc.s: Fix so that this works on 32 and 64 bit sparcs strings/strmov-sparc.s: Fix so that this works on 32 and 64 bit sparcs strings/strnmov-sparc.s: Fix so that this works on 32 and 64 bit sparcs strings/strstr-sparc.s: Fix so that this works on 32 and 64 bit sparcs strings/strxmov-sparc.s: Fixes to make this more portable, but it's still not usable on 64 bit systems :( BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | | | Some changes for SSLunknown2002-10-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql-bench/bench-init.pl.sh: Add option connect-options(using with SSL) sql-bench/server-cfg.sh: Add option connect-option(using with SSL) sql/sql_acl.cc: Fix bug when GRANT ... REQUIRE NONE doesn't unset SSL requirements BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted