Commit graph

13113 commits

Author SHA1 Message Date
unknown
00567fe634 release cursors in return_zero_rows
sql/opt_range.cc:
  incorrect fix removed. range optimizer is made slightly more stable vs. compiler optimizations
2004-06-25 21:43:02 +02:00
unknown
b4336ad4e0 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-06-25 15:12:51 +02:00
unknown
c79039b861 bug#4008 - merge table cannot determine what key caused "dupl. key" error
myisammrg/myrg_write.c:
  set info->current_table correctly
mysql-test/r/merge.result:
  bug#4008
mysql-test/t/merge.test:
  bug#4008
2004-06-25 15:12:13 +02:00
unknown
13b09b10df Type of MYSQL_BIND::buffer changed to void * 2004-06-25 17:04:33 +04:00
unknown
7e75366b12 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-explain-4.1


sql/sql_select.cc:
  Auto merged
2004-06-25 14:48:15 +03:00
unknown
d57aeec9a1 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-06-25 13:16:48 +02:00
unknown
c604bf687d Bug#3808 - fulltext index, delete, 2-level tree, the word on the 1st level has different length than the key (latin1_german2_ci) 2004-06-25 13:11:02 +02:00
unknown
69d661724b Changed a comment. 2004-06-25 15:26:50 +05:00
unknown
79f5b19922 a fix (bug #4241: system_mysql_db_fix.test fails) 2004-06-25 15:09:26 +05:00
unknown
5a305ab519 remove ^M's
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 !
2004-06-25 11:33:03 +02:00
unknown
e80cfbc068 fixed EXPLAIN behaviour with prepared statements (BUG#4271)
mysql-test/r/ps.result:
  test of prepared EXPLAIN
mysql-test/t/ps.test:
  fix layout and table removing of previous tests
  test of prepared EXPLAIN
sql/sql_prepare.cc:
  explain pave to be prepared, too
  cleanup options after explain execution
sql/sql_select.cc:
  removed unneed assignment
2004-06-25 11:37:43 +03:00
unknown
d1e4305187 Many files:
new file
2004-06-25 00:43:14 -07:00
unknown
d4f06d1c6d Small build fix.
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.
2004-06-25 10:30:24 +04:00
unknown
4ab325d428 undone 2004-06-25 01:43:41 +02:00
unknown
50c44be047 workaround for gcc 2.95.3 bug
anybody knows how to distinguish 2.95.3 from 2.95.4 (which is ok) ?
2004-06-25 01:25:02 +02:00
unknown
2b13c53251 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-06-25 00:56:34 +02:00
unknown
df094ea03b free open cursors 2004-06-25 00:50:48 +02:00
unknown
923937d4b5 One more const method. 2004-06-25 01:30:43 +04:00
unknown
7c5b6ec3ba Followup to cleanup in handler interface.
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.
2004-06-25 01:29:30 +04:00
unknown
530d46f4e3 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-06-24 23:29:29 +02:00
unknown
9aaadae2c6 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/mysql/mysql-4.1-root
2004-06-25 01:29:28 +04:00
unknown
c30fd765ee merged 2004-06-24 23:29:28 +02:00
unknown
eadea645ad Merge 2004-06-25 02:29:27 +05:00
unknown
a64fbb9b3e Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_1851/mysql-4.1


client/mysqldump.c:
  Auto merged
2004-06-25 02:24:00 +05:00
unknown
7696542785 fixed bug #1851 "mysqldump does not return
an error code if the output device is filled"
2004-06-25 01:14:12 +05:00
unknown
1f65c22c04 Previous commit didn't make it (tree fix): I'd forgotten semicolon.
Makefile.am:
  Previous commit didn't make it: I'd forgotten semicolon.
2004-06-24 22:47:05 +04:00
unknown
9db3251611 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/mysql/mysql-4.1-root
2004-06-24 22:37:41 +04:00
unknown
717be2d9c7 Fix of broken 4.1 tree:
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.
2004-06-24 22:33:40 +04:00
unknown
292116f50f Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
2004-06-24 21:29:05 +03:00
unknown
979129f629 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/mysql/mysql-4.1-root
2004-06-24 21:50:30 +04:00
unknown
94cbb692fb A little fix in libmysqld: my_time.c was added twice. 2004-06-24 21:50:04 +04:00
unknown
30f0fc6527 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


sql/sql_select.cc:
  Auto merged
2004-06-24 19:47:53 +02:00
unknown
ff73678967 bug#4089 - JOIN::join_free calling mysql_unlock w/o index_end() before
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
2004-06-24 19:46:50 +02:00
unknown
ca4beea968 Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build


VC++Files/libmysqld/libmysqld.dsp:
  Auto merged
VC++Files/sql/mysqld.dsp:
  Auto merged
2004-06-24 19:30:34 +02:00
unknown
aafb860588 - start the ndb cluster on different TCP ports when running another
build thread
2004-06-24 19:16:44 +02:00
unknown
6d05b1834b Merge sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-innodb-4.1


sql/sql_yacc.yy:
  Auto merged
2004-06-24 19:43:47 +03:00
unknown
4195f96c66 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-innodb-4.1
2004-06-24 19:40:18 +03:00
unknown
7800c8fec3 - Windows compile fix: added missing file tztime.cpp to the mysqld
project file


VC++Files/sql/mysqld.dsp:
   - added missing file tztime.cpp to the mysqld project file
2004-06-24 18:17:47 +02:00
unknown
57ee2443ea - fixed test_frm_bug test to work with increased number of columns in
result of SHOW TABLE STATUS


BitKeeper/etc/ignore:
  added libmysqld/my_time.c
2004-06-24 20:08:42 +04:00
unknown
fe24f11238 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-innodb-4.1


sql/sql_select.cc:
  Auto merged
2004-06-24 19:03:58 +03:00
unknown
b9c2e18541 Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
2004-06-24 18:01:13 +02:00
unknown
8d0f268777 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
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
2004-06-24 19:09:31 +04:00
unknown
9dde418895 Fix for Bug#4030 "Client side conversion string -> date type doesn't
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)"
2004-06-24 19:08:36 +04:00
unknown
73d9c9b129 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/bar/mysql-4.1


sql/table.cc:
  Auto merged
2004-06-24 18:51:32 +05:00
unknown
5ce95c0a9c "Version" column in SHOW TABLE STATUS. 2004-06-24 18:46:41 +05:00
unknown
9293805a03 Merge mskold@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1


sql/handler.cc:
  Auto merged
2004-06-24 15:32:33 +02:00
unknown
5b1b5f63a0 Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-1717
2004-06-24 15:32:32 +02:00
unknown
eff49bb34b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.bredbandsbolaget.se:/home/tomas/mysql-4.1-clean
2004-06-24 13:32:30 +00:00
unknown
4a67f27d7a added posr switch to mysql-test-run 2004-06-24 13:28:15 +00:00
unknown
4c450c5235 Cosmetic fixes 2004-06-24 14:49:34 +02:00