summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* item_cmpfunc.cc:unknown2003-06-201-0/+7
| | | | | | | | | | Temporarily fix for test failure ,. sql/item_cmpfunc.cc: Temporarily fix for test failure ,.
* item_cmpfunc.cc:unknown2003-06-201-24/+37
| | | | | | | | | | Rewritten in nicer way , sql/item_cmpfunc.cc: Rewritten in nicer way ,
* - make sure that scripts/*.sql files are being added to the sourceunknown2003-06-201-1/+1
| | | | | | | distribution as well
* Fix error msg. Bug #681unknown2003-06-192-1/+2
| | | | | BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* after merge fixunknown2003-06-191-2/+0
|
* Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1unknown2003-06-19341-15376/+13617
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-item-4.1 sql/item.cc: Auto merged sql/item_subselect.cc: Auto merged sql/item_sum.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_select.cc: Auto merged sql/sql_union.cc: Auto merged sql/sql_yacc.yy: Auto merged
| * Merge mysql.com:/space/my/mysql-4.1unknown2003-06-191-1/+2
| |\ | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.1-build
| | * Merge mysql.com:/space/my/mysql-4.1unknown2003-06-191-1/+2
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.1-build
| | | * - added missing include/sql_state.h to source distributionunknown2003-06-191-1/+2
| | | | | | | | | | | | | | | | | | | | include/Makefile.am: - added missing sql_state.h to source distribution
| * | | Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-06-191-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | into rurik.mysql.com:/home/igor/mysql-4.1
| | * | Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1unknown2003-06-191-1/+1
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.1 sql/item_strfunc.cc: Auto merged
| | | * - revert wrong include of zlib.h as zlib is not part of the source unknown2003-06-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | distribution - better use -I../zlib where appropriate (usually we use the zlib installed in the system)
| * | | Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-06-194-95/+44
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | into rurik.mysql.com:/home/igor/mysql-4.1
| | * | Merge rurik.mysql.com:/home/igor/mysql-4.1unknown2003-06-194-95/+44
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into rurik.mysql.com:/home/igor/dev/mysql-4.1-0 sql/sql_yacc.yy: Auto merged
| | | * | preload.result, preload.test:unknown2003-06-194-95/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed non-generic info (key used blocks) preload.result, preload.test, lex.h, sql_yacc.yy: Syntax change for preload statement sql/sql_yacc.yy: Syntax change for preload statement sql/lex.h: Syntax change for preload statement mysql-test/t/preload.test: Removed non-generic info (key used blocks) mysql-test/r/preload.result: Removed non-generic info (key used blocks)
| * | | | Merge abarkov@build.mysql.com:/home/bk/mysql-4.1unknown2003-06-191-0/+1
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
| | * | | - added libmysql/client_settings.h to distributionunknown2003-06-191-0/+1
| | |/ / | | | | | | | | | | | | | | | | libmysql/Makefile.am: - added client_settings.h to distribution
| * | | Merge abarkov@build.mysql.com:/home/bk/mysql-4.1unknown2003-06-193-1/+74
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
| | * | LPAD, RPAD, MAKE_SET and EXPORT_SET now works correctly with collationsunknown2003-06-193-1/+74
| | | |
| * | | Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-06-195-8/+86
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | into rurik.mysql.com:/home/igor/mysql-4.1
| | * | These functions now return a result of proper collation:unknown2003-06-195-8/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BIN OCT CONV HEX CHAR FORMAT REPLACE
| * | | Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-06-186-60/+93
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | into rurik.mysql.com:/home/igor/mysql-4.1
| | * | - added sql-common subdirectory and sql_common.h to source distributionunknown2003-06-184-5/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makefile.am: - added sql-common directory to distribution configure.in: - minor fixes - added sql-common/Makefile to AC_OUTPUT include/Makefile.am: - added sql_common.h to distribution
| | * | Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1unknown2003-06-185-60/+77
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.1
| | | * | INSTALL-WIN-SOURCE:unknown2003-06-181-54/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More edits to INSTALL-WIN-SOURCE. INSTALL-WIN-SOURCE: More edits to INSTALL-WIN-SOURCE.
| | * | | Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1unknown2003-06-183-3/+216
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.1
| | * | | | - changed "password" to "Password" as suggested by Paul DuBois to beunknown2003-06-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | consistent with the other column names in the table.
| * | | | | Mergeunknown2003-06-1858-1044/+1238
| |\ \ \ \ \ | | | |_|/ / | | |/| | / | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_yacc.yy: Auto merged
| | * | | triggers magicunknown2003-06-184-6/+13
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | enforce REAL_EMAIL BitKeeper/deleted/.del-post-incoming~9f2168f531f09f3b: Delete: BitKeeper/triggers/post-incoming BitKeeper/deleted/.del-post-outgoing~1dd3d8f0f6e8f3cd: Delete: BitKeeper/triggers/post-outgoing BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| | * | INSTALL-WIN-SOURCE:unknown2003-06-171-88/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initial cleanup edits. INSTALL-WIN-SOURCE: Initial cleanup edits.
| | * | Fix for --dirname and --suffix (missed ones) unknown2003-06-171-0/+2
| | | | | | | | | | | | | | | | | | | | scripts/make_win_src_distribution.sh: Fix for --dirname and --suffix (missed ones)
| | * | Added new HOWTO doc 'INSTALL-WIN-SOURCE' on building 'mysql clients and ↵unknown2003-06-172-1/+193
| | | | | | | | | | | | | | | | | | | | | | | | | | | | server' on WINDOWS from BitKeeper as well as from distributed source archive scripts/make_win_src_distribution.sh: Fix for INSTALL-WIN-SOURCE
| | * | The default collation for cp1251 has been changed to general_ciunknown2003-06-171-2/+2
| | |/
| | * Merge bk-internal:/home/bk/mysql-4.1/unknown2003-06-163-5/+7
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1 sql/sql_yacc.yy: Auto merged
| | | * bad merge fixedunknown2003-06-163-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/fulltext.result: test for CREATE FULLTEXT INDEX mysql-test/t/fulltext.test: test for CREATE FULLTEXT INDEX
| | * | Add missing definesunknown2003-06-161-0/+2
| | | |
| | * | mergeunknown2003-06-162-5/+5
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | sql-common/client.c: Auto merged scripts/mysql_install_db.sh: Use local version
| | | * Fix for compilation error.unknown2003-06-162-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compiler can signal error when init_sigpipe_variables expands as empty place. Had to remove all semicolons after init_sigpipe_variables libmysql/client_settings.h: semicolon added sql-common/client.c: we don't need semicolons after init_sigpipe_variables
| | | * Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1unknown2003-06-151-1/+1
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/mysql.orig/test/mysql-4.1
| | | | * fixed bug with './' prefix in mysql_install_dbunknown2003-06-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | scripts/mysql_install_db.sh: fixed bug with './' prefix
| | * | | Fixes for make_win_src_distributionsunknown2003-06-1510-75/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed compiler warnings scripts/make_win_src_distribution.sh: Added option --dirname Also copy sql-common directory Create mysql data files even if mysqld is not installed scripts/mysql_create_system_tables.sh: Update for usage with make_win_src_distribution scripts/mysql_install_db.sh: Update for usage with make_win_src_distribution sql-common/client.c: Portability fix sql/item_cmpfunc.cc: Removed compiler warning sql/sql_acl.cc: Indentation cleanup Removed compiler warning sql/sql_parse.cc: Removed compiler warning sql/sql_select.cc: Removed compiler warning sql/sql_yacc.yy: Removed compiler warning strings/ctype-utf8.c: Removed compiler warning
| | * | | LAST_INSERT_ID()}will now return 0 if the last INSERT didn't insert any rows.unknown2003-06-152-3/+14
| | |/ / | | | | | | | | | | | | | | | | mysql-test/r/auto_increment.result: Update results after bug fix
| | * | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-06-1421-691/+636
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into narttu.mysql.fi:/my/mysql-4.1 client/mysql.cc: Auto merged mysql-test/r/type_blob.result: Auto merged sql/log.cc: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/slave.cc: Auto merged
| | | * | Cleanup after split of libmysql.c to client.c and libmysql.c. A 4.1 ↵unknown2003-06-1422-692/+637
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master/slave will now use the 4.1 protocol Fixed wrong value for SQLSTATE_LENGTH Added CLIENT_REMEMBER_OPTIONS to mysql_real_connect() Changed mysql_port and mysql_unix_port to mysqld_xxxx client/mysql.cc: Removed valgrind & compiler warnings client/sql_string.h: Fix to remove valgrind warnings include/mysql.h: Added read_timeout and write_timeout to mysql options struct. This is to be used for slave when connection to master. code cleanup include/mysql_com.h: Fixed wrong value for SQLSTATE_LENGTH Added CLIENT_REMEMBER_OPTIONS include/sql_common.h: Cleanup after split of libmysql.c to client.c and libmysql.c include/sql_state.h: Removed default states libmysql/client_settings.h: Cleanup after split of libmysql.c to client.c and libmysql.c libmysql/libmysql.c: Cleanup after split of libmysql.c to client.c and libmysql.c mysql-test/r/type_blob.result: Update results after someone updated error messages without running tests mysys/charset.c: More debug information mysys/errors.c: Fixed wrong error message sql-common/client.c: Cleanup after split of libmysql.c to client.c and libmysql.c sql/Makefile.am: Added sql_client.cc sql/client_settings.h: Cleanup after split of libmysql.c to client.c and libmysql.c sql/log.cc: Changed mysql_port and mysql_unix_port to mysqld_xxxx sql/mysql_priv.h: Changed mysql_port and mysql_unix_port to mysqld_xxxx sql/mysqld.cc: Changed mysql_port and mysql_unix_port to mysqld_xxxx sql/protocol.cc: Fix for SQLSTATE_LENGTH Moved function to sql_client.c sql/repl_failsafe.cc: Cleanup after split of libmysql.c to client.c and libmysql.c sql/set_var.cc: Changed mysql_port and mysql_unix_port to mysqld_xxxx sql/slave.cc: Cleanup after split of libmysql.c to client.c and libmysql.c
| | * | | bug #251 - destroyed object reused - fixedunknown2003-06-132-5/+6
| | | | |
| | * | | Merge bk-internal:/home/bk/mysql-4.1/unknown2003-06-1319-256/+253
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| | | * | | mysql.server should read [server] group from my.cnf - according to the manualunknown2003-06-131-1/+1
| | | | | |
| | | * | | consistency fix - all help texts for command-line options should end with a dot.unknown2003-06-1318-255/+252
| | | | | |
| * | | | | Merge rurik.mysql.com:/home/igor/mysql-4.1unknown2003-06-133-3/+8
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
| | * \ \ \ \ Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-06-133-3/+8
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into rurik.mysql.com:/home/igor/mysql-4.1
View Lorry Controller Status