summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | fix to make client.c compile on windowsunknown2004-03-122-1/+1
| | | | |
| * | | | Merge mysql.com:/space/my/mysql-4.1unknown2004-03-121-0/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.1-build
| | * | | | - added AC_PROG_LIBTOOL to innobase/configure.in to be able to compileunknown2004-03-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MySQL with InnoDB on IBM AIX 5.2 in 64bit mode (which requires a special AR flag) innobase/configure.in: - added AC_PROG_LIBTOOL to be able to compile MySQL with InnoDB on IBM AIX 5.2 in 64bit mode (which requires a special AR flag)
| * | | | | Rudimentary part of libmysql patch:unknown2004-03-123-84/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | set_mysql_error is deployed libmysql/client_settings.h: declaration for set_mysql_error libmysql/libmysql.c: - set_mysql_error moved to client.c - st_stmt_errmsg -> set_stmt_error sql-common/client.c: deployment of set_mysql_error
| * | | | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-03-125-447/+497
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into deer.(none):/home/hf/work/mysql-4.1.spa
| | * | | | | Spatial code changed to get rid of inconsistent this->* operationunknown2004-03-125-447/+497
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now we use virtual calls instead and redirect VMT pointer of the geometry object with 'new' operation sql/field.cc: Usage of the Geometry class changed sql/item_geofunc.cc: Usage of the Geometry class changed sql/spatial.cc: Now we rewrite the real VMT of the object with new operation sql/spatial.h: No need for the VMT-like structure and pointers to it sql/sql_yacc.yy: enum items was renamed accordingly to coding standards
| * | | | | merge correcttion in mysql-test/r/mysqldump.resultunknown2004-03-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/mysqldump.result: merge correction
| * | | | | Mergeunknown2004-03-113-36/+152
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/mysqldump.result: e mysql-test/t/mysqldump.test: SCCS merged
| | * | | | fixed bug #2591 "mysqldump quotas names inconsistently"unknown2004-03-113-39/+159
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/mysqldump.result: added test for bug #2591 "mysqldump quotas names inconsistently" mysql-test/t/mysqldump.test: added test for bug #2591 "mysqldump quotas names inconsistently"
| * | | | | Rename:unknown2004-03-105-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | read_statistic -> read_statistics (statistic is adjective) include/mysql.h: read_statistic -> read_statistics libmysql/client_settings.h: read_statistic -> read_statistics libmysql/libmysql.c: read_statistic -> read_statistics libmysqld/lib_sql.cc: read_statistic -> read_statistics sql-common/client.c: read_statistic -> read_statistics
| * | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-03-103-1/+24
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b3036
| | * | | | | Fix for the bug #3089: SUBSTRING bug when mixed with CONCAT and ORDER BYunknown2004-03-093-1/+24
| | | | | | |
| * | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-03-094-18/+32
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | into ua72d24.elisa.omakaista.fi:/home/my/bk/mysql-4.1
| | * | | | | Fixed Bug#3115. CAST AS DATE with malformed string returns NULL but IS NULLunknown2004-03-094-18/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is false. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| * | | | | | - added mysql-@VERSION@.spec to pkgdata_DATA againunknown2004-03-091-0/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (it got lost during a recent BK merge)
* | | | | | after merge fixunknown2004-03-091-1/+2
| | | | | |
* | | | | | mergeunknown2004-03-0913-36/+73
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/subselect.result: Auto merged mysql-test/t/subselect.test: Auto merged sql/item.cc: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_sum.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_class.cc: Auto merged
| * | | | | revision of fix_fields() calls (BUG2838)unknown2004-02-1813-36/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/subselect.result: test suite for BUG#2838 mysql-test/t/subselect.test: test suite for BUG#2838 sql/item.cc: revision of fix_fields() calls removed unnecessary variabl, and used correct last parameter of fix_fields() sql/item_cmpfunc.cc: revision of fix_fields() calls (BUG#2838) sql/item_func.cc: revision of fix_fields() calls sql/item_row.cc: changed for efficience (and to be similar for Item_func::fix_fields) sql/item_subselect.cc: fixed last arguments for fix_fields call sql/item_sum.cc: layout fixed revision of fix_fields() calls sql/log_event.cc: revision of fix_fields() calls sql/set_var.cc: revision of fix_fields() calls sql/sql_base.cc: revision of fix_fields() calls sql/sql_class.cc: revision of fix_fields() calls sql/sql_handler.cc: revision of fix_fields() calls
* | | | | | Reapply change after merge.unknown2004-03-081-1/+1
| | | | | |
* | | | | | Mergeunknown2004-03-080-0/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/set_var.cc: SCCS merged
| * \ \ \ \ \ Merge bk-internal:/home/bk/mysql-4.1/unknown2004-03-081-1/+1
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1 sql/set_var.cc: Auto merged
| | * | | | | Merge bk-internal:/home/bk/mysql-4.1/unknown2004-03-061-1/+1
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| | | * | | | | variable's name correctedunknown2004-03-051-1/+1
| | | | | | | |
* | | | | | | | Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-03-081-2/+11
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
| * | | | | | | Comment for do_command moved inside #ifndef EMBEDDED_LIBRARY.unknown2004-03-081-2/+11
| | | | | | | |
* | | | | | | | Make SHOW VARIABLES output really alphabetic.unknown2004-03-072-36/+35
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note: the patch removes an extra declaration of the read_only variable. It also assumes that '_' sorts before [a-z]. mysql-test/r/fulltext_var.result: Fix test result to account for SHOW VARIABLES output reordering. sql/set_var.cc: Make SHOW VARIABLES output really alphabetic.
* | | | | | | SESSION instead of LOCAL in error messages.unknown2004-03-0723-26/+26
| | | | | | |
* | | | | | | Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-03-063-64/+52
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
| * | | | | | Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-03-061-7/+7
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/BUG_2082/mysql-4.1
| | * | | | | | corrected spelling error horisontal->horizontalunknown2004-03-061-7/+7
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into client/mysqltest.c client/mysqltest.c: corrected spelling error horisontal->horizontal
| * | | | | | Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1unknown2004-03-062-57/+45
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/BUG_2593/mysql-4.1 mysql-test/r/show_check.result: Auto merged mysql-test/t/show_check.test: Auto merged
| | * | | | | commented testcases in show_check.test with quotation marks in table nameunknown2004-03-052-57/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to avoid troubles with OS which don't support these symbols in file name used create table 'a/b' as hook for WL#1324 which should fix this problem mysql-test/r/show_check.result: commented testcases with quotation marks in table name to avoid troubles with OS which don't support these symbols in file name used create table 'a/b' as hook for WL#1324 which should fix this problem mysql-test/t/show_check.test: commented testcases with quotation marks in table name to avoid troubles with OS which don't support these symbols in file name used create table 'a/b' as hook for WL#1324 which should fix this problem
* | | | | | | Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-03-056-50/+465
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
| * | | | | | Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-03-066-50/+465
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/BUG_2082/mysql-4.1
| | * \ \ \ \ \ Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1unknown2004-03-066-50/+465
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/BUG_2082/mysql-4.1 sql/field.cc: Auto merged
| | | * | | | | - added commands --query_vertical and --query_horisontal to client/mysqltest.ccunknown2004-03-066-42/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - get my_strtod to return inf - get Field_float::store(double) and Field_double::store(float) to set null for nan value (as extra serg's recomendations to fix for patch on Bug #2082 'mysqldump converts "inf" to null') client/mysqltest.c: added commands --query_vertical and --query_horisontal mysql-test/r/insert.result: converted testcase so as my_strtod can return inf now mysql-test/r/mysqldump.result: converted testcase so as my_strtod can return inf now mysql-test/t/insert.test: corrected tests to using --query_vertical instead of pair (vertical_results,horisontal_results) sql/field.cc: corrected Field_float::store(double) and Field_double::store(double) to set null for nan value strings/strtod.c: get my_strtod to return inf
| | | * | | | | Fixed bug #2082 'mysqldump converts "inf" to NULL' andunknown2004-03-044-50/+442
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added commands vertical_results and horisontal_results to client/mysqltest.c client/mysqltest.c: added commands vertical_results and horisontal_results mysql-test/r/insert.result: added test for bug #2082 'mysqldump converts "inf" to NULL' mysql-test/t/insert.test: Fixed bug #2082 'mysqldump converts "inf" to NULL' sql/field.cc: added test for Fixed bug #2082 'mysqldump converts "inf" to NULL'
* | | | | | | | Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-03-0510-46/+51
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
| * | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-03-0510-46/+51
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-4.1
| | * | | | | | | Portability fixesunknown2004-03-0510-46/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/show_check.result: Updated results mysql-test/t/show_check.test: Portability fix (for 64 bit platforms) mysys/hash.c: Portablity fix sql/gen_lex_hash.cc: Don't include mysql_priv.h; Causes build errors on a lot of platforms sql/lex_symbol.h: Moved symbols here from mysql_priv.h to avoid including mysql_priv.h in gen_lex_hash.cc sql/mysql_priv.h: Move symbols and struct to lex_symbol.h sql/sql_db.cc: Don't use sql_alloc/sql_free methods in sql_string.h sql/sql_help.cc: Don't use sql_alloc/sql_free methods in sql_string.h sql/sql_string.h: Don't use sql_alloc/sql_free methods in sql_string.h This makes the code faster and more portable sql/sql_yacc.yy: Don't use sql_alloc/sql_free methods in sql_string.h
* | | | | | | | | Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-03-051-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
| * | | | | | | | Fix bruxism-inducing typo so I can sleep at night.unknown2004-03-011-1/+1
| | | | | | | | |
* | | | | | | | | Fix for C++ style declarationunknown2004-03-051-1/+2
| | | | | | | | |
* | | | | | | | | Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-03-055-91/+169
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mydev/mysql/mysql-4.1
| * \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-03-055-91/+169
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/kostja/mysql/mysql-4.1-rename
| | * | | | | | | | New call mysql_stmt_init() introduced.unknown2004-03-055-91/+169
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renames: mysql_bind_param -> mysql_stmt_bind_param mysql_bind_result -> mysql_stmt_bind_result mysql_execute -> mysql_stmt_execute mysql_fetch -> mysql_stmt_fetch mysql_fetch_column -> mysql_stmt_fetch_column mysql_get_metadata -> mysql_stmt_result_metadata mysql_param_count -> mysql_stmt_param_count mysql_param_result -> mysql_stmt_param_metadata mysql_prepare -> mysql_stmt_prepare mysql_send_long_data -> mysql_stmt_send_long_data client_test.c cleaned up from memory leaks include/mysql.h: New call mysql_stmt_init() introduced. Renames: mysql_bind_param -> mysql_stmt_bind_param mysql_bind_result -> mysql_stmt_bind_result mysql_execute -> mysql_stmt_execute mysql_fetch -> mysql_stmt_fetch mysql_fetch_column -> mysql_stmt_fetch_column mysql_get_metadata -> mysql_stmt_result_metadata mysql_param_count -> mysql_stmt_param_count mysql_param_result -> mysql_stmt_param_metadata mysql_prepare -> mysql_stmt_prepare mysql_send_long_data -> mysql_stmt_send_long_data Renames are done according to the rule 'Everything call operating with 'MYSQL_STMT' structure has 'mysql_stmt_' prefix. Additionally mysql_param_result was renamed to mysql_stmt_param_metadata and mysql_get_metadata to mysql_stmt_result_metadata. All renames are done in hope that new names are easier to remember and understand. libmysql/client_settings.h: skip_list is not needed any more libmysql/libmysql.c: New call mysql_stmt_init() introduced. Renames: mysql_bind_param -> mysql_stmt_bind_param mysql_bind_result -> mysql_stmt_bind_result mysql_execute -> mysql_stmt_execute mysql_fetch -> mysql_stmt_fetch mysql_fetch_column -> mysql_stmt_fetch_column mysql_get_metadata -> mysql_stmt_result_metadata mysql_param_count -> mysql_stmt_param_count mysql_param_result -> mysql_stmt_param_metadata mysql_prepare -> mysql_stmt_prepare mysql_send_long_data -> mysql_stmt_send_long_data sql-common/client.c: no skip_list argument any more tests/client_test.c: - many memory leaks and valgrind errors cleaned up.
* | | | | | | | | | Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-03-059-11/+96
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mydev/mysql/mysql-4.1 BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| * | | | | | | | | Enhanced my_getsystime for NetWare.unknown2004-03-041-0/+8
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysys/my_getsystime.c: Add NetWare high-resolution time call.
| * | | | | | | | Merge bk-internal:/home/bk/mysql-4.1/unknown2004-03-057-11/+87
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1 sql/item_create.cc: Auto merged
| | * | | | | | | UNHEX() functionunknown2004-03-047-11/+87
| | | | | | | | |