Commits · cc78467d3a28ca43c149ba85605a889e39c8575d · Kirill Smelkov / mariadb

27 May, 2005 1 commit
- Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 · cc78467d
  unknown authored May 27, 2005
```
into mysql.com:/space/my/mysql-4.1


sql/ha_myisammrg.cc:
  Auto merged
```
  cc78467d
26 May, 2005 11 commits

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 5f767b11
unknown authored May 26, 2005
```
into neptunus.(none):/home/msvensson/mysql/mysql-4.1


sql/item.cc:
  Auto merged
```
5f767b11
Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 7c066496
unknown authored May 26, 2005
```
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
```
7c066496
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 · 4a91ed13
unknown authored May 26, 2005
```
into mysql.com:/M41/mysql-4.1
```
4a91ed13
merge · 60479953
unknown authored May 26, 2005
```
sql/item.cc:
  Auto merged
```
60479953

fixed problem with long string results of expressions in UNIONS (BUG#10025) · 80b0baa7

unknown authored May 26, 2005


mysql-test/r/union.result:
  test for Bug #10025
mysql-test/t/union.test:
  test for Bug #10025
sql/item.cc:
  set HA_OPTION_PACK_RECORD and change type to MYSQL_TYPE_STRING, to allow correct field creation in case of length more then 255 (creation STRING field with length more then 255)

80b0baa7

Merge hundin.mysql.fi:/home/marko/k/mysql-4.0 · 91427f24
unknown authored May 26, 2005
```
into hundin.mysql.fi:/home/marko/mysql-4.1


innobase/row/row0mysql.c:
  Auto merged
```
91427f24

InnoDB: Check all referencing tables in DROP DATABASE (Bug #10335). · 9181c17c

unknown authored May 26, 2005


innobase/row/row0mysql.c:
  row_drop_table_for_mysql(): Check all referencing tables
  when drop_db==TRUE (Bug #10335)

9181c17c

Fix icc compiler warning · ab88a1d2

unknown authored May 26, 2005


ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
  Removed second forward declaration of "struct DescEnt"

ab88a1d2

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 7d7b5dbc

unknown authored May 26, 2005

into neptunus.(none):/home/msvensson/mysql/mysql-4.1


include/my_global.h:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/item.cc:
  Auto merged

7d7b5dbc

Add ifdefs to control when "#pragma implementation" should be used · 22944a95

unknown authored May 26, 2005

Added some more ifdefs for "#pragma interface"


client/sql_string.cc:
  USE_PRAGMA_IMPLEMENTATION
client/sql_string.h:
  USE_PRAGMA_INTERFACE
include/my_global.h:
  Use pragma implementation for gcc pre version 3
mysys/raid.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/field.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/ha_berkeley.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/ha_blackhole.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/ha_heap.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/ha_innodb.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/ha_isam.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/ha_isammrg.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/ha_myisam.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/ha_myisammrg.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/ha_ndbcluster.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/handler.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/hash_filo.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/item.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/item_cmpfunc.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/item_func.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/item_geofunc.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/item_strfunc.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/item_subselect.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/item_sum.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/item_timefunc.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/item_uniq.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/item_uniq.h:
  USE_PRAGMA_INTERFACE
sql/log_event.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/log_event.h:
  USE_PRAGMA_INTERFACE
sql/opt_range.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/procedure.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/protocol.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/protocol_cursor.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/set_var.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/sql_analyse.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/sql_analyse.h:
  USE_PRAGMA_INTERFACE
sql/sql_class.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/sql_crypt.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/sql_crypt.h:
  USE_PRAGMA_IMPLEMENTATION
sql/sql_list.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/sql_map.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/sql_map.h:
  USE_PRAGMA_INTERFACE
sql/sql_olap.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/sql_select.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/sql_string.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/sql_udf.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/tztime.cc:
  USE_PRAGMA_IMPLEMENTATION

22944a95

- merged the 4.1.12a Changes back into the main tree · f30b7ed4

unknown authored May 26, 2005


myisammrg/myrg_open.c:
  Auto merged
mysys/my_getwd.c:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
configure.in:
  - manual merge (corrected version number)

f30b7ed4

25 May, 2005 8 commits

Manual merge. · 7e5651ca
unknown authored May 25, 2005

7e5651ca

Added a missing "make clean" to the RPM "spec" file which had caused the... · ce11270f

unknown authored May 25, 2005

Added a missing "make clean" to the RPM "spec" file which had caused the original 4.1.12 RPMs to be broken.
(bug#10674, bug#10681)


support-files/mysql.spec.sh:
  Added a missing "make clean" which had caused the original 4.1.12 RPMs to be broken.
  (bug#10674, bug#10681)

ce11270f

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · aa3a934b
unknown authored May 25, 2005
```
into mysql.com:/home/my/mysql-4.1


sql/sql_parse.cc:
  Auto merged
```
aa3a934b

Cleanup during code review · 549f56dc

unknown authored May 25, 2005

Faster detection of wrong table names (like PRN) on windows


include/my_sys.h:
  Added check_if_legal_filename()
mysys/my_access.c:
  Added check_if_legal_filename()
  Set errno if my_access() fails
mysys/my_fopen.c:
  USe check_if_legal_filename() instead of my_access() to detect wrong file names on windows
mysys/my_open.c:
  USe check_if_legal_filename() instead of my_access() to detect wrong file names on windows
sql/sql_lex.cc:
  Portability fix
sql/sql_parse.cc:
  Simple cleanup
sql/sql_repl.cc:
  Cleanup during code review

549f56dc

Use one err file for each master · 827db5e4

unknown authored May 25, 2005


mysql-test/mysql-test-run.sh:
  Add master id to end of MASTER_MY_ERR  so that both masters doesnt write to the same file.

827db5e4

- one more build fix for zlib.lib - added libpath to the · 1794eb3e

unknown authored May 25, 2005

  mysql_test_run_new project files


VC++Files/mysql-test/mysql_test_run_new.dsp:
  - added libpath option so that zlib.lib will be found
VC++Files/mysql-test/mysql_test_run_new_ia64.dsp:
  - added libpath option so that zlib.lib will be found

1794eb3e

BUG#10831 ndb mgmd LogDestination maxfiles does not rotate logs properly · 605f7061

unknown authored May 25, 2005


ndb/src/common/util/File.cpp:
  my_stat returns NULL on failure, not non-zero.
  
  i.e. exactly the opposite of stat(2).
  
  providing confusion for unix programmers, who expect errors to be non-zero.
  
  Clean up File_class::exists(char*) to use the my_stat interface properly.

605f7061

BUG#10796 Incorrect check-cpu result for ppc linux gcc · 5b77d9b8

unknown authored May 25, 2005


BUILD/check-cpu:
  Add no_march variable to indicate that this architecture doesn't support the -march flag to GCC

5b77d9b8

24 May, 2005 16 commits

- applied more changes to enable the CP932 charset on Windows · e9cf191c

unknown authored May 24, 2005

- fixed linking with zlib


VC++Files/client/mysql.dsp:
  - added zlib.lib to the LINK32 options
VC++Files/client/mysql_ia64.dsp:
  - added zlib.lib to the LINK32 options
VC++Files/client/mysqladmin.dsp:
  - added zlib.lib to the LINK32 options
VC++Files/client/mysqladmin_ia64.dsp:
  - added zlib.lib to the LINK32 options
VC++Files/client/mysqlcheck.dsp:
  - added zlib.lib to the LINK32 options
VC++Files/client/mysqlcheck_ia64.dsp:
  - added zlib.lib to the LINK32 options
VC++Files/client/mysqlclient.dsp:
  - added ctype-cp932.c to the file list
VC++Files/client/mysqlclient_ia64.dsp:
  - added ctype-cp932.c to the file list
VC++Files/client/mysqldump.dsp:
  - added zlib.lib to the LINK32 options
VC++Files/client/mysqldump_ia64.dsp:
  - added zlib.lib to the LINK32 options
VC++Files/client/mysqlimport.dsp:
  - added zlib.lib to the LINK32 options
VC++Files/client/mysqlimport_ia64.dsp:
  - added zlib.lib to the LINK32 options
VC++Files/client/mysqlshow.dsp:
  - added zlib.lib to the LINK32 options
VC++Files/client/mysqlshow_ia64.dsp:
  - added zlib.lib to the LINK32 options
VC++Files/client/mysqltest.dsp:
  - added zlib.lib to the LINK32 options
VC++Files/client/mysqltest_ia64.dsp:
  - added zlib.lib to the LINK32 options
VC++Files/libmysql/libmysql.dsp:
  - added ctype-cp932.c to the file list
VC++Files/libmysql/libmysql_ia64.dsp:
  - added ctype-cp932.c to the file list
VC++Files/mysql-test/mysql_test_run_new.dsp:
  - added zlib.lib to the LINK32 options
VC++Files/mysql-test/mysql_test_run_new_ia64.dsp:
  - added zlib.lib to the LINK32 options
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
  - added zlib.lib to the LINK32 options
VC++Files/mysqlbinlog/mysqlbinlog_ia64.dsp:
  - added zlib.lib to the LINK32 options
VC++Files/mysqlcheck/mysqlcheck.dsp:
  - added zlib.lib to the LINK32 options
VC++Files/mysqlcheck/mysqlcheck_ia64.dsp:
  - added zlib.lib to the LINK32 options
VC++Files/mysqlmanager/mysqlmanager.dsp:
  - added zlib.lib to the LINK32 options
VC++Files/strings/strings_ia64.dsp:
  - added ctype-cp932.c to the file list

e9cf191c

Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 · e07f6ebf
unknown authored May 24, 2005
```
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
```
e07f6ebf
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ · d839f3a9
unknown authored May 24, 2005
```
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
```
d839f3a9
simplifying new/my_arg_new wrapping · d3f7ec30
unknown authored May 24, 2005

d3f7ec30
Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1 · 5e5eb0a6
unknown authored May 24, 2005
```
into zim.(none):/home/brian/mysql/mysql-4.1
```
5e5eb0a6
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 · be9845b0
unknown authored May 24, 2005
```
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
```
be9845b0
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1 · edcc645b
unknown authored May 24, 2005
```
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
```
edcc645b
Added a test case for Bug#8009. · 801c2c27
unknown authored May 24, 2005
```
sql/item.cc:
  Fixed Bug#8009.
```
801c2c27
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1 · 8643958c
unknown authored May 24, 2005
```
into mdk10.(none):/home/reggie/bk/41test2
```
8643958c

removed unneeded reserved_win_names testcase · 6a96b815

unknown authored May 24, 2005


BitKeeper/deleted/.del-reserved_win_names.test~334b02776c4247a7:
  Delete: mysql-test/t/reserved_win_names.test
BitKeeper/deleted/.del-reserved_win_names.require~be6a130b5430085f:
  Delete: mysql-test/r/reserved_win_names.require
BitKeeper/deleted/.del-reserved_win_names.result~ea458226c0df5337:
  Delete: mysql-test/r/reserved_win_names.result

6a96b815

- bumped up version number string to 4.1.12a · 3b3cd242
unknown authored May 24, 2005

3b3cd242

- added the cp932 charset support to the Windows builds · 4a80acec

unknown authored May 24, 2005


VC++Files/strings/strings.dsp:
  - added ctype-cp932.c to the project (new charset)
include/config-win.h:
  - added a HAVE_CHARSET_cp932 #define to enable the cp932 charset
    on Windows

4a80acec

Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.1 · 3a23b675
unknown authored May 24, 2005
```
into xiphis.org:/usr/home/antony/work2/p3-bug7241.5
```
3a23b675
Add comments · 1a8f64d7
unknown authored May 24, 2005

1a8f64d7

- Backport of the patch to fix BUG#10687 (Merge engine fails · 9e636a24

unknown authored May 24, 2005

  on Windows): applied required patches on top of the 4.1.12
  release (will be published as 4.1.12a for Windows)


myisammrg/myrg_open.c:
  - Backport of the patch to fix BUG#10687 (Merge engine fails 
    under Windows): use fn_format to convert pathnames if the files 
    in the merge file have a pathname
mysys/my_getwd.c:
  - Backport of the patch to fix BUG#10687 (Merge engine fails 
    on Windows): Added test to see if FN_LIBCHAR != '/' before
    doing comparison to avoid redundant comparison
sql/ha_myisammrg.cc:
  - Backport of the patch to fix BUG#10687 (Merge engine fails 
    on Windows): added extra debug output

9e636a24

Bug#7241 - Invalid response when DELETE .. USING and LOCK TABLES used. · efc7b884

unknown authored May 24, 2005

  Only acquire necessary write lock for multi-delete


mysql-test/r/lock.result:
  Test for Bug#7241
mysql-test/t/lock.test:
  Test for Bug#7241
sql/sql_parse.cc:
  Bug#7241
    Don't acquire write lock on all tables.
    Make sure to set lock_type on real table_list

efc7b884

23 May, 2005 4 commits

Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/c4944-4.1 · b36f9f2e
unknown authored May 24, 2005

b36f9f2e
marking the file gone again to hopefully get the tree on its feet · b6c1f230
unknown authored May 23, 2005
```
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
```
b6c1f230

BUG# 9148 Denial of service · 97bde75e

unknown authored May 23, 2005

fixups of test case and comment formatting


BitKeeper/deleted/.del-reserved_win_names-master.opt~e56da049a7ce9a5b:
  ***MISSING TEXT***
mysql-test/r/lowercase_table.result:
  added my test for bug #9148 to this test case
mysql-test/t/lowercase_table.test:
  added my test for bug #9148 to this test case
mysys/my_fopen.c:
  reformatted comments
mysys/my_open.c:
  reformatted comments

97bde75e

Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/c4944-4.1 · d81bee6e
unknown authored May 23, 2005

d81bee6e