summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Bug#3808 - fulltext index, delete, 2-level tree, the word on the 1st level ↵unknown2004-06-251-0/+1
| | | | has different length than the key (latin1_german2_ci)
* remove ^M'sunknown2004-06-253-0/+4
| | | | | | | | | | | | compile even without InnoDB mysql-test/t/system_mysql_db_fix.test: remove ^M's mysql-test/t/system_mysql_db_refs.test: remove ^M's sql/mysqld.cc: compile even without InnoDB !
* Many files:unknown2004-06-2568-0/+7790
| | | | | | | new file
* Small build fix.unknown2004-06-251-1/+1
| | | | | | | | Add my_time.h to list of headers which should be put ot include/ during make dist. include/Makefile.am: Add my_time.h to list of headers which should be put ot include/ during make dist.
* undoneunknown2004-06-251-1/+1
|
* workaround for gcc 2.95.3 bugunknown2004-06-251-0/+3
| | | | | | | anybody knows how to distinguish 2.95.3 from 2.95.4 (which is ok) ?
* Merge bk-internal.mysql.com:/home/bk/mysql-4.1/unknown2004-06-251-1/+1
|\ | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| * free open cursorsunknown2004-06-251-1/+1
| |
* | One more const method.unknown2004-06-251-1/+1
| |
* | Followup to cleanup in handler interface.unknown2004-06-253-4/+4
|/ | | | | | | | | | sql/ha_myisam.h: - max_supported_key_part_length() is const now sql/ha_myisammrg.h: - max_supported_key_part_length() is const now sql/handler.h: - max_supported_key_part_length() is const now - removed warning about wrong order of initializer in handler ocnstructor.
* Merge bk-internal.mysql.com:/home/bk/mysql-4.1/unknown2004-06-245-17/+59
|\ | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| * mergedunknown2004-06-245-17/+59
| |\
| | * Merge bk-internal.mysql.com:/home/bk/mysql-4.1/unknown2004-06-245-17/+59
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1 sql/sql_select.cc: Auto merged
| | | * bug#4089 - JOIN::join_free calling mysql_unlock w/o index_end() beforeunknown2004-06-245-17/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/ha_myisam.h: cleanup mysql-test/r/bdb.result: bug#4089 mysql-test/t/bdb.test: bug#4089 sql/opt_range.cc: be sloppy sql/sql_select.cc: JOIN::join_free - pass it down the tree (of selects) call mysql_unlock_tables only in top-level select
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-06-251-0/+103
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/kostja/mysql/mysql-4.1-root
| * | | Mergeunknown2004-06-251-0/+103
| |\ \ \
| | * \ \ Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1unknown2004-06-251-0/+103
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/BUG_1851/mysql-4.1 client/mysqldump.c: Auto merged
| | | * | | fixed bug #1851 "mysqldump does not return unknown2004-06-251-0/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | an error code if the output device is filled"
* | | | | | Previous commit didn't make it (tree fix): I'd forgotten semicolon.unknown2004-06-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makefile.am: Previous commit didn't make it: I'd forgotten semicolon.
* | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-06-241-1/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/kostja/mysql/mysql-4.1-root
| * | | | | Fix of broken 4.1 tree: unknown2004-06-241-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initially my_time.c was added to sql/ link_sources target only. As it turns out this target is sometimes not called; instead of it make calls one hard-coded in top-level Makefile.am. Now adding linking of my_time.c to the top-level Makefile.am to (hopefully) cover all cases. Makefile.am: Fix of broken 4.1 tree: - my_time.c was added to link_sources target.
* | | | | | Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-06-245-2/+20
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
| * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-06-241-1/+1
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/kostja/mysql/mysql-4.1-root
| | * | | | A little fix in libmysqld: my_time.c was added twice.unknown2004-06-241-1/+1
| | | | | |
| * | | | | Merge mysql.com:/space/my/mysql-4.1unknown2004-06-244-1/+19
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.1-build VC++Files/libmysqld/libmysqld.dsp: Auto merged VC++Files/sql/mysqld.dsp: Auto merged
| | * | | | - start the ndb cluster on different TCP ports when running anotherunknown2004-06-241-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | build thread
| | * | | | - Windows compile fix: added missing file tztime.cpp to the mysqldunknown2004-06-241-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | project file VC++Files/sql/mysqld.dsp: - added missing file tztime.cpp to the mysqld project file
| | * | | | Merge mysql.com:/space/my/mysql-4.1unknown2004-06-242-0/+8
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.1-build
| | | * | | | - Windows compile fix: added srv/srv0que.c to the innobase projectunknown2004-06-242-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | file and sql/tztime.cpp to the libmysqld project file VC++Files/innobase/innobase.dsp: - added missing file srv/srv0que.c to the project file VC++Files/libmysqld/libmysqld.dsp: - added missing file sql/tztime.cpp to the project file
* | | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/work-4.1unknown2004-06-244-4/+64
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-innodb-4.1 sql/sql_yacc.yy: Auto merged
| * | | | | | | parameter of my_yyoverflow made independed from YYSIZE_T (BUG#4204)unknown2004-06-244-4/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/union.result: test of correct parser stack overflow handling mysql-test/t/union.test: test of correct parser stack overflow handling sql/sql_parse.cc: parameter of my_yyoverflow made independed from YYSIZE_T sql/sql_yacc.yy: parameter of my_yyoverflow made independed from YYSIZE_T
* | | | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1unknown2004-06-246-2/+33
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-innodb-4.1
| * | | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1unknown2004-06-246-2/+33
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-innodb-4.1 sql/sql_select.cc: Auto merged
| | * | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1unknown2004-06-246-2/+33
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-innodb-4.1 sql/item_subselect.cc: Auto merged sql/sql_select.cc: Auto merged
| | | * \ \ \ \ \ Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1unknown2004-06-236-2/+33
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-innodb-4.1 sql/item_subselect.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_select.cc: Auto merged
| | | | * | | | | | do not unlock tables early if we have subquery in HAVING clause (BUG#3984)unknown2004-06-096-2/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/subselect_innodb.result: test of unlocking innodb tables and subquery in HAVING clause mysql-test/t/subselect_innodb.test: test of unlocking innodb tables and subquery in HAVING clause sql/item_subselect.cc: mark SELECT with subquery in HAVING clause sql/sql_lex.cc: mark SELECT with subquery in HAVING clause sql/sql_lex.h: mark SELECT with subquery in HAVING clause sql/sql_select.cc: do not unlock tables early if we have subquery in HAVING clause
* | | | | | | | | | - fixed test_frm_bug test to work with increased number of columns inunknown2004-06-243-2/+566
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | result of SHOW TABLE STATUS BitKeeper/etc/ignore: added libmysqld/my_time.c
* | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-06-2425-771/+387
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/kostja/mysql/mysql-4.1-4030 sql/field.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/tztime.cc: Auto merged
| * | | | | | | | | Fix for Bug#4030 "Client side conversion string -> date type doesn't unknown2004-06-2425-771/+387
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | work (prepared statements)" and after-review fixes: - str_to_TIME renamed to str_to_datetime to pair with str_to_time - functions str_to_time and str_to_TIME moved to sql-common - send_data_str now supports MYSQL_TYPE_TIME, MYSQL_TIME_DATE, MYSQL_TIME_DATETIME types of user input buffers. - few more comments in the client library - a test case added. VC++Files/libmysql/libmysql.dsp: new file: my_time.c VC++Files/libmysqld/libmysqld.dsp: new file: my_time.c VC++Files/sql/mysqld.dsp: new file: my_time.c include/Makefile.am: - mysql_time.h added to the list of installed client library headers include/mysql.h: - declarations for MYSQL_TIME and enum_mysql_timestamp_type moved to mysql_time.h, which is in shared use of client library and mysys. libmysql/Makefile.shared: - my_time.lo added to the list of libmysql objects libmysql/libmysql.c: Fix for bug#4030 "Client side conversion string -> date type doesn't work (prepared statements)" and cleanup. - added case labels for TIME/DATE/DATETIME types to send_data_str - comments for read_binary_{date,time,datetime}, fetch_result_*, fetch_results. libmysqld/Makefile.am: - my_time.c added sql-common/Makefile.am: - my_time.c added to the list of files included into source distribution. sql/Makefile.am: my_time.c added to the list of mysqld sources. sql/field.cc: - TIMESTAMP_{TIME,DATE,DATETIME,...} renamed to MYSQL_TIMESTAMP_{TIME,DATETIME,DATE,...} sql/item.cc: - TIMESTAMP_{TIME,DATE,DATETIME,...} renamed to MYSQL_TIMESTAMP_{TIME,DATETIME,DATE,...} sql/item_timefunc.cc: - TIMESTAMP_{TIME,DATE,DATETIME,...} renamed to MYSQL_TIMESTAMP_{TIME,DATETIME,DATE,...} sql/mysql_priv.h: - added typedefs for TIME and timestamp_type - removed declarations for str_to_time and str_to_TIME (now this functions reside in mysys) sql/mysqld.cc: - log_10_int moved to mysys (it's used by str_to_TIME and str_to_time) - enum values TIMESTAMP_{TIME,DATE,DATETIME} were renamed to MYSQL_TIMESTAMP_{TIME,DATE,DATETIME} sql/set_var.cc: - TIMESTAMP_{TIME,DATE,DATETIME,...} renamed to MYSQL_TIMESTAMP_{TIME,DATETIME,DATE,...} sql/set_var.h: - fixed timestamp_type usage to be compatible with typedef. sql/sql_prepare.cc: - TIMESTAMP_{TIME,DATE,DATETIME} were renamed to MYSQL_TIMESTAMP_{TIME,DATE,DATETIME} - embedded library implementation of set_param_{time,date,datetime} is much simplier now, as MYSQL_TIME is the same as TIME. sql/sql_yacc.yy: - s/\<TIMESTAMP_/MYSQL_TIMESTAMP/gc sql/structs.h: - declarations for TIME and timestamp_type replaced with typedefs - str_to_datetime arguments moved to mysys headers sql/time.cc: - str_to_time and str_to_TIME moved to mysys - TIMESTAMP_{TIME,DATE,DATETIME,...} renamed to MYSQL_TIMESTAMP_{TIME,DATETIME,DATE,...} as these names are now exported to client. - str_to_TIME renamed to str_to_datetime to pair with str_to_time - str_to_TIME_with_warn renamed accordingly sql/tztime.cc: - TIMESTAMP_{TIME,DATE,DATETIME,...} renamed to MYSQL_TIMESTAMP_{TIME,DATETIME,DATE,...} tests/client_test.c: - a test case for Bug#4030 "Client side conversion string -> date type doesn't work (prepared statements)"
* | | | | | | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-06-245-36/+41
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-4.1 sql/table.cc: Auto merged
| * | | | | | | | | | "Version" column in SHOW TABLE STATUS.unknown2004-06-245-36/+41
| | | | | | | | | | |
* | | | | | | | | | | Merge mskold@build.mysql.com:/home/bk/mysql-4.1unknown2004-06-243-27/+35
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1 sql/handler.cc: Auto merged
| * | | | | | | | | | | Cosmetic fixesunknown2004-06-242-3/+3
| | | | | | | | | | | |
| * | | | | | | | | | | Modified index flags and added ndbcluster_print_errorunknown2004-06-243-26/+34
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge gbichot@213.136.52.20:/home/bk/mysql-4.1unknown2004-06-242-6/+3
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mysql_src/mysql-4.1-1717
| * | | | | | | | | | | Enabling the --innodb-safe-binlog option in code. If you wish to disable it,unknown2004-06-242-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | you just need to change this line of mysqld.cc: #if MYSQL_VERSION_ID >= 40103 to, say, #if MYSQL_VERSION_ID > 40103 I am noticing a failure of bdb.test; I believe this is not related to the code I added yesterday and today, but I am checking. In any case I push this changeset as it cannot by itself bring more mess that I *may* (or not) already have brought with previous pushes. sql/handler.cc: if innodb_active_trans is true then innobase_tid too. sql/mysqld.cc: only a warning if --innodb-safe-binlog without InnoDB (it's true this situation will not hurt). Enabling the --innodb-safe-binlog option.
* | | | | | | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-06-243-16/+18
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.bredbandsbolaget.se:/home/tomas/mysql-4.1-clean
| * | | | | | | | | | | | added posr switch to mysql-test-rununknown2004-06-243-16/+18
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-06-243-1/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/dbdata/psergey/mysql-4.1-root sql/sql_yacc.yy: Auto merged
| * | | | | | | | | | | | Fix and test case for BUG#3899unknown2004-06-233-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/alter_table.result: Test case for BUG#3899 mysql-test/t/alter_table.test: Test case for BUG#3899 sql/sql_yacc.yy: Fix for BUG#3899: call ALTER_INFO::reset to clear ALTER_INFO::drop_list and ALTER_INFO::alter_list
View Lorry Controller Status